4162 files changed, 40159 insertions, 43204 deletions

diff --git a/Manifest b/Manifest
index 1367593fc226..459856c4a869 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28810 BLAKE2B eeee81cf90309e0020824889ed5d6f6a2f601f6f148704a04e990c1040dd9f9633638248f49937eeaba590ee09949f01e2e2c84861231784352fe8de9812a982 SHA512 fa05370427c04875d7a7b7cabc0e24d7f77dfa047a56ab1d1e391490dc990c7305e1316075644c3d97eb2b3de962fa171747fc718afb3e5bb0c4b35e64733cae
-TIMESTAMP 2018-02-11T15:08:29Z
+MANIFEST Manifest.files.gz 28826 BLAKE2B 543b54b7f48ca9e6ea8b9b6fc90754a9bb69ae2835c8018e581baf15f09a3b560a3a2223f18149399f3275e7692971f077779e23b767b91fa72ab822aff0e283 SHA512 f2eac5afee2d0bc3964b5776329a844f6d9aa4aa815698f3a21eba46744c570afcc0b7a19b1763ecf2e6a7cd5328b22991dcd9ffc89ff031de68de366127a2c2
+TIMESTAMP 2018-02-15T16:08:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqAXG1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqFsH9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDvDQ/+KWxO1x/oJih+4X53QvTeK42J3AYWtrsZlEBMCC9FDjMfYws9J9nmdAPj
-Q1nrms5K2T1OYW/L4bAcXyShOX9BgZsLdNDajNrHxKXAhJ+sXwmBysYuxDgS5ToP
-NSEs69wEwlv1SNzGYcii/vp8dfPNIQDeLccRGjUKgrYNj89SryG2yJtiL+lswX/Z
-XkgDC9ugFxsXmaUtFqGpciQY6qf3IIm47bXvMKB0eLuIJDNYVg+AC2eYtsG1u0Dx
-O1h5oEFIo2U2XfvEC83Dflaas7jh6zchlIoiqsdPCn6kzJCeVbJXiTFAQgpjlfuF
-ETcFBnmT3BhSmbl3arg9ZaINt8XA5aUcGh9yy9bjnIQaklrkR3mOYQ3QW/AHI/Ah
-WQbh0RfTbSfEJvvTnZKBPB8Uvj26DKkyHaO4lPpUG8ogGhIYxyQ4EGCqWfvneFD0
-AGwzWLvOCocg5Sru5QRyvhPHq1ZhgccipWfhYB0QL9cHoTJnkln0tjepbj6HBD0n
-qXld/xa8DlVJLkZ2UI3pJOw87ABTzSC1VM7BYWZf8RGt4r6It41wSVn/y+7YmCLA
-FL7d+3R+azTYmV0+zSwDALq7Of3y5+9+Di9hAebxYYFv88RQvIjdud6X+TF8sehE
-RxXcWYmgNKddjV4MGxlmlbXbaL9oNIFxrz57UZXlOgrLEaUujyk=
-=1pFt
+klDGMRAAm/oziKC4+P3+WT4crtj734Z90qfIo4iENiIJBXhRKVj0cTy3c3qCw6qB
+LQqVcDwP+XmviJ2dFuPsqTJus8B1JBH13aHBlYgdI/ktwtz0mCudJdexvf7W+B8H
++zQpDqDxin3Z9LicUBHMDHgVOqZkLTpoTZyhzRsmdGTrrtvqixs9K1G9t4H3oiRD
+tGQgXvNAyjHQko1IqiDvgvFyhUW6r2FI55GQWuXmK1Pn33CcmEhJha6Yzy9T4bzo
+E+A9HAZAvWUFsC9wA7qY8rPmX7O3MrTHxkJZaH4tm7nhQLYVmaj6VqARhHZpRjLo
+QgMidOomuMelz1EuHBaviuaoOTsq33SbqcCHwG2ORjOGdMN1Ryu5AMq7r14SzlXC
+xqoggEgWQI7Jd6UbapKSy/g3fvAU7fP+VFlW3ZkwIx7c2pCoBua49GIeMiAmPvl8
+cDJ6MJx44sNVjtzBea85f2wWDr4kc0ppAyYzTpx7buF0iQQvjb2om+TfjUgQLpOs
+NF6Lf0Adj4ND0GkhVFRCK7oKlJnhPE1KQxclEB1UMpND6xiTCgPLeGBeSeaHflGZ
+AIzQesWTusAu/U6Jck2JiyI2ghFFgi4l4uKCzQQJIXrdk2Q2S1o7Kb/25e9UAhCM
+5y/lM8yp5rr5hNUbhyBKft7PdheT7qxZo24sTYJAOlb0thFYjEQ=
+=CL0k
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2c570e054f47..7c26d99af99b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6805a744a6e5..b048a364edaf 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 64ec762e22b9..ba19ada84769 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -4,5 +4,7 @@ AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95
 AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
 AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
 DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
+DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
 EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/app-admin/apachetop/apachetop-0.17.4.ebuild b/app-admin/apachetop/apachetop-0.17.4.ebuild
new file mode 100644
index 000000000000..2f5954eb82bf
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.17.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 autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="https://github.com/tessus/apachetop"
+SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
+		--without-adns \
+		$(use_with fam) \
+		$(use_with pcre)
+}
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index 097975e3adc2..e7214b7e32c5 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 2cb570225e8a..e1069d4b1034 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -7,6 +7,8 @@ AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-0.9.3.tar.gz 7278357 BLAKE2B 041164951fe798f51bc79ef4cf322e3c37b583471d66f0d78b0a100b57ee367a5942ef07fc85adafeb6c014b5a6047dae10da42427600de25656614c235dab1a SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f
 DIST consul-1.0.0.tar.gz 7354292 BLAKE2B f2e245cec5859e23dd55c991de5c4d68be8526ec7085273660271407d9f1898c803edbffaff3cd4f0d5de114b9d8b2cd205e03002d5685b77f831957b021140c SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88
+DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
 EBUILD consul-0.9.3.ebuild 1577 BLAKE2B 7e98fa62c283cb18017fb192e5132d02905d22e222e22a6fa7ea54b2f48b65e3b6a66d70802c217adc2d2fefdc7c2193de7d0c7989fd3ea76589161b1c1ea948 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e
 EBUILD consul-1.0.0.ebuild 1577 BLAKE2B 7e98fa62c283cb18017fb192e5132d02905d22e222e22a6fa7ea54b2f48b65e3b6a66d70802c217adc2d2fefdc7c2193de7d0c7989fd3ea76589161b1c1ea948 SHA512 df46eaa2a8dfd4810ca069458854bd930d478f017c9c76e66bcd48d093825b3698738754a65608e3f10a7ba948bdcf55c51e109f10d44bc0405c678440c1aa7e
+EBUILD consul-1.0.6.ebuild 1577 BLAKE2B abf9233c12f12bc8f884fd63836f6aaa9edbb5da79f31422208144c5f2154d7172249ad8102a355aef718b35fd30d70cbb7d9fb4109f574d8438e8e312e2a8d9 SHA512 57400a21f984abe026ce9e5447c00f9327fe84b396ca19efa5e5c6a138a678816a4cf841b72eef64976eaab6179198f5f55dbfaab454f6cd1b2eabd51c1e5bb4
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.0.6.ebuild b/app-admin/consul/consul-1.0.6.ebuild
new file mode 100644
index 000000000000..46b00a5d17b5
--- /dev/null
+++ b/app-admin/consul/consul-1.0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+		-e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 72f9b3dbff5d..7ab63b51e1f2 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,5 +1,7 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
+DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
 EBUILD glance-15.0.0.ebuild 5137 BLAKE2B fc41aadc655ec1cbf88820a51114944efaff287087105b79fa08e886f80f6abec36aeaad1f1a5d3162bde04e6e3590427adf5c7837ef3b7b915be1c9f9f397af SHA512 127baee4875ca362a2f791c7218aa8ed531efe63b54d36f7c57e2d3761d8ba09d5f599bff5503ae20df232978d575b7ed6abae255725df0c20f08565c0815a96
-EBUILD glance-2017.2.9999.ebuild 5151 BLAKE2B 6d251e35b8bc16b1ea08fc83e5269cd159b1cc4d5b7925f779e487365a0ced20c1c5b3d6fd730c69b9bac6b984c49b6b26979348c2e4e737fb10cd22f041f27f SHA512 e75ae4339b67632a84385cdb17d18f41101b189e79c4a2ad6d5113895881b400688c5693f86b10133934ac5b8860ff27f81249c153e10777bf45a9e5056f2c11
+EBUILD glance-15.0.1.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf
+EBUILD glance-2017.2.9999.ebuild 5279 BLAKE2B 9b19e16abf18a0f7fbff0cb3fef24e6a5d60774b7ca5cec7b6b30b97331d5a556102586eea8c2d37fc7e0772757d02e39e993d1c178c4782a78c525dc38c4a1b SHA512 be9cea54014cfe17004cb4a6825e26e0f516bf0036a61741d3be73bdbd77f2825c1bdf6fd89eff252581074a1661a5b02187e247d7b9c5453e52933faa4e1fbf
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-15.0.1.ebuild b/app-admin/glance/glance-15.0.1.ebuild
new file mode 100644
index 000000000000..d1d9d7d36392
--- /dev/null
+++ b/app-admin/glance/glance-15.0.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${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-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
index 34a29aa8cf51..d1d9d7d36392 100644
--- a/app-admin/glance/glance-2017.2.9999.ebuild
+++ b/app-admin/glance/glance-2017.2.9999.ebuild
@@ -4,16 +4,22 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
-inherit distutils-r1 git-r3 user
+inherit distutils-r1 user
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/pike"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc mysql postgres +sqlite +swift"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 506ae7bf7df2..1344af77e766 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -5,7 +5,6 @@ DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
 DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
 DIST github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.tar.gz 37580 BLAKE2B 8df1660308b0be42e76511842c092caa1222e92698a64875dec24240f8d66515b056af2181c950fd3d05c82645086b2b66afd5a61afed706d69964b52177a72c SHA512 9decb828c62865f09c0efac5eae8a536ad1a7e33aa6389be2af0c58017a20b08714a77b5bdde6e69ae1fa0c21e67d251fd2718d564195be7f058a286e1c6f2c4
-DIST github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz 35366 BLAKE2B ddde73c2c0a6fa6f80ac9a135bae99030b72b94cebe6efa3e42c1a4792f344d31d7d76309004b533c9687d4729a68bb19f3b39d179e2e41d7ad4d55356a9fcab SHA512 daf9dc30aab277192244af9f207b31e772457c5d9600f69b30780b2f267f4f45ee778136d6f8e27b41a47593623a4b21a2af960678e1a8f2ec6aa16cc7060275
 DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
@@ -58,7 +57,6 @@ DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
 DIST github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz 334844 BLAKE2B 6b1025e0248b427840eace218538e34a21338990436a74f6e7c29da7415ddaa343a262b8f9b87a2f6c82d91d66dc192465a8ab4f283b4427f63e0bc98020df62 SHA512 124bf026d11a15aeb512f94807765e0b8f12815f551eaed14d634e0966122c1b18c0b9a2e06330aa6911ec9d923ae2e9e88ecac94d77874bc2ff850f2708fb0e
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
@@ -67,17 +65,12 @@ DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb
 DIST github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz 48285 BLAKE2B 3dd3d6729fef9fa3f5f7aa09fb9114267202a90d5beb44f996406f9a45c02a281d8a1eae3f5125d03ff267b9eee874b6415891fad21bfaf4e3d7e09125d90419 SHA512 e5c1e322b1f9506edcc1f1bb4efc2d3a6fa440abff16fa3557f4ecb3e82b0be1cb9511712d3ece32e7c247c58ea3aa07197bab0ae2e7aef262aa97adf83dc253
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
-DIST github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz 1291393 BLAKE2B 184358098449fa3fabc46fba82a48f7037cd769c983acbbf8371437daad6170f0faebc9cee7babc776ecd8c9234c0108f0159360330eda9c186eca23538c3254 SHA512 f61563caa01c1d08c0c49cc3cd26d94aa44d6848c515091153235e92bddbe41b9621637479fe2256a01e722d0ac61f3534ec0b6ab953bde668ccaff4fd9a6781
 DIST github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz 4570659 BLAKE2B 50d421caaf529c12e1e4ce07493ffa0c92daea64b68d63992dd85bc5025f928df454a8af6701cbaa9bc065b61868b079d04dedb50f6696a267a4c5d790a28750 SHA512 cf74085a3bdfb6303243d42e438d7291300f1cff01c64aa854c444be52c6ad81ffbb868ef3eb3850225c62d25337d0eec7f7d1044709f1b5860121bec44b703c
 DIST github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz 1485046 BLAKE2B 51a95498e0ba00b19e0731604feb001779d2798d73a3c64a7193c07fde01ec71a6a9e4a3605bcd50be33ec55c92be71c15039ac70b0f9cd88a566c908acdb11a SHA512 12f63a76fce8465d2c294e65c2b16a30fc5c2ede65d63e75f3a7b143e6c5acfa2abe673508a9b792b0b5819ae534ae1018edfece1431f573e731e33d5e244807
 DIST github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz 3869160 BLAKE2B 7e3fcafce1ee62a7e95b1c09814a3e5efb7efb20642214e0f2b093e11e797d8ddc312c18f7369b0745d344470cf1fc9d3ce9e582a6998f2df8f139cdad812427 SHA512 8f5cef4f90fa6ef9d64fb3ae21c68f3b7785e758bbc4f85dd2b7f2ec07f281a3df66ac1705f291b834513341f8a2c20ae1601ab65e337f313c156f5c4e9b481d
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz 84447 BLAKE2B fa2ad0affd97fd0874b9bc4723f522d78c0ede1c6d43ed22ac151aaa3423f3dc180dd5578378bf95f747ef5eb18140414787349ab062c3974f71901c58fc00a2 SHA512 45867a30bc4877b4376d69787c4d20943fe21dfda20d6eefeda729b808668bc37b12e5a7c0869d13bb6b3481b798ef990d66d6b4e733331651d8a4db323c4cb5
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
-DIST github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz 23391057 BLAKE2B 1925ef02958542f4da3f95fa1acf0002ca454acee73439d73bcce28f381738fcf69a3cdafe76546815df390096ee76f7e2b532bc7412e7a2c0b0d510f1a40648 SHA512 fd54ae65260e8b62ab203fe41dc1a9ea9982ea1e986ce7c49971769aed0552d1f0baa162946d94207445ab5a5d0a08806663a496dd4fb00da451a86d72519ac5
 DIST github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz 23382404 BLAKE2B f6d6b9a67d90470d8c30a17c60cd24bfa075d36a580a3ab6f985d96f53d08b0971569c33c0c508e542148022ca3be0cf5fdc60707070da6e9b71c8ba3605e8fc SHA512 05f046d3a4ad5844b05b4b579bbdf2448bfac05197c8fb3a47ca19ff91bd5482972e763c32af84f99e66ccbbcb9c9102d4a5968981f9fd183ecc68c718183af7
-DIST github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz 57396 BLAKE2B 31de627b9805d3fe647d2918a839655fd164b45da063fb4d11710b65354d6f2b447d7ac6dae558b12512a15d92494cb4647fe859bea69b4544520452a206ff62 SHA512 f0988a6846a8ce9a003cc8898f0777994c162f678ea5986986163af0db366682d8a98a39029c486535c330f577539be39c34be2fe0c0113c7895fc94a1235eec
-DIST github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz 7540 BLAKE2B 7ce585f807a952e11c316f212b7d348485213f94ebd558fe1b4c228c84d3adfe7273d5ae5393e17408b357a0f37967e806e15bb66c2d8139bb5e33281cc7f1e8 SHA512 cc2eaf7e71b8012635ef6d02b00595d5e7d2a321772699199d61813e3ef1e1ca3c3239de264ab2b719be5a452fb183baf4fd5f87e988a15c51064423d6f2d9b6
 DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
@@ -99,9 +92,8 @@ DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz
 DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
-DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST helm-2.7.2.tar.gz 823059 BLAKE2B 3c4b3270055931e92bdafa29dcb182524e08744b3631bedb384bc34c3fd71dfd3aa60a9754b270d8b69999824166314439e14b53f9659543d69ff30ac7dc8116 SHA512 8ab947faa891102d89f229d79b6e78992b7a37d9bccc2a7c882482dc8143619acb1409d5643717d8d10fbd7e0df9da07a1ee18019bdb6befa4ce189112001b4e
 DIST helm-2.8.0.tar.gz 1124564 BLAKE2B 3d5179047dc15b15dc61221f30d42478a473507b4c43ce00ea695827a9b7a96acd4b6c8bdb1d1e9a54b33a0fba59531e95bbd02cd8bb4e00e6fae67ccabde883 SHA512 408bf32048df094fd5a1cd348f2f10fa2afd043f51f6c4efada2329e4c22e035d8ba82754b03c7b3844639e0508c92c81df9727a86cf73e5c6eea1f0691788cd
-EBUILD helm-2.7.2-r3.ebuild 8508 BLAKE2B 15436e77f2f071806a25300957ab28c3de02f5c7508a10dc2d7adcd441e6341e2340e4873228395fca0f802873f439ef52713bbc4776af3e396739fc9cda7143 SHA512 09d6367a5a9e5a4ef6c58d792569c9df5b456cac38dff5163855136f917fd85d9965fffefb32a445856640e751761d29566255c613aeff05cf95e3dace4fea44
+DIST helm-2.8.1.tar.gz 1125082 BLAKE2B cb513c34127f1fedf759b94710fc22efea0b76a25189b87fe2e169252265b57b04cdc006d1c8bf0bf6b63e80f4e544716298865aef236874b337610153f3e45b SHA512 5867d192b2a401cf93ea8b1d4e1dddffab992b55931cebd10c53324270288fefb10fa2dc12277dd361b3e4b95ad0258c755459276ce044af1ae9e70266ba6ae1
 EBUILD helm-2.8.0.ebuild 8958 BLAKE2B fdbdbfc0c9f7b1f3ebf8787bf10eb930602a7709c05bf7170c5b2c267c2e8087b5969f51b4b32d8d350c8d86b00373f7eb610e8400d2b905a82cab1c04b05697 SHA512 d3cf9b42da67033bb0a831b623c8f6fa0fc9cb1d170dea443f36c6eb07b19ae8891599002c89bd296941fffcfa2b74977ce5a6113523cab6c1477fd0e4300d43
+EBUILD helm-2.8.1.ebuild 8958 BLAKE2B 8a93471eba5b5874282746db73d32329202f4745232b2f475b67957f871907ed232d1c2ca2125cfea9b133ee3c8d94786d513144abf15628d67d0f7c02471e47 SHA512 e09847d0a5819f2cb88a678fd453aaf8afe50f31a02b4fce9e00f13301c0508754252c2c0fde7c21b2b0ab29ebdaf7f3dd3e22e477232468dfc35ae5cf8e2a51
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.7.2-r3.ebuild b/app-admin/helm/helm-2.7.2-r3.ebuild
deleted file mode 100644
index bff2ba014b44..000000000000
--- a/app-admin/helm/helm-2.7.2-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig efda631a76d70875162cdc25ffa0d0164bf69758"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
-"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
-"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api cadaf100c0a3dd6b254f320d6d651df079ec8e0a github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery"
-"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes 0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4 github.com/kubernetes/kubernetes"
-"k8s.io/metrics 8efbc8e22d00b9c600afec5f1c14073fd2412fce github.com/kubernetes/metrics"
-"k8s.io/utils 9fdc871a36f37980dd85f96d576b20d564cc0784 github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="04769b7c26109aabfc9c6b645b345d665b6bd0cd"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	./scripts/setup-apimachinery.sh || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.8.1.ebuild b/app-admin/helm/helm-2.8.1.ebuild
new file mode 100644
index 000000000000..89ae5e144335
--- /dev/null
+++ b/app-admin/helm/helm-2.8.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/aws/aws-sdk-go 760741802ad40f49ae9fc4a69ef6706d2527d62e"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-ini/ini 300e940a926eb277d3901b20bdfcc54928ad3642"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig b217b9c388de2cacde4354c536e520c52c055563"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/gcfg.v1 27e4946190b4a327b539185f2b5b1f7c84730728 github.com/go-gcfg/gcfg"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/warnings.v0 8a331561fe74dadba6edfc59f3be66c22c3b065d github.com/go-warnings/warnings"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery"
+"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 3a1c9449a956b6026f075fa3134ff92f7d55f812 github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="6af75a8fd72e2aa18a2b278cfe5c7a1c5feca7f2"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	./scripts/setup-apimachinery.sh || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 3f5c1d6a98e0..43d5b52d76a5 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -4,5 +4,5 @@ DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea
 EBUILD keepassxc-2.2.2.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
 EBUILD keepassxc-2.2.4.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
-EBUILD keepassxc-9999.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
+EBUILD keepassxc-9999.ebuild 1643 BLAKE2B d2cdd34ca3971fdae6ac94ac3f9bcf88b66e7a5699478c70b45371708797ab5fe658b8230add3332d564f8421c7ec77ced37dd1eb23678d193ba70777d33e0cc SHA512 bbe14ff1a27e23734757cc4692dcd20df751e18b7236809c7d754d9f3a817c1975ea74dc9e2d68aaff62360536287386800d2b0b5ba1bd6db002fbe9d6b771de
 MISC metadata.xml 819 BLAKE2B 2a55fa24065498759f3c37d00a0dd2b4782728029cfc6fdd0e140fa89d4c31b39cbd8c6445388733a6ba9c20009cd32132e31c056812281b4696a8551b1c71dd SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 15016b6c462e..5d2d57477dde 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-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
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="autotype debug http test yubikey"
 
 RDEPEND="
+	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -59,6 +60,8 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
 	cmake-utils_src_configure
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index c7c8fbcb13f9..aedad7f312f4 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -6,6 +6,7 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
 DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
+DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
 DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
@@ -14,5 +15,6 @@ EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8
 EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
 EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23ab2084a4b42382b592622030e6b4a9e148b652b412448a1897b90beab3c684aeb570b7facac3d1f6047063b8f29312 SHA512 252ec56015e29597eb8f5cd1c5b63939276734f0459ed6b16fba1faf3eb82b4a88d707324c8010453c791b911a2bdfe14325b4604d6ddcd4259e160d0677dbd8
+EBUILD mongo-tools-3.4.13.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
new file mode 100644
index 000000000000..de23914b1110
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mtail/Manifest b/app-admin/mtail/Manifest
index 594e2f369ab1..29f55ab0d71f 100644
--- a/app-admin/mtail/Manifest
+++ b/app-admin/mtail/Manifest
@@ -1,25 +1,18 @@
-DIST afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz 40613 BLAKE2B 1c5b0d331418f865e0e81e9f031acc5afc0636e5cc7f6dc13337fe274432d21f98f34b01ab4b2cf05fb6612e1e09c2da9db25d3110475e1e737304f4b709065d SHA512 eb97a0983ba2c8c063ce0f1e8f907095b10b5c2a06730acfe54a9835f8eacba2e5e1db3a1a9438d907c67b507c5a66056a6de22d86405d6b294c51b2543ba355
 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz 769752 BLAKE2B 3d118ee77f7ff6ada9388fb3c569726aa00e77eb743ca38f51bcb4fbd1c31a8d43103b6cb2a5291224653c699d75143f3c449e84a4dac2b7dd2797e5a035e8e3 SHA512 91c2db2cb798fe0b185602e135b6acea6eaee1c5345581b14439197287ec2d7e9b9a57b951a6e033ff8c40ed8f8f4f8a8c5a68f29f25b048922001fa8290df42
+DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
 DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
-DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 BLAKE2B 514ee46b5316566cbae7fdcae0155ed273455f7514485c6e64833082bbee98893ea61e4aab74e5ad77f2781dbf3fe7211c3c584afb21bc90544616dadc7289ec SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45
+DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
 DIST github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz 4624908 BLAKE2B ca7357d28720c08199b206ac0b88ce28ce281767683503a1d09de002d9c97f10360e274d17405d23d565b1f62d42f2f7fa4387138fb5188052c110037cd16114 SHA512 6b2e721540b1f7ad8dc5c0a7ce45d7631721f223f484e58e561ed482bfefca7a8e4068c68abe33ba08e1db9293d7f99223859d8ba525c868798ecb61995c3f93
-DIST github.com-golang-tools-68e087e2a5786de2c035ed544b1c5a42e31f1933.tar.gz 2246337 BLAKE2B be52a8064a94a3c2864bd847a9d1f6c177576786c87b2ecacc0433cc05496d03b46bd9f5fec10ec9fc13073a5e3ffc5f89b65d55ea09f49888f7c7cc9bbe4b3d SHA512 58b95d6f3ecb8f22355d8a29da50c13de1e9dc41be1e4e8fd01b3e5510df12c3837daa76390f7e223c45ccafe56f84c5fff606e46124f99159c902f334b530ac
+DIST github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz 2255154 BLAKE2B 45597a951f6c1c678a10fe3fb968cf5eca3b9328f78c57335ee9a45801138b8f169b953190fe293a271efa70c6f1419587cc5aa737f87b217c7b2bd6cabc7c9d SHA512 8a8ca4fab9a691bea505c2953974f29c95c488e81f794daba2edd7b9211b8a309db5ca93a008cbeacc0c967760a7b5182f10ac33da1902cd342461348fca56bc
 DIST github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz 2246529 BLAKE2B c6a683b6e490b34c219d8210654d87623aae6f2f2fdb8c716daa54927cbf4250d8522dac00c42dde6c1178e5a843f1fcfe15b30e550c57ac7a5175a152e97353 SHA512 147c4541c56f31b030a45eacd6c87afeccd1b8039bcfbc8882b6a4466cf3fcaba504214938085861a9253c36dbb544bd41b3fb4b2be7f2de5712e823c375890e
 DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481 BLAKE2B ee1048ff0b0bdbf77b0c6c2102c32b3691efd5bc75a69d327d6c1e7c19b2ebdd2da7cba383fc312a16122fc89d85ad56265f02847adae8b21674e1c200b364cb SHA512 6e8ce6cc7f3e3065fdb3f53da9be99771e7d3981fc091bad6e6f436c44f7891838a879fc6267bc5349fc73a8c896aa1eaf7cb1b17fafb5d7dee39962b6269c6a
+DIST github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz 10912 BLAKE2B 189f7fc6a465a4841f242f8222681f0a80bc251151407d14abd585c65f84204c0ce80c7f0bfd6ea5b03c8790021b7436bc180d3571440ef98a85dbffd5cfd60d SHA512 c38f35def5c4ddba089250f2fde423c53d1f0b33dbba4495bacf2fe772b1216672305ada0b353882a296e4b7fc49c72e99633ed7465b03c31854f762e2890277
+DIST github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz 43576 BLAKE2B b3eb215e8ae38ded0c85405e63fab7876f23948dce8272e8a3fc4d710c8617982b62aca0f57c97953340f8eecd87eb7eafce63a1d860d2fdc19d3f433b519d3f SHA512 8e200be7a5b8816f5b6ebf7df4ad61a7e0bacad56fc9f269a16a32c83cd0d293530e71fccd671545c812b27e70eb5e947faddaf4d765b67ce8f2eecb9eebbd9c
 DIST github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz 43416 BLAKE2B 0cc5f646df68a0b2cb4625810b730ec49f984e050084933f2686d2d433ee7c9abdf2e37838c8b8e1970ffc630eca10dca142ec112686493664e32ef6ab39c965 SHA512 6b428a8599c132ddda18b6b6fd1ae6dfc8d11b39e4b3e3e0e9b763571339c2a5e0a2c95a54a6953b82c45b92775ed3ccc0b152e9d9a2fc649f10dd754b3fe2f7
-DIST github.com-spf13-afero-ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b.tar.gz 42570 BLAKE2B d384c30e9c51b84e64e1c7539e292338a013f03b8b3495096105e47d7d58e0baa1d2c74e57eb53bbaa7e53dddb912929bd12a93bbb7da1d9b3f697e8c51f819c SHA512 f39c841114b3d9fb68ced40c9fb7ed86e8a6cc22f2cd7e151ae6d9ed13886536966f3ba325dc4a0a985ffacf47b8eee063db9b07116c190baccbc9e42dd62830
-DIST go-fsnotify-1.4.2.tar.gz 29552 BLAKE2B 3760820cd1c9d1107186c9743fcdf9518c7a8c0a0736e3e7d70cc3d4ac550b284d4aed30a61c30d38a3b3af40c15ff29d508bf073df4daca4af07ad240cbf951 SHA512 fe76ac5f0fac2075a5436a726628ed9abf9a8668482c3b599977cf6167fc1334af738a907ce5bd627fa6b5ff4c4f4ac7dd7515b5f2892e74f32869b2a6c79944
-DIST go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz 623731 BLAKE2B 6d80616b647ac0e44c21d78d37af83acbb516e80c3f232b3aff3153d863346fb42d89a422ec8917308d9e1040aaf59d31f23036114f5ece0027a7f7ee5c07d15 SHA512 a2cc30c19e05fa16e800679da933d842cc49e770e642ae8e49939a660fefe795069b5136a4d2b5fd4c094fd660e90f73a98d17c86503218c4f2f5c76fddf6722
-DIST go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz 4521690 BLAKE2B 88f3629affa5cf868ee7f78c4957126cfb53f71a4b602790c379d3d032e88a01194c9a1c716070039df3f224f3f3135840125f15dd6249787346a28dd7c545e9 SHA512 ac03833a836a4443a0f27a3bdb8701ca97bfed9a158b7f0a8fd78cf99325a10155cef0426c7a722abd739768a1a15e7e82f96690469aeb887743b5fcf37c3854
-DIST go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz 2195990 BLAKE2B 014fc197e8ab2c8ca8ebe434c6a58022d61dd90da5ad88b022818bc413325f8c3e6b358185d073fb203a7672fa27cc9b1cd435847b607bce682908f6bc0906e2 SHA512 397fcf06e4cedaa16de5009ba6b4a29cf2eeaacf3490e04fad265610ddf2159310e8cfd0661b3d75fc34ad1252c165cf490e61164de5dfd9ecd3cdd4e058f40a
-DIST godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz 14683 BLAKE2B 65e90ce04deb93816544e26b66b9182f71e911bea41aa82e0eccc82596f08cfe74dbfef435ac3bb4c3fa9a282df02c43de3eafa68185e508cea50b511ddfc840 SHA512 8eb131c6aecf7d5691b2d35c53acd08b842735b029b6115bccc0e96a7a7441328603d618f810d1fe740254c71a1f01fcd3e7b2e85fbbb2c3eb9ec3ec9177bb1d
-DIST mtail-0_pre20161108.tar.gz 382393 BLAKE2B aa7cab94e550b7fd2c08d3dcfee6604f9ac42d7a14f8a84acfc56e400b9fa38e0a79718a0a93de4984a9d1fd3e0db219c401b0ffe45daec36debd7adb5de6f5f SHA512 5eb60f57bf267730ec01a07d8bac1abb4b9454610ce52c8ab2acc59a04e36442cc4b570778f9a0eb249d3a85f21cacdc70cce203b28e57f84ab2ef533a5bc2df
-DIST mtail-3.0.0_rc2.tar.gz 410528 BLAKE2B 6cf98f899e8fe0dc0e11de668e23242b964d10ca0610b761bfbc8035bf4df8a41d58d7155eb18d456f48616752b42fa1322a129daf833d6399169937ed7ac040 SHA512 95a1c88d0769f35ce9e9476aacb15f36a82f8a6a0e251e6f39ba97f11936f4d3b471be73d643d88afb51ef0b0f8d6b10555da9011f17381e00e397fe3911f3bd
 DIST mtail-3.0.0_rc4.tar.gz 425781 BLAKE2B c957e8ae735395ce197d805f2e5228511074fda08427f180e7b6110a45b74af2fb6bff9670b3d452c0561b7fa4d93105804c631df03c5d73197a81e44a4a35f8 SHA512 6354d36303e37e440636f965ffe5685cc30a886ac348ad85f33e384e4cf0a3616328857362361fdf0f1759d361323d08f6052d481f76f6dd8454b1efe3a24e8a
-EBUILD mtail-0_pre20161108.ebuild 2833 BLAKE2B 6921222db4ff2c5dad0bac10b0b720b73caba407de772e99aa9062a138070ce00bfa2a0efd373dcedf81e4393290376e6343f4e16109aa3e3eb4db303761b915 SHA512 f7de1d84941632ef13ad82ce503727994ee8700231c1678d7c155e170e166fc69bb2b7d6e3c2f46300a359ba1618c70936264aeffde613bc4894a076eec69765
-EBUILD mtail-3.0.0_rc2.ebuild 1537 BLAKE2B fe8d1418b2ae28f8c3e769a41295e297bf991e902c0c02c9245ee6eea38511981d4bf2052cf0ce4ed2d021a6e054db3cbce14873eb45764e589318d7f10a7c77 SHA512 1913aa925455304cebfe6017a78a856df49035b86821f160f3f8c4fcd36ce5e127cc95e5b980c9ee98db60a9fba173313698b6366e19cbd80805282729fbb3e9
+DIST mtail-3.0.0_rc5.tar.gz 432769 BLAKE2B 2098fca72a7ca1564885a6c4d7a0a1b30ceee74d3fc310b0b18542b5e7bdf14dd17d40d4f3cd1bf62d7613375a470fef632bb9b185cc082b5633481e126e0481 SHA512 74c8fe536bde628cb9874a36a4693eb55e2e490d5e6d80a60d7f1f17fea66f8cf7a95345da406b4d4eeca9e6a42d614086d92ed2f8fc9180019f49f8ddccb055
 EBUILD mtail-3.0.0_rc4.ebuild 1538 BLAKE2B e571750ebdfea77312619632ee2a9d1aaee6cee63f1889feed375a3c15ccbed122a01dbe5e3dc266ea4b1916327c638dff14605f657ae73220dfd3f40c15c693 SHA512 3ddae954b727c0023096633a0a98e31bf392a11d615c62a97412e2373b1b7dbb9f9cf6de5cbd97a443ef38ee1f6fe85f44bd3c874699ca68b339c2d0baf6595a
+EBUILD mtail-3.0.0_rc5.ebuild 1539 BLAKE2B c058b720caa435d2e257c7ded3f1c5c95347ed30a8339439450da5d01b17961151b8787e15c0cd01519ed13dbd1dc633cfaf5d7e1b81e2f3bcec9edfc60cad18 SHA512 0f5ac027289adc7f911990c24c3bb20ef58caa5116fabbc965dd646e6dae0b7576eed5ee5f6d3674e626bf014b8cdea7003aaf6a76ace1b8206df450acf4134d
 MISC metadata.xml 295 BLAKE2B 83cc868475f40ef5e6bd8fa8824e8959615d7589fe4985273026ed4ce02b5eee2c631cbdce4f69e67f9a019252385bf4e0bcbef0e2f5083770955ca351be5961 SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95
diff --git a/app-admin/mtail/mtail-0_pre20161108.ebuild b/app-admin/mtail/mtail-0_pre20161108.ebuild
deleted file mode 100644
index 175b8d7c05f1..000000000000
--- a/app-admin/mtail/mtail-0_pre20161108.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64"
-EGO_PN=github.com/google/mtail
-EGIT_COMMIT=a780a6342bd70a8fb8ffe187ef988d5417d43a96
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/spf13/afero/archive/06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz -> afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz
-	https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz
-	https://github.com/fsnotify/fsnotify/archive/v1.4.2.tar.gz -> go-fsnotify-1.4.2.tar.gz
-	https://github.com/golang/tools/archive/76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz -> go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz
-	https://github.com/golang/sys/archive/30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz -> go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz
-	https://github.com/golang/text/archive/b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz -> go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz
-	test? (
-		https://github.com/kylelemons/godebug/archive/d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz -> godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz
-	)"
-DESCRIPTION="A tool for extracting metrics from application logs"
-HOMEPAGE="https://${EGO_PN}/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="!app-misc/mtail"
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	uri=${uri%/archive/*}
-	case ${uri} in
-		github.com/fsnotify/fsnotify)
-			echo "gopkg.in/fsnotify.v1|fsnotify-*"
-			;;
-		github.com/golang/glog)
-			echo "${uri}|${uri##*/}-*"
-			;;
-		github.com/golang/*)
-			echo "golang.org/x/${uri##*/}|${uri##*/}-*"
-			;;
-		*)
-			echo "${uri}|${uri##*/}-*"
-			;;
-	esac
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			x=${go_package#*|}
-			go_package=${go_package%|*}
-			mkdir -p src/${go_package%/*}
-			mv ${x} src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack_go_packages
-}
-
-src_prepare() {
-	default
-	sed '/^[[:space:]]*go get .*/d' -i "${S}/src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	go install -v -work -x ${EGO_BUILD_FLAGS} "golang.org/x/tools/cmd/goyacc" || die
-	PATH=${S}/bin:${PATH} emake -C "${S}/src/${EGO_PN}"
-}
-
-src_test() {
-	cd "${S}/src/${EGO_PN}" || die
-	default
-}
-
-src_install() {
-	dobin bin/mtail
-	dodoc "${S}/src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
diff --git a/app-admin/mtail/mtail-3.0.0_rc2.ebuild b/app-admin/mtail/mtail-3.0.0_rc2.ebuild
deleted file mode 100644
index 266072615802..000000000000
--- a/app-admin/mtail/mtail-3.0.0_rc2.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
-
-EGO_VENDOR=( "golang.org/x/tools 68e087e2a5786de2c035ed544b1c5a42e31f1933 github.com/golang/tools"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/pkg/errors 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"
-	"github.com/spf13/afero ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b"
-	"golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 github.com/golang/sys"
-	"golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text" )
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGIT_COMMIT="5e6d38908091a8648c0f26c44ebd708e241f3814"
-EGO_PN="github.com/google/mtail"
-SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-DESCRIPTION="A tool for extracting metrics from application logs"
-HOMEPAGE="https://github.com/google/mtail"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RDEPEND="!app-misc/mtail"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e '/^[[:space:]]*go get .*/d'\
-		-e "s/git describe --tags/echo ${PV}/"\
-		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
-		"src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
-	emake -C "src/${EGO_PN}"
-}
-
-src_install() {
-	dobin bin/mtail
-	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
diff --git a/app-admin/mtail/mtail-3.0.0_rc5.ebuild b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
new file mode 100644
index 000000000000..8297bf1eec38
--- /dev/null
+++ b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"golang.org/x/tools a4ae70923768403983fdab4e1d612d79c08ba465 github.com/golang/tools"
+	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/pkg/errors 30136e27e2ac8d167177e8a583aa4c3fea5be833"
+	"github.com/spf13/afero bbf41cb36dffe15dff5bf7e18c447801e7ffe163"
+	"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
+	"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
+	)
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGIT_COMMIT="04017b5a1241b4e78b0a2dab84e5a332228b54d2"
+EGO_PN="github.com/google/mtail"
+SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://github.com/google/mtail"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RDEPEND="!app-misc/mtail"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e '/^[[:space:]]*go get .*/d'\
+		-e "s/git describe --tags/echo ${PV}/"\
+		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
+		"src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
+	emake -C "src/${EGO_PN}"
+}
+
+src_install() {
+	dobin bin/mtail
+	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index de795d3bd50e..ee75a6a58add 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -4,8 +4,8 @@ DIST puppet-lint-2.3.0.gem 76288 BLAKE2B 0192bc7808dbf40c6685f4610b625360c6c16ed
 DIST puppet-lint-2.3.2.gem 82432 BLAKE2B 7586bc15654e7a33ad8a4f98341c0fc19c2349bfce9c8afd4fb7a731a715c611b93837b02a3ee875297c71dd9021fee8cca04da3790a47ae06aa43e7226876c1 SHA512 5da388ad11285172e74de775d691ea49ebbbcadf938e7bddadff1bb9c9485dc30d7fa51e51db74d7912d23434223e3625e267a6785bd7f37243136553716db5e
 DIST puppet-lint-2.3.3.gem 84992 BLAKE2B 57b6d6332b7d26daf193ba983ff1e5d560cf4f902f1b476de3b1f7254755851397685d7b435dd7365f81e1427d91ca47ffa889a9d87a14e1c4720e44aa2b7996 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68
 EBUILD puppet-lint-2.0.2.ebuild 503 BLAKE2B f551675e56d30071dc74239dabad1bf7caf5ea0a84ade2d0862e35974cb07dc50d5bdd604f75b48276cee3bc78ec86ea53cfb8d19b126f70d5f7be8e39965947 SHA512 b459abca72be46ac909ac058848aaf16b0b2fd767093f3f1545ef18bd162227673af8ef282b0d030b750fec50dc879b618eb0a9363eedb10c026b09ac0351149
-EBUILD puppet-lint-2.2.1.ebuild 525 BLAKE2B 602cfa572f31c00d607de8c3cbd2107dc412b9f6f70ced7ea302cdaee8a1825969ced7db565949da18b28c672226e85769c3286ff6ff73d7cc93b32d42b91da3 SHA512 c2863ca471667702e071d87481d8910e5d8ca13818b27229022480dfd1aa3fdb2bd7ae21ad2cc7d9c4aad271d4e84436efa95ad76412fa8391aa2a5632ead215
-EBUILD puppet-lint-2.3.0.ebuild 525 BLAKE2B e52bfbf0169add1bbf0b4aa413d5fc890794bfa13a0c70a26bb7d8d36a2c06e0bb5205815d79de5d3be7d2f80f239c12511d85d45b4e588baed999182eb44254 SHA512 1927bed1d195f060ca98aaa1f2a9f9a6d8225d048e29919bc36d6012c31c98881337e57321c97dbbbdbb57dae657c7b9c1f6f60d1dc36809e10b09b9febe9e16
-EBUILD puppet-lint-2.3.2.ebuild 615 BLAKE2B 04124536e933d86bf86f2ef6cb5eef474221134eceda80379dafef6f83e833be7e77399af7b5a6b7908c567e05731190e9f3d5dab5b26b1d7fd503052f53c723 SHA512 c2ea85bb7a595bc0c298eaa4b321a1abc95a0a7867856b75318e19934cde219c2ea6cb9d996fa7db5747da2bb9bc285a2f5adcb510d924ae9cd9d3bff5805fff
-EBUILD puppet-lint-2.3.3.ebuild 615 BLAKE2B 04124536e933d86bf86f2ef6cb5eef474221134eceda80379dafef6f83e833be7e77399af7b5a6b7908c567e05731190e9f3d5dab5b26b1d7fd503052f53c723 SHA512 c2ea85bb7a595bc0c298eaa4b321a1abc95a0a7867856b75318e19934cde219c2ea6cb9d996fa7db5747da2bb9bc285a2f5adcb510d924ae9cd9d3bff5805fff
+EBUILD puppet-lint-2.2.1.ebuild 530 BLAKE2B b0cf079076ebd1fe96cb6068ef4bfc6db2a20f313471613a62036477278d93ae16ac8e0d65671286ad8f8a9a51fa24642b90ac1f3b566119ac96a231b644e734 SHA512 7971536bbc61e2d936da84855473c7153eadf4f88efbce369c9b75291065022e22d21edc0d8e3e32e2b00c6181a640490c3da637ebeda50c3be35b94d8cf3dd1
+EBUILD puppet-lint-2.3.0.ebuild 530 BLAKE2B b1c06852daefdb586e6ec3599f7806ce08b690fc57ccd8ebfac70bf0a534bd153aa6f13d38b450731d470f36a72e5a631b5292b2aaf7336f2ceaf6a18a16e4d9 SHA512 54d1567d795e072b67acfd4f67ec485d9d1e3b4f9790b0a9e79ea39f8b643703e28b8df52d5a6dfad848869a2ce18483c859cf599ea3a1b6e11577ffc8918755
+EBUILD puppet-lint-2.3.2.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
+EBUILD puppet-lint-2.3.3.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild b/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
index 57be7f078fe7..b2e360053d8b 100644
--- a/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.2.1.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=5
@@ -17,7 +17,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
index 5b79542ae57f..c53ed5cf7c68 100644
--- a/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.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,7 +17,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
index 65e7f40bb291..e672004b0fd5 100644
--- a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.2.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,7 +17,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
index 65e7f40bb291..e672004b0fd5 100644
--- a/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.3.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
@@ -17,7 +17,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index ac9f44490f6a..b1809d5b7620 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -11,17 +11,12 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.10.tar.gz 2995864 BLAKE2B c01e6a7529d70a4481e64b4119cfd9d05e79d655ef17495a98e2ab800ea527ef09f234782e7362b25bf1b1ed11d7c2a48e40815ac6dccc5a2d460886beb604e7 SHA512 e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
-DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
-DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
-DIST puppet-5.3.3.tar.gz 2843386 BLAKE2B dc96282ff2d6bb6719362cd9b2e856537019bd888af8ba897e37fc97584cd76c1d4179b3b629d2bb20d1dade0f84ec88ab41dd0d66cccd2c850a87f96ccf4b65 SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe
 DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd
+DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361
+DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71
 EBUILD puppet-4.10.10.ebuild 5737 BLAKE2B a88a8d8fbdfa65751d4cad48af0234e7c1891eb35855cbb2ee9b4a62d75538af9d6c1445ec056505046d753a40eb93cc5bc65e9e2fb719c1f377ca1188941d81 SHA512 7592ae092281c6212bd958dce00d622252271db2f8d38fa447f3f53f756f0cad0f43c518aa0c652b6452b0856165b0db64fff48d3f797b65cbe9058a441b75b0
 EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74
-EBUILD puppet-4.10.9-r1.ebuild 5737 BLAKE2B a88a8d8fbdfa65751d4cad48af0234e7c1891eb35855cbb2ee9b4a62d75538af9d6c1445ec056505046d753a40eb93cc5bc65e9e2fb719c1f377ca1188941d81 SHA512 7592ae092281c6212bd958dce00d622252271db2f8d38fa447f3f53f756f0cad0f43c518aa0c652b6452b0856165b0db64fff48d3f797b65cbe9058a441b75b0
-EBUILD puppet-4.10.9.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02
-EBUILD puppet-5.1.0-r1.ebuild 3823 BLAKE2B 19a08621366ab57b447b76c1209b288736b40861eb6703d84166581bdb19c22c212b9d4247d33bcd39134748b186b13a8bfafede5a57d73c64b49045cd7cf43d SHA512 8ec7cdf210c22563867716154a316b07b96ec36bd3a7bd8bd0aa15f6a5b0dd8f61fb5855a94465049709d9e1e3db1b4e33dbdbe3ce4fc0650d9b51fcebbd631c
-EBUILD puppet-5.1.0.ebuild 3865 BLAKE2B 10999d7fe76eb19c04fc54cdb995843091a8157fbbb90acac504baacc5cf9c411d351462497cfdac9594b40326b9d914f219be8ab3f1e31734211fd79262750e SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec
-EBUILD puppet-5.3.3-r1.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4
-EBUILD puppet-5.3.3.ebuild 3823 BLAKE2B 19a08621366ab57b447b76c1209b288736b40861eb6703d84166581bdb19c22c212b9d4247d33bcd39134748b186b13a8bfafede5a57d73c64b49045cd7cf43d SHA512 8ec7cdf210c22563867716154a316b07b96ec36bd3a7bd8bd0aa15f6a5b0dd8f61fb5855a94465049709d9e1e3db1b4e33dbdbe3ce4fc0650d9b51fcebbd631c
 EBUILD puppet-5.3.4.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4
+EBUILD puppet-5.3.5.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4
+EBUILD puppet-5.4.0.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-4.10.9-r1.ebuild b/app-admin/puppet/puppet-4.10.9-r1.ebuild
deleted file mode 100644
index c404e787afc1..000000000000
--- a/app-admin/puppet/puppet-4.10.9-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2018 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_EXTRAINSTALL="locales"
-
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/gettext-setup-0.10:0
-	>=dev-ruby/hiera-2.0
-	>=dev-ruby/locale-2.1
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/mocha:0.14
-# 		=dev-ruby/rack-1*
-# 		dev-ruby/rspec-its
-# 		dev-ruby/rspec-collection_matchers
-# 		>=dev-ruby/vcr-2.9:2
-# 		>=dev-ruby/webmock-1.24:0
-# 	)"
-
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# fix compatibility with ruby 2.3.6/2.4.3 webrick
-	epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
-
-	# Use working version of mocha
-	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing specs that need further investigation.
-	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
-		spec/integration/indirector/facts/facter_spec.rb || die
-	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
-	rm -f spec/unit/indirector/ldap_spec.rb \
-		spec/unit/parser/functions/create_resources_spec.rb || die
-
-	# Avoid specs that rely on tools from other OSs
-	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
-	   spec/unit/provider/user/directoryservice_spec.rb || die
-
-	# Avoid specs that depend on hiera-eyaml to avoid circular
-	# dependencies
-	rm -f spec/unit/functions/lookup_spec.rb || die
-
-	# Avoid specs that fail due to an unpackaged file
-	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.9.ebuild b/app-admin/puppet/puppet-4.10.9.ebuild
deleted file mode 100644
index a75388c365f1..000000000000
--- a/app-admin/puppet/puppet-4.10.9.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 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_EXTRAINSTALL="locales"
-
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/gettext-setup-0.10:0
-	>=dev-ruby/hiera-2.0
-	>=dev-ruby/locale-2.1
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/mocha:0.14
-# 		=dev-ruby/rack-1*
-# 		dev-ruby/rspec-its
-# 		dev-ruby/rspec-collection_matchers
-# 		>=dev-ruby/vcr-2.9:2
-# 		>=dev-ruby/webmock-1.24:0
-# 	)"
-
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# Use working version of mocha
-	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing specs that need further investigation.
-	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
-		spec/integration/indirector/facts/facter_spec.rb || die
-	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
-	rm -f spec/unit/indirector/ldap_spec.rb \
-		spec/unit/parser/functions/create_resources_spec.rb || die
-
-	# Avoid specs that rely on tools from other OSs
-	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
-	   spec/unit/provider/user/directoryservice_spec.rb || die
-
-	# Avoid specs that depend on hiera-eyaml to avoid circular
-	# dependencies
-	rm -f spec/unit/functions/lookup_spec.rb || die
-
-	# Avoid specs that fail due to an unpackaged file
-	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-5.1.0-r1.ebuild b/app-admin/puppet/puppet-5.1.0-r1.ebuild
deleted file mode 100644
index 5c5bdc43ab8a..000000000000
--- a/app-admin/puppet/puppet-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,144 +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="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.1.0.ebuild b/app-admin/puppet/puppet-5.1.0.ebuild
deleted file mode 100644
index 42e505f2b7e8..000000000000
--- a/app-admin/puppet/puppet-5.1.0.ebuild
+++ /dev/null
@@ -1,144 +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"
-# need to get deps up to date for this
-#USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-inherit eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.3.3.ebuild b/app-admin/puppet/puppet-5.3.3.ebuild
deleted file mode 100644
index 5c5bdc43ab8a..000000000000
--- a/app-admin/puppet/puppet-5.3.3.ebuild
+++ /dev/null
@@ -1,144 +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="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.3.3-r1.ebuild b/app-admin/puppet/puppet-5.3.5.ebuild
index 1f8461b191db..1f8461b191db 100644
--- a/app-admin/puppet/puppet-5.3.3-r1.ebuild
+++ b/app-admin/puppet/puppet-5.3.5.ebuild
diff --git a/app-admin/puppet/puppet-5.4.0.ebuild b/app-admin/puppet/puppet-5.4.0.ebuild
new file mode 100644
index 000000000000..1f8461b191db
--- /dev/null
+++ b/app-admin/puppet/puppet-5.4.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 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="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# backport upstream fix for ruby 2.3.6 compatibility
+	epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 0a70ef7b2d4c..80ebc1d5d0e5 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,5 +1,4 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-AUX puppetserver.initd 2021 BLAKE2B 0c01e8f60bb78f54288fc3c8db6114dc73a490bd6bf947a5655db0482e9a0cbe0bdbeff7a9409c1c4118856970ec05ff5d399e25a2394847116c1018e4ef0e32 SHA512 e219da1099bb4183f5b835b93d414a0c3181332e6e898d14cfdaa6e7347c98d23b01b98ed0995e60ab37c755c407d90ee2ad73dc7e63488c9922f62d569d89c6
 DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820
 DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53
 EBUILD puppetserver-5.1.4.ebuild 4888 BLAKE2B 530aec65438466346b7f8a3499164ebb0c8b70b4c58d583fb6e97d8a1d3d841e278dd82d2089aef15bf4a45b412ec580052d9dd10bba47271394df934422ed2c SHA512 093de3334a5fab1e58a3f3202ed4f194af1441910e0282f9c5b58055a190f74605bd49c982f72851268086775212e63cfa79442997ec94b79fd45b9a9ed76dd5
diff --git a/app-admin/puppetserver/files/puppetserver.initd b/app-admin/puppetserver/files/puppetserver.initd
deleted file mode 100644
index 080dd2c8de28..000000000000
--- a/app-admin/puppetserver/files/puppetserver.initd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig reload"
-
-LOGDIR="/var/log/puppetlabs/puppetserver"
-RUNDIR="/run/puppetlabs/puppetserver"
-
-checkconfig() {
-    if [ ! -x $JAVA_BIN ]; then
-        eerror "Missing JAVA_BIN."
-        eend 1
-    fi
-    if [ ! -d $INSTALL_DIR ]; then
-        eerror "Missing INSTALL_DIR."
-        eend 1
-    fi
-    if [ ! -e $BOOTSTRAP_CONFIG ]; then
-        eerror "Missing BOOTSTRAP_CONFIG."
-        eend 1
-    fi
-    if [ ! -e $CONFIG ]; then
-        eerror "Missing CONFIG."
-        eend 1
-    fi
-    if [ ! -n $USER ]; then
-        eerror "Missing USER."
-        eend 1
-    fi
-    if [ ! -n $GROUP ]; then
-        eerror "Missing GROUP."
-        eend 1
-    fi
-
-    checkpath -d -m 0755 "${LOGDIR%/*}"
-    checkpath -d -m 0755 "${RUNDIR%/*}"
-    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
-    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
-
-    JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppet-server-release.jar' clojure.main -m puppetlabs.trapperkeeper.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'"
-    EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetserver -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting Puppet Server"
-    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
-        -m --pidfile "${RUNDIR}/puppetserver.pid" \
-        -b --exec "/bin/bash" \
-        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
-    local retval=$?
-    if [ $retval -ne 0 ]; then
-        ewarn "Error starting puppetserver."
-    fi
-    eend $retval
-}
-
-stop() {
-    ebegin "Stopping Puppet Server"
-    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading Puppet Server"
-    start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
-    eend $?
-}
-
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index d3f0d234855a..381332c254ea 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,3 +1,3 @@
 DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
-EBUILD restart-services-0.14.1.ebuild 2286 BLAKE2B 5f3bbc83d329d9312b630437f563a64f9ca5b184ddef36256fb6a430a430bca87dc776d232a9896693325eab69ecb591845279d686148b0002bdd1caf2a51f12 SHA512 a0b0c6c6236b1576eefab2bcea6bce7f422002ffefa368c488d4016743c4d3b8a3bc0c6f0e4449f81582261f85e1853c8305d0d70136a244f229661c0623da52
+EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.1.ebuild b/app-admin/restart-services/restart-services-0.14.1.ebuild
index 4778727f1e06..d83a7fafc540 100644
--- a/app-admin/restart-services/restart-services-0.14.1.ebuild
+++ b/app-admin/restart-services/restart-services-0.14.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index f55c16110484..d50f3f7eb0e0 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -2,9 +2,11 @@ DIST Rex-1.3.3.tar.gz 274725 BLAKE2B a87576a136baac488a040098f2089412e6b53bb9bc4
 DIST Rex-1.4.0.tar.gz 289330 BLAKE2B 70d74753e5b04b05ea7a5507f5c8c19ae953b4cc28e55e4d52dd57bbe2b3084ec00195d9f65f1a4c0ba712238ba8efe0cc4b33f236a7c4f9bb429ad2f98af652 SHA512 d14489157860df1b32dd2b4af7ce8148a9693d66f59bc0ee228c7c4ff57f38f7b308212c18fc7c0aff7a585a76028a9de0a7a96f8eb58c2455d19bd6b2713eab
 DIST Rex-1.4.1.tar.gz 317358 BLAKE2B 8c12d54e86684ec224a75693f82fd4728af32a986f166d530bccc2d06c5087fdb29f067d4419f3160244d37c12ace6cd29ba1322992bcc9f4a481c06e00efa51 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e
 DIST Rex-1.5.0.tar.gz 327424 BLAKE2B ea735ebeef7a4d879ec61783c7ee803f198b4091882bbdbaee1b415330fcb20ba408f082e7ecaaa5c63664d905690bd6b5601d2d726ff20f5dc9d1f8c6d470a4 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73
+DIST Rex-1.6.0.tar.gz 331330 BLAKE2B cb3a2895c1b7fd775aa762e8af7fbfdf3d14aac0d4ed5cd32bc65f4eb2b7794e438015daf9602cea3a852ed17dd207c9647303a106d8fff2cc89b5ce7a5ff0a2 SHA512 8e4421e034ddf7337266ce2002e96cad12a632ff37742991685d2919e3b11a4f6f3348097fd36717ab83a38e2e46aa974d0e56c67568a857c30f7ea673a51cda
 EBUILD rex-1.3.3.ebuild 1141 BLAKE2B 605593249d74463ab84d33b3c678176ab3ef1884387ddd72d98ad970c3d511f64df35c08035c7d5117dd2a94cd3b286b6669a1c4c07f8f15df72a66d682d9601 SHA512 f2ed11f8acf92f45b0fa649f84d4849b8cac068cfeeac93010383e2f8463f820cf50da99b9f1f7c76bc7cc268728e26800e97ae99ac28ae2e2d56da4783cb3e4
 EBUILD rex-1.4.0-r1.ebuild 1129 BLAKE2B c8ecaff070f15ebf7e521368d32949f1421d0d033f865c85a8f3939c57501affa45c5bee769ee1a87a56a5d8365823d447cf8bd11b2fe868ab5f7609d503d54e SHA512 56e4de394eadb91801dfb686b56f4e2e84908cb4f5ef358c88e6f25f94512e6497d923a71d7ac8bfa3713ab7db26e22108f6a2260bee310c514a5e7407381be2
 EBUILD rex-1.4.1.ebuild 1130 BLAKE2B ceb39e880a747e3ac7c5ce2e3169c0568eb129d012a8a8e9e229812c9d9c892321b8d1444bff2bfd25a30fc474255b2f0468df694334b3df3ecf52779df295b0 SHA512 0dc625298b996064fbfdc389fda95b7bcc6bcee7d9321da2e0c54a658e6fe741a11d345472f2d19f331bd89c0bb1d1262d694229d1f48bac6310b03202e18784
 EBUILD rex-1.5.0.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
+EBUILD rex-1.6.0.ebuild 3666 BLAKE2B c6c91980826f316f658cfba66ffcd6ea87a74063c5bc6643df6e2941bf9d3bbbecc49fd7baac7f0057ab1e9649d96d4a0c1bef35225c57e7159d43791ab24ac3 SHA512 7b366e5f94d555dc61748d4d085a546edd092b0d435e3308ff264908e7a528585ca665eb7d0f5baa823b9b6d842c029372324def3e68c9028a2dff89a9f638cc
 EBUILD rex-9999.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
 MISC metadata.xml 23689 BLAKE2B 5aa6d9627f8f5b5564e231338a4b31893232a6593ba63278fdecf7cd345f1d7eadf756c4f0c77077c3b11b4b26646f9f1492c442cafb6f253d46cb3f72370e33 SHA512 136db3e5b2495b8e3b08feafeb4426c7692ee13d7366bec18e56e231d30823c3e36066a70538f0c3c972ec06955f746e8400819c22751caa164e1a72331a6148
diff --git a/app-admin/rex/rex-1.6.0.ebuild b/app-admin/rex/rex-1.6.0.ebuild
new file mode 100644
index 000000000000..5a34558d4efe
--- /dev/null
+++ b/app-admin/rex/rex-1.6.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="development-1.x"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=JFRIED
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+	dev-perl/Data-Validate-IP
+	dev-perl/DBI
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Test-Deep
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/JSON-MaybeXS
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ $PV == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index f0fa206aa899..3ea3f8c3b6b0 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -23,6 +23,6 @@ DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.12.1.ebuild 4376 BLAKE2B 2d746d6733b9da5cc81684254743769c5c769fed298c852d71e8a5cc8b51380a90fd4e43f88c9fa236e7189dde850266cf244fac30a7df04650ac0d38918ec78 SHA512 f110f4d7f66cc910c845490e7f61aa094a83ff95d8d886d3a807eb1bc9ccb20fc3c6cf0ef335ffa7d08ed673918edf30362f964cd349516074b14f26438a52e2
-EBUILD syslog-ng-3.13.2.ebuild 4676 BLAKE2B 1aaefbef2a2d445b8085644c9a61e835de34ec7583e80b9ce5e7289717a6c75a62e75a4d62c38c5e516bb3715e4e738b3ce005c9d4ef7b49e9775a5ff83ef7c8 SHA512 ffb813e4af346e1b74be4d84db7c7987fc966d121f9949608d3acc77ab2dd33e7258fe22ae78af4142c153120de8f87f297e9e2cda48e9c8b65787748611bbd4
+EBUILD syslog-ng-3.13.2.ebuild 4674 BLAKE2B 866870f74bc238d749ec04d59f6a20adebb11107ca5180707f1314f30bc7eb03ce07d48a3707ac3862152f69e21429390574df3308e3b51f922d0083ee5d76f6 SHA512 e0a43d536200f183894f119e87166deb66d07ccb4a78ef395d8c4241a0f1e3fccaca1eaadb76811ec09650022e2163be3066c85bd3519296d0e296903d94fd3e
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index a40f2a249fa6..f4ec9803cfcc 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 868a5a2cc125..a6133925f53a 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -5,8 +5,10 @@ DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f
 DIST sysstat-11.6.1.tar.xz 470584 BLAKE2B e9f85567743e6f0f2958afed40919c8bea7fc52f053fdd9bc7480e942e9a4a5620287f72cf26feedf4b74fc698331da2c305864b0037cf11e0617af2bc0da63b SHA512 55b3c361f7cda3d5efc0a42bef26d154c159a465ef45b56d2567f38aeec8c935c4e3b65a92eaf996abbf2d6a2604b2b8bba95741d707e8f387c9fadc05fafa93
 DIST sysstat-11.6.2.tar.xz 471452 BLAKE2B da0647f25e9f4ec4d320f664d2124bd2bd3cc42a78201f2c86480afeb6525b20c158e1577321a0316134fca7e77c04b303829104ae59b0d790ab29bff09889ed SHA512 8f117601272d3d9b887c454d610d06f014b76902cdc68f6a11e693bdc58bb7ad1cac1006681774b3e6173f3cadd9b1f36e126d1d7501f0910b092d125d1c68ce
 DIST sysstat-11.7.1.tar.xz 476916 BLAKE2B 016c5b6e2759af440ecd3bfc9b66f2b01988ef2e889090ab9156a7fdea02d9a3e6e47f6852ea699cf865d2ccf79d3152c70f0e23daf199edb936cb55a9a28fa7 SHA512 c0a8ce7a412e16d7d471cc0421a0f5586143ef8253f9a38872a63687bba50f98eebab5d501f92c4d085da51af56343628c8154cbd2d260b314153a17e23ff2e8
+DIST sysstat-11.7.2.tar.xz 485264 BLAKE2B 2915bf3eeb33d499517872acd9101e4b27e8f095b36cc106eeb8e6fc55806f9d1fa969d8c200ce4cb2bd7f0ed25b1a312e362bdc16ff7717f088c0f62780d025 SHA512 0e51c1e08cca4bb8489910d334d5f30c1854687a935f6734228d422b21827f035533f91d30d52c9a48c8be7fa15af66cd41d379a51e5a935b89eb6578e066d01
 EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
 EBUILD sysstat-11.6.1.ebuild 1833 BLAKE2B 6eb80ec1213c377bbe549ec4553740fa7af7686029270c288545ca0ffa892fc4adea2e083de4d1327cb00434282a19f4012578062f60ffd7c6485653055eab75 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b
 EBUILD sysstat-11.6.2.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 EBUILD sysstat-11.7.1.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-11.7.2.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.7.2.ebuild b/app-admin/sysstat/sysstat-11.7.2.ebuild
new file mode 100644
index 000000000000..b9b3e8d42883
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.7.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.4-flags.patch
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index d6e5e5d6377c..db0f3e8476e7 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,6 +5,8 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
 DIST vault-0.8.3.tar.gz 8128509 BLAKE2B 681b19e7a775e26d396411b137608bc5b68f1226e407dc254c9f498e59a6022d9633aa206b5efe692d35f816a6d8ee6399b7a00b64395b3d775b97fc46a93c6a SHA512 e2b273ebb761246f6d85fc040d911a3f3a7beb0951fed4adcbe5df4106dd0cb013328b5816ef4153b2c4d363f7f2a14ae1c82bae9baaea74ef707ff0934d6c8d
 DIST vault-0.9.0.tar.gz 8457263 BLAKE2B 021887cd3ab8185b3369f8355fc6cac23553e90277dfa2121fedcf170bbac19997f723c995ed0e00b80b25671ee827aa43a15040a6b57c43634abd5030dd7130 SHA512 c5755bd8a696764af2375ac51b955759ece36796e6c138e6fc3e8abd487c10ac41c8927501234e0cdfcd448021254b2f09097d8e00a6278b44f971d8b8442da6
+DIST vault-0.9.3.tar.gz 8694430 BLAKE2B 2ac99f5723b9ecf65382f10b795e51d29659b2d218732c6e9d8cc5a3a788a5dfbdc58926399a98ef27bae05454c74dec028a4ed631417788843c7ca7102263e8 SHA512 3939c952c12497f5fb9d4ba0fa4ca94acfd8ee8bb2f3636364dad680a54be4256d52018521573a0c1499a3cf573ff9daa27a52dee3ff7216181436b9aadea574
 EBUILD vault-0.8.3.ebuild 1496 BLAKE2B 3249d2b2cb3cc23d7b8d96670d7f5a55f3dd83792e6c491b7eef7609a4982e30de9470ac82e1805245e9e57c85f482f9494a55b6e760ed7ae7cc8781d1cb9373 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8
 EBUILD vault-0.9.0.ebuild 1496 BLAKE2B 3249d2b2cb3cc23d7b8d96670d7f5a55f3dd83792e6c491b7eef7609a4982e30de9470ac82e1805245e9e57c85f482f9494a55b6e760ed7ae7cc8781d1cb9373 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8
+EBUILD vault-0.9.3.ebuild 1496 BLAKE2B 4d46543b6efca5db609be21267274ad67a99c0761c407b7baf88ad17ed154759b462264f5f66047573ac3e503474ce56703f4dd150d677853a8ec5d252b7cdbe SHA512 2c0aa6df6b4c3d675eb177c8837befd10cc6bda97a5470441173fc5150edc20ff536efcaad0012df8684e50850514b512f958808881a1fe6ee4d25af374634de
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.9.3.ebuild b/app-admin/vault/vault-0.9.3.ebuild
new file mode 100644
index 000000000000..81830bee313e
--- /dev/null
+++ b/app-admin/vault/vault-0.9.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 41b672a55614..9e4c9abe05ee 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/stenc/Manifest b/app-arch/stenc/Manifest
new file mode 100644
index 000000000000..3bcee21abe59
--- /dev/null
+++ b/app-arch/stenc/Manifest
@@ -0,0 +1,3 @@
+DIST stenc-1.0.7.tar.gz 107096 BLAKE2B 678be2fea4eb3db5cf84a70243fd61dcb574627bacb59b2f9af682e2e0851d41187565b4706313c98bb5b297f865b1424bc47c52f15efa2a2e8b2c7413b09009 SHA512 84cb0114c969e1a5122a8621d2c136663ee2a2d9aae1d455631c1d4555e947f4841004b74a1f63b800be713cfae637c19ea34adf40f0bc81f1c56a555a27ba31
+EBUILD stenc-1.0.7.ebuild 392 BLAKE2B 0c77bb626edfa95d7daf8d0af5812188d9bd847ef5973ef9a8093a7144fcb3a4e888b1ef056237d0e7561bd269aabb56c0cca2d76d18c51568ef66d22d2b96b9 SHA512 161372826f561a9b8b483740a6dd953e0f0d990fe072e281fb574ae477828b3ae712db0139e03f13bcb26107c42ba09e8630017fe1c658ad30fc8e4acd443387
+MISC metadata.xml 654 BLAKE2B 982000d4f28b24c8227f79cdf9f8303602cce90c331f65006b9c643ce2dc8f4d8ac279d035a3a13880061d2f046a4d6409d1b4a0fd32471857d1de3a7852dff0 SHA512 b006cc3b028a14809d2a203b165b1eb71861202a6a067447d715c211a1e6c6b6239e9eaf76f0d88e735dbabc4aa6c87457fdbe86ef1a4e0152ce936a90d62a08
diff --git a/app-arch/stenc/metadata.xml b/app-arch/stenc/metadata.xml
new file mode 100644
index 000000000000..8dabb18f4782
--- /dev/null
+++ b/app-arch/stenc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jstein@gentoo.org</email>
+		<name>Jonas Stein</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>mailto:jcoleman1981@live.com</bugs-to>
+		<remote-id type="sourceforge">stenc</remote-id>
+	</upstream>
+	<longdescription>SCSI Tape Encryption Manager - Manages encryption on LTO 
+		tape drives with hardware-based encryption (LTO-4 and later).
+		This program should work on any other SSP capable tape drives. 
+		Supports key change auditing and key descriptors (uKAD).
+	</longdescription>
+</pkgmetadata>
diff --git a/app-arch/stenc/stenc-1.0.7.ebuild b/app-arch/stenc/stenc-1.0.7.ebuild
new file mode 100644
index 000000000000..2a47f9366245
--- /dev/null
+++ b/app-arch/stenc/stenc-1.0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="SCSI Tape Encryption Manager enables AES support for LTO drives."
+HOMEPAGE="https://sourceforge.net/projects/stenc/"
+SRC_URI="mirror://sourceforge/${PN}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ec0faaa372b8..4fbcd0d2073e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/qt4-fsarchiver/Manifest b/app-backup/qt4-fsarchiver/Manifest
deleted file mode 100644
index 7f0bd21317c1..000000000000
--- a/app-backup/qt4-fsarchiver/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST qt4-fsarchiver-0.6.19-6.tar.gz 480288 BLAKE2B c27493cdfd9c19455d04b696c1785162d592dc15014ebbfc2e3a2412ba13061097fdf97f0697cc21f6ada6f6e77760e1d3e5619a82b026feff2835a0a632af77 SHA512 b542cec478f901cf1c6678a202183e9c7f047efd906a53bd2882385482d0bf20fbd46374fc60751e7e5ee04a6048643e3fb58ffefd883799c54b48c307aad1f3
-DIST qt4-fsarchiver-0.6.19-7.tar.gz 481129 BLAKE2B ba7c908a3dd61fe4640d41f57e8ed2dcd36288730631b0e3292144fc0429d89ae30f2f8c3951906b8e1e6704bf0c81469b9aca7ef260ed21e52484e4b6ec60a9 SHA512 31495858a27f7a1790ed492d69ff70eaae458f48f2afbe066507913289c3ed861389a201f03a56e3a5a3665eddae58371fe1d648bd10a3e96fb8240a40965b1c
-EBUILD qt4-fsarchiver-0.6.19.6.ebuild 1353 BLAKE2B 4d9f6d228e6b6d673dc9dc6d7f85ae5ba67ba41dd4b87a34c7754bc213ce31300fd3c7e5cba6ae54948dc1701a055acc68dd74fe77fce47bf7c0b0fdcd6f4140 SHA512 171b00f6524743d1419b01fbefa9ddda28b384eb0138b17d1e14981acf0d9cac328d1b2def766ec3b877ffffed9bebbe330d7faa178a1258191132f05fdbf268
-EBUILD qt4-fsarchiver-0.6.19.7.ebuild 1355 BLAKE2B 60f715ffb2c2d2d1f1f8e933cdcf20134261d902649014a7cd5821685bfe2601062feda1be19ead1b1d407667e2961402c55a2caa6b26795ca68da4677c7fccf SHA512 a74bf8682e9eb6bfd7706abeaea8f627cd3e3222550bc5ce4243da3fee1107836f1dcd4b02271ddef6f665a708e0dfeacdfa847356a292f06eedb6cc53814909
-MISC metadata.xml 251 BLAKE2B dc57ec9447618f10153210464871c978e91c349fe2adf6bddd75181a10e803b6d1848de2a68304bf079cd095c71bc34d6ace0933cba3c143b72c825efabee874 SHA512 25931431accd5a4d77880d3813d59919cd3e14ec8eae8ff1a835e40ad5893106be09b22c4107a7164f0b4fe691a39ab001793609e3c598f14d38d5714c3bc601
diff --git a/app-backup/qt4-fsarchiver/metadata.xml b/app-backup/qt4-fsarchiver/metadata.xml
deleted file mode 100644
index 01d299d313ad..000000000000
--- a/app-backup/qt4-fsarchiver/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-needed -->
-	<upstream>
-		<remote-id type="sourceforge">qt4-fsarchiver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
deleted file mode 100644
index 3a97f35e85a4..000000000000
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-MIN_PV="$(get_version_component_range 1-3)"
-
-DESCRIPTION="Qt4 frontend for fsarchiver"
-HOMEPAGE="http://qt4-fsarchiver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-CDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libgcrypt:=
-	dev-libs/lzo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/zlib"
-RDEPEND="${CDEPEND}
-	>=app-backup/fsarchiver-${MIN_PV}[lzma,lzo]"
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# fix .desktop file
-	sed -i \
-		-e '/Encoding/d' starter/"${PN}".desktop \
-		|| die "sed on qt4-fsarchiver.desktop failed"
-	# fix icon installation location
-	sed -i \
-		-e "/icon.path/s:app-install/icons:${PN}:" "${PN}.pro" \
-		|| die "sed on ${PN}.pro failed"
-}
-
-src_compile() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  sys-fs/btrfs-progs"
-	elog "  sys-fs/jfsutils"
-	elog "  sys-fs/ntfs3g[ntfsprogs]"
-	elog "  sys-fs/reiser4progs"
-	elog "  sys-fs/reiserfsprogs"
-	elog "  net-fs/sshfs"
-	elog "  sys-fs/xfsprogs"
-}
diff --git a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
deleted file mode 100644
index 400d49c9fbe3..000000000000
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-MIN_PV="$(get_version_component_range 1-3)"
-
-DESCRIPTION="Qt4 frontend for fsarchiver"
-HOMEPAGE="http://qt4-fsarchiver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libgcrypt:=
-	dev-libs/lzo
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/zlib"
-RDEPEND="${CDEPEND}
-	>=app-backup/fsarchiver-${MIN_PV}[lzma,lzo]"
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# fix .desktop file
-	sed -i \
-		-e '/Encoding/d' starter/"${PN}".desktop \
-		|| die "sed on qt4-fsarchiver.desktop failed"
-	# fix icon installation location
-	sed -i \
-		-e "/icon.path/s:app-install/icons:${PN}:" "${PN}.pro" \
-		|| die "sed on ${PN}.pro failed"
-}
-
-src_compile() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  sys-fs/btrfs-progs"
-	elog "  sys-fs/jfsutils"
-	elog "  sys-fs/ntfs3g[ntfsprogs]"
-	elog "  sys-fs/reiser4progs"
-	elog "  sys-fs/reiserfsprogs"
-	elog "  net-fs/sshfs"
-	elog "  sys-fs/xfsprogs"
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a9ad85d8c952..59437c8b2a0e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index cbbba0e788b5..65c166d1b597 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,5 +1,5 @@
-DIST cfssl-1.2.0_p20170915.tar.gz 8027590 BLAKE2B 5361a9ba7f08d3940aa5e27f65b55359871d85dcf8e4f21b6e59a9f3c9741490b16898e2001133742dfa1294927b0b322ffd5bdf836754851bed0c176bc710da SHA512 247ee892f7785ae11e8b2d38c1fdad0a3bcea9d9e410ce1bc985d15fad65b981c46e317cbb0fe0cacf190dfbbad7b9f8685f6ddd2a24056dd61e621b2cccd232
 DIST cfssl-1.2.0_p20171207.tar.gz 8028127 BLAKE2B 35bb2b6fa08345dd6042742891cc0ad87ffac3cd24e8f16551e7e4e36b7f11caf4baafee961666ed95cf14e77cf4e24e11f7d8d85503abfc42a8fe3fbc2fe758 SHA512 d94f27bcc5f59fb2882f6db802baff9706461f1a823706810f7ab5911fcdd3abc9150060df0aa756478774cf3b5e06aec0b11cefce32ff3c6ff85948b8624356
-EBUILD cfssl-1.2.0_p20170915.ebuild 815 BLAKE2B a6614c4a40fe991765dd68152636ff25755e9b0563f9ac09e62470423b4c7cac507702218fe28c91dc6f7e5c142e30536220c88b21a92423146c210bea8488c0 SHA512 8501dc18bb7796834fd17dec4387c33b3c94dcc9f3a24d55d990c8cab994c64db0831474d7ddac2030c39a3649953d998f0f32b506b86aab4cc06804da2a38d7
+DIST cfssl-1.3.0.tar.gz 4378109 BLAKE2B 4bc77b3aa8b47e0e5a434ff50e99cde44b750743dc58c18736acfd0115f6cb03533c0d4ff6e54111cdfc2a8c7d6d83539d07de5fddb03eda8a8a95b8b573e767 SHA512 0db85e82e10982f0c0c03fcae20fbc1936018f7252517cbd9a6150ff5d8f41c5e4719814a8a64a424065e4813b7da073e4ebb50306e1d673f0de7706a0c0e2fd
 EBUILD cfssl-1.2.0_p20171207.ebuild 815 BLAKE2B e6c8bacf23c21205030b323817b741ddac611935205e33d6eca62643325e1bb7b7969f9629461d80a35f9c72a2326d89db9166d31115d3c559c06301cacfddfa SHA512 068ed8bb974107a1f921207e9e4a136adc0fc6375f12932c1398465796387a8bbc58c9dcfa2fffb19ca161616d2a1cbcaa1a07fc8bf609c40176d46e08112f51
+EBUILD cfssl-1.3.0.ebuild 751 BLAKE2B d568e2e9b82a8e0283ff2bd800b095af24babc246591753a6545ba8f66ec147b954a923acbb8b895eb222f9864676689be88f7537bb2be86e6e05f6109c67688 SHA512 42160c4d5d76ab92ce4ce2571dd3d3853545bb66edec6c538336d0a5423fa49ae514cbe3ac539f0d5a0d07bf3fbea52a32b65f22fac884f571b591dee2493798
 MISC metadata.xml 326 BLAKE2B 519dd19dc05c50ee2b35580a1ca47b6be4438fcd5737775b098f2bf7cebd7ec3ff88a3d5c9c27a256cedaaddac4b6eeb20f1dfb442d651a7ec31453c309c7c52 SHA512 11be8680812e220202583bd324d756909056b58b9fdc74c769bd1beacc97292c9dc0d7a396bc6018c77d050081654726dfc659b43efc957175d2e2fc57039ffa
diff --git a/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild b/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild
deleted file mode 100644
index 17742ad0c2ca..000000000000
--- a/app-crypt/cfssl/cfssl-1.2.0_p20170915.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
-
-EGO_PN="github.com/cloudflare/${PN}"
-EGIT_COMMIT="7d88da830aad9d533c2fb8532da23f6a75331b52"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc CHANGELOG README.md
-	popd || die
-}
diff --git a/app-crypt/cfssl/cfssl-1.3.0.ebuild b/app-crypt/cfssl/cfssl-1.3.0.ebuild
new file mode 100644
index 000000000000..934900865540
--- /dev/null
+++ b/app-crypt/cfssl/cfssl-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Cloudflare's PKI and TLS toolkit"
+HOMEPAGE="https://github.com/cloudflare/cfssl"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="hardened"
+
+RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install github.com/cloudflare/cfssl/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/*
+	pushd src/${EGO_PN} || die
+	dodoc CHANGELOG README.md
+	popd || die
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a6eeea2b5611..73cd0074419e 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -17,6 +17,6 @@ EBUILD gnupg-2.2.0.ebuild 3121 BLAKE2B abb9424fbbd74ed5d0e3a71f48af85e9d569601ec
 EBUILD gnupg-2.2.1.ebuild 3224 BLAKE2B 3e5c1fa5fdd5fbca8a5b554b09e2221ba612185415e009ebbf2e999369dfa4697139674ccf94b9be52bc2c8024b56a4a846f1803a940755a1650765325a10d17 SHA512 ebe3107c7444f4f821760d854da5376a9953b7e6781673cc55b3704ce9accf5306277140648a047f9fe705c7e5ef7922e45c0fceb8508d80edd63b6dab08b579
 EBUILD gnupg-2.2.3.ebuild 3209 BLAKE2B 44f319cfee71a4c4c38deb496f361e022e2b729b2d075e3d2c03f4276f69b5b8e42bffd90eed5a8b0cccc468bf2512cd6c6b593e6b74cf2ac9867c8f05b0b447 SHA512 4800b7469ad42721294d08c05aa32914a9f0b6d8313efc10a44d5d6b4f9e62d8ee4eb083162808aad5b9829ddc041ea4cac53a60f7b7614451fba41a69c39a28
 EBUILD gnupg-2.2.4-r1.ebuild 3206 BLAKE2B 084fd1814201be6c963a2adc262e4a8c137950cd07a15d9e021d149de752894b3db1096ccf59f04f97fe7ab1764471b6063e103e8f28bb0fc68a2d3ea04f1612 SHA512 b3112ebc907b92caa56f7786a15589701fcbcceb1de8f8ea78d22921a293d84454902f8ca11250c63b5f833936cc46d3d31d5878df712586c032b1297980c603
-EBUILD gnupg-2.2.4-r2.ebuild 3277 BLAKE2B 9823777c197f629c7776b7e61c7d239bc7b174444be69b35ee4c707f8cb61cd9c1ef491bfe863a5a37c1c0b284183d705e952a7b3c1030f4b1aae13ccea76470 SHA512 ed62cccfc4b81acea0f9b9a18c7d652c05a1ae5d4740350df50443a3004605a3d399fd58120636c84b896069d2709b1fb8a56b9f7acf29f22b70404f4a971eba
+EBUILD gnupg-2.2.4-r2.ebuild 3276 BLAKE2B 47dd4f570c540813b35d125bbcdd6dbfe40b7d5945bfe6465b070680261a44ada458f14dcf7b15798b999bb19e7b4f5a5c0a55b022e544b680998fdd2d8572ae SHA512 d90c3acdcd170127da8db75e846a062831b5ba517b95b226f046f7a33f436e4a64208e5c44f79c9bed1825dcef44694334625c6e65aa6faec1471ac557d35547
 EBUILD gnupg-2.2.4.ebuild 3203 BLAKE2B 42bf0180668dc428b4d6529d23f38c82ff31bf9ad41c8be1f157718f25e96203d16a9e6e6f2764bc8865fa78001ca862a3ca81b1bffd1cc569a6e706e45f6487 SHA512 13fbcc6aff14cde19508f631c9912e5b5648cda50c8a8ddf4b9fe3a84495344470747f8d57a238f3323c651290eaed6935b958f7fadf408a257fea4b4a011ffc
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
index 94a73507e7e8..2974f53aa9ab 100644
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 4baffda655d0..dce6c60f569f 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,10 +1,10 @@
-DIST keybase-1.0.21.tar.gz 21127410 BLAKE2B 9f48b637aefa847ae5737937ed6bc3d9b7d222cda3ce5a388784104655092c1ad5fe0468680a1e0a02f5a7ea4fac1fb8e19430c9e4c3d542057953219976cd02 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5
 DIST keybase-1.0.33.tar.gz 29170354 BLAKE2B 78799ea49cde32e3c1be781e281b5ca188f7a5d846fcb7e41605d6e2526bc4e36f6ef991567631e9c72eeb6b194ebec740516e886f4af419b01e47622f030c42 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4
 DIST keybase-1.0.36.tar.gz 30043919 BLAKE2B 0053088754b0a4a47314032e87a7c5165aff59ded585ae20fb12c3dbf0c7437f7f0370f236fec0db501cacb3a75e87ed494df8f688d360c58904e851eb119f60 SHA512 c6bd4805240bdafd27eac382a30fac6e5ac3e6eb313dda027533c3a8f366077c894b38c1b972ff5688104e1ca4231cbf4242eeb168de9782bbac732da5639ed0
 DIST keybase-1.0.39.tar.gz 30226025 BLAKE2B 5d10e4afe3f0f1691221cbf69ff3e427fe318768e74f5891d32416e92ad5c1c45ad3ff0c83ea2d2405f4492a2d2af989ff587c60c9a5677ae580c9502e9a5726 SHA512 def416bad6fc3513a3341aecaf03bce356a890667e4c64f9edc1c469b3a1f167c3022f6c1aabaa48257983aaa9826b45117ada6cc26bf862c97092c904cd32f1
-EBUILD keybase-1.0.21.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
+DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ffa09c46276104171f103f2fcbb29199013ad8075fdddf3655f63f55cbd2f0d0768b5f0e697b7339262736d9c29ca5 SHA512 1382f008089d8704167842960aec9e4007ac32db589bad45944428ad92ac90b1802338ff6ccc0c570d40b9c9115170a2e15c590f875cdc8261d203c01402385c
 EBUILD keybase-1.0.33.ebuild 917 BLAKE2B 2b07280d94ecfbd1e1320b2822ef82c00956cfc2d739ea32a372cb0923363578210dd2af4da73bd1608c7eb712dbb9126cd22d352579abf9c9db9fe567ebfb8f SHA512 eea7d2c7a7df423dfa99f7a4e5b1fcac446bc9a170a26f0cd6bc4a695e9a1f1c8008b558bcbf39a0e90e531c88bba2e77a352a7ae72cfca259e6907265373b38
 EBUILD keybase-1.0.36.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
 EBUILD keybase-1.0.39.ebuild 959 BLAKE2B 36385869dc6a89104de7df5986b086c1531819a46351c62578e8d672ea4e5271b137a1cb84221de497a7b560937ce14a60ae3c60ea3634d77aad175cc5033f6a SHA512 c81f68541117d81ea1b5f68877e8ecb07962b4677d4039f74d815b15468bc6a72c68991dd76f12ce14cb43f5b81b9e897d136a9cfa69d02f77e7797aed0e3076
+EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7
 EBUILD keybase-9999.ebuild 893 BLAKE2B dd27632b3d771ba1e50bf4ba115f4e7a4b096d2245b7e8ed2f0bee425ebcef5ff01f430d7880466705a5b217415b5057ba0a9360d7efcfaa766528fc24799494 SHA512 763f66c3a48a668a5382cad7ddef2d1bc2c4874a6bf226f2930401f1e932104631a68ee89b9cd37bf794959447b64381c04ea60567c38ecb625b64d9267ed5a5
 MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810
diff --git a/app-crypt/keybase/keybase-1.0.21.ebuild b/app-crypt/keybase/keybase-1.0.21.ebuild
deleted file mode 100644
index 92df05b55e79..000000000000
--- a/app-crypt/keybase/keybase-1.0.21.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
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/go-1.6:0"
-RDEPEND="
-	app-crypt/gnupg"
-
-S="${WORKDIR}/src/github.com/keybase/client"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	mkdir -p "$(dirname "${S}")" || die
-	mv "client-${MY_PV}" "${S}" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}:${S}/go/vendor" \
-		go build -v -x \
-		-tags production \
-		-o "${T}/keybase" \
-		github.com/keybase/client/go/keybase || die
-}
-
-src_install() {
-	dobin "${T}/keybase"
-}
-
-pkg_postinst() {
-	elog "Run the service: keybase service"
-	elog "Run the client:  keybase login"
-}
diff --git a/app-crypt/keybase/keybase-1.0.41.ebuild b/app-crypt/keybase/keybase-1.0.41.ebuild
new file mode 100644
index 000000000000..581d0d13e243
--- /dev/null
+++ b/app-crypt/keybase/keybase-1.0.41.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.6:0"
+RDEPEND="
+	app-crypt/gnupg"
+
+S="${WORKDIR}/src/github.com/keybase/client"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mkdir -p "$(dirname "${S}")" || die
+	mv "client-${MY_PV}" "${S}" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}:${S}/go/vendor" \
+		go build -v -x \
+		-tags production \
+		-o "${T}/keybase" \
+		github.com/keybase/client/go/keybase || die
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+}
+
+pkg_postinst() {
+	elog "Run the service: keybase service"
+	elog "Run the client:  keybase login"
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 2b0691942984..52c02ef5e92c 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -2,8 +2,10 @@ DIST yubikey-manager-0.3.3.tar.gz 51223 BLAKE2B 41bf4e6edfb597420ebc438315c2482b
 DIST yubikey-manager-0.4.5.tar.gz 55315 BLAKE2B 231706a14ba9d65474c8bd92cc57fec3f056da1e84b2303b370a7d9e29d3570283099ec30ed803ce53e6388afabee7bae4674ca34e8dc60d30e0443d4686e204 SHA512 232ce7557aaab3c8a27dfa2ceaab0491ac1f97d4332b25e7f77c968da48c9303627defd0246b1e97c7ed766e6a667ac996ac0430cfeb4e7310a0cfc4a633d1b2
 DIST yubikey-manager-0.4.6.tar.gz 55065 BLAKE2B a0e8d85252836a6d99e68f637f42397266187372b0fd0723ea6d330a01e42a2b79d9fc5f283d7fab2378fe847aaf0cb307f16694ce59f41aabd7fcc668be01fe SHA512 fd52cb346e95b3184fd8e4bbb8e227c75780d7fcf5057712c6def866ea951700f8cdd1286ff857e32754d539dfc7093d809fc585191b05c57f5f983d5b288e7e
 DIST yubikey-manager-0.5.0.tar.gz 59672 BLAKE2B e5dbd32ba644e7b20f03c1511a4ff608c0e6dc93c115edd50077a9a41699411a5fd0eff3d62af1fb13545d977037510f696cbd27150e21308624bfc8613f8bcb SHA512 3a503ced29a557c5adafdd1bc6025a405962cabab7388c96e8f5582165bd33111adeb3b77c7c928cbac905fb085d53ddaefbb12169b54e62b7337c1989636a8a
+DIST yubikey-manager-0.6.0.tar.gz 77823 BLAKE2B 37d9a7e72135ba859521f209896c47423f3573b2f14a56956d145334124f7bf5a4259401a9e89e3f19b2e01a476b96a984e801a28a256815a7773baa44e71773 SHA512 fb49887f4646fe63874be9cb3510ef0d1f9b931ac5fb78f3cc82fb93ada94b36aa06fd91e2ee9d4ea868abedfc206dbedd02fa0c4385d5557d33e07e8099e761
 EBUILD yubikey-manager-0.3.3.ebuild 736 BLAKE2B 4d8cbfd4942f9dbca49240ed76c701d2bcca2e23aa3ffdb0f5346206938ee21fa003a197161e909a14c5d08b54956ecd5aefb659f363e7ff86d1e4994f23c685 SHA512 16b96e49659f6a5a4b9b3e90a61896de9d6cbcf991e2d9a44df81c48be8f7936f5de7aec380538cbc8ed034b54617928b456b53a2c322631dda476c6e6fe2d8f
 EBUILD yubikey-manager-0.4.5.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
 EBUILD yubikey-manager-0.4.6.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
 EBUILD yubikey-manager-0.5.0.ebuild 858 BLAKE2B 4218bcdb0c21ac2624282e8d174b74080b74cc0c62d0804e836dfe6d08dec99866af2d500c27837181e7574d0abecc4c97a8f565867ecf3adbae5ef2a1bfa3aa SHA512 25ace32bacc3ea4dafcc330222cd21b327e859ce138a4a2be4f07a322860dbf503ff00f9b32cd282ff8a97ade6aac59b4b9230ec23cf78b583bec490a614ed79
+EBUILD yubikey-manager-0.6.0.ebuild 1206 BLAKE2B 108de94576641f16b0a706d50c6d313ce14f437416bc05fffc3593ae37024d0043f323b13a0f6e31564307652a34ba5c057f8932d79c6a2fefea7035e68dc225 SHA512 6e5d43facf6e57595d118bab7402d75504073a39a21c06475add9cb50682fc45518d8179ee90fec4c6bb2bc6cf326cd03448071da81f7be6688d76625d418c3a
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
new file mode 100644
index 000000000000..3379be37dba5
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# 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,5,6}} )
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-crypt/libu2f-host
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	dev-python/pyusb[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	sys-auth/ykpers
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 417dedf769fa..a6d38724a3dd 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/qvortaro/Manifest b/app-dicts/qvortaro/Manifest
deleted file mode 100644
index 3acf47f0f38d..000000000000
--- a/app-dicts/qvortaro/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qvortaro-0.4.1-gcc45.patch 282 BLAKE2B e161cfd3e9443cdc898be2922443be8f5a93e29a61318ee5641afe83ef2c6f929f9682220c7fd8dd1a8611dd19fd0a99e2c772b2c3c3bdf4e72f648f08cbd1d5 SHA512 be17b78a4f8720a8201f19e792177fabc8cc3942e0f5219c65446b809066868f958da3f04bc765715a60463f023dba658d394872cd4de5f50485b4955f1bfc88
-DIST qvortaro-0.4.1.tar.gz 174664 BLAKE2B 02c6965d2197132109e22867275598231d8b5286490575595a93b0625272b9c6b01a7698a196e62c2ac9b850f8c872a49d51887a7985b1fe8a6f14201db8c29a SHA512 a3ac90597d1e2f530f4fe1482945e266ca2db00ecdffa12a9aa9087c9730e52e0a89baeea685801a311962ab3fbcb57c1fc67d35be2612f93a812421da06579c
-EBUILD qvortaro-0.4.1.ebuild 535 BLAKE2B 9f8092cfb1b618c34a15a548aad3a62e9716578fb1e3b53648d1b4d1420e7a94cc06b4fc580cdf696671cf6528ea115255e1759d4b38aeb58401993edcff6317 SHA512 ea62ee1ef717c251fe9f3da37c37e6516d8d1661f3d959b5bdda4da08065f2717d91e6e491a870d79835498f37825765549dc2c61b36e9760feb9050a21fd51e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch b/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch
deleted file mode 100644
index 431cdc4914bf..000000000000
--- a/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/322213
-
---- src/eolistbrowser.cpp
-+++ src/eolistbrowser.cpp
-@@ -28,7 +28,7 @@
- {
-   ui.setupUi(this);
- 
--  rxEscape = QRegExp::QRegExp("('|_|%){1}");
-+  rxEscape = QRegExp("('|_|%){1}");
- 
-   m_model = new QSqlQueryModel(this);
-   ui.list->setModel(m_model);
diff --git a/app-dicts/qvortaro/metadata.xml b/app-dicts/qvortaro/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/qvortaro/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/qvortaro/qvortaro-0.4.1.ebuild b/app-dicts/qvortaro/qvortaro-0.4.1.ebuild
deleted file mode 100644
index bc48c746a03c..000000000000
--- a/app-dicts/qvortaro/qvortaro-0.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="Esperanto Dictionary"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-gcc45.patch" )
-
-src_install() {
-	dobin qvortaro
-	newicon src/img/icon_16.png ${PN}.png
-	make_desktop_entry ${PN} qVortaro
-	dodoc readme.txt
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 7f7b5ea08428..ca1bfa4b7cd9 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/linux-kernel-in-a-nutshell/Manifest b/app-doc/linux-kernel-in-a-nutshell/Manifest
index 462a1ba5a1e5..d9d18e29996c 100644
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@@ -1,5 +1,5 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 668 BLAKE2B c13ca764dda385dd73fc835443da6ec3b6825213ef474819a74ae1a511b3a43804afbea2337755d80e8e5e69fdd3af932eaade76313720c4a662fd5ba3615e60 SHA512 f666a495d090d996ff1f96b9ef6feb6bc7eadac71b34ed454d54c404908c70307bed274de9a59803c1c5d423dc7452ce5f6985a85115126d24808794c0900326
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 667 BLAKE2B 7a60bbb96f40eb87d0b96f3a498b9e3ad7f2548d190bf410919c325cdf8d92147edd009ee6a7ac2cd92e912f64840c2677fd1b72bd3a65272fa544c81f36740e SHA512 2f8b6718cb91cfbb3e8b7b2bc13bfb302127ca1ae86971e16688a503d619ab8ca54f22118190f214cd3bcebbbead1dc37685f09183d95b64804f85507a74878b
 EBUILD linux-kernel-in-a-nutshell-1.ebuild 644 BLAKE2B 228bce01ce5ecf7c8bc8c441e5b1a9722c056d6e02004c6de56dd597c058d4baf7885b321e82c320a25eae14e2c78801b273eee7f17e8e202c03ee900e8daeac SHA512 de7e025ebefe5fbfd920411948524ad3261f7460c6f0eb1ef7f6bdb07f9f04f3383692de514a09ed6858f273ce5156eab51a5f90a98319a36f6103c11814e1b6
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
index e832e47a2c0e..2c9263d75083 100644
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
 
 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-doc/mkdoxy/Manifest b/app-doc/mkdoxy/Manifest
index dcba3e1f7041..ae7d26c7db61 100644
--- a/app-doc/mkdoxy/Manifest
+++ b/app-doc/mkdoxy/Manifest
@@ -1,4 +1,4 @@
 DIST mkdoxy-1.0.0.tar.gz 11109 BLAKE2B 348d62a189d2f79432eafb65824b90bf0a3f82fab3621edcdc9fc04859b1a901cb71fd05773aee57431559bbc7a1055668fe710e719a6a8fa86a987b2c8d64e2 SHA512 0d40282da6b15cdbfe10e41549acc48241e6732519025e93f38d5d76c93ff180b41cc458fc8dbad4ab81bc28a96e4801c15577d39496392a05e743e581d19241
-EBUILD mkdoxy-1.0.0-r1.ebuild 555 BLAKE2B df4c8fcf6cfc347c71b6a59671edce86bdf853c88576bc688c444e2606bda558b3b3fe2604ba03ac60509a91656ff07188ad90878d61ccd6d83dd4fa0edcdd03 SHA512 0bdd3e65e497a2fc5dee70ed8e09c0aecff7043d9135c5584f9c13a0a1ae51683e67032b074baabb2c68ba4017a39c2d982aa65ad618d986798f2a0feefc60a0
+EBUILD mkdoxy-1.0.0-r1.ebuild 554 BLAKE2B 1c6bb8ad252babc0385f14218f654060dfd79169535778ef3c7028f3a9eb1b3746286d0253837cd83d3c6333ef83f6b565c76867b3dc13a2e01b59807c442488 SHA512 686457059148f612b9a5b36d6f3717b6723b20eb22f9c537f96488b5bc71f9786ca7bae64c684bed4d218c37894543653644b4dca0488e400b8b484d8c5f27ee
 EBUILD mkdoxy-1.0.0.ebuild 517 BLAKE2B b9b87a6bc2188d834715670135e6799cbf2fcfd34c618752b4372b1dbe9bdb421bc8adf7f7877fa1ccc761c1c3e7ac240bf7d0633ec78e24d29533b039788eed SHA512 b16cb09cdaa4d5f49c9791b573bb789674dc003c93796517b2084ae391a3d0eae5a29ebd87fc5e2267da3d45c89cfaa9a7c2e22ec6dc92ce6147232e55cbce81
 MISC metadata.xml 353 BLAKE2B 0433be5fd165f3af420f9f1fe357b7ea3edb785662dfcf3c4a47fbfdf7134ad82b733bd6d54ca5c9bb9640fcdd35e0a0b94634071dfe6ffc50018e0f05477d38 SHA512 aaf9f25dbd03b04756347b66753434800e575c2c9e63ebbbd58602c7a67929498db6b9ff4c3b50ff1031f49438c48cdf88d61169e00bd09b2b6510a68666ae83
diff --git a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild b/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
index c205195b66e2..0ee85bd51ff0 100644
--- a/app-doc/mkdoxy/mkdoxy-1.0.0-r1.ebuild
+++ b/app-doc/mkdoxy/mkdoxy-1.0.0-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 47c3574ea6fe..d1089de46bbe 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index bb6604944ff3..4824475af050 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-26.0.91.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-27.0.9999.ebuild 12563 BLAKE2B 1e055c47031dbdb4a85eadb6dce9af654ae4db6fa2efe5c8b9d5b997c95a924cd14c311a0259202be313d6bb749591b7b5b961f1060e06bbd810c2d26dd11be3 SHA512 889477a06c2feced7647071592f3a06e871b29a36ece4f006f6c83e71082b931c26cac7294938bee54d88ebf8d817b65a81c6b04ccff9e479c7063cc325df060
+EBUILD emacs-vcs-26.0.90.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-26.0.91.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-26.0.9999-r1.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-27.0.9999.ebuild 12846 BLAKE2B 6e2bed8d56874d5feef6fb45f9863758e7948396442b2d20bfb716b84eab70c9339cecca562fb3907f9432da3ff4dd9c9b1ea16a7f90377eebddf016d8c108c2 SHA512 3f15c529e3373db897a345de9544e1c98fa896bfd756c2bc3042090b0d4fd5385cb2b3e0496b60284ac52a6fba96c030f05d3d7718d1edccefcc743b3cdf4b4d
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index e45d3a68bbe7..ef040e969456 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 850cbee98442..bf715a63be81 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,8 +6,8 @@ DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7
 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-EBUILD emacs-18.59-r11.ebuild 4236 BLAKE2B fed7eab492eda2b43052157f1acae73f5bfb5ce7442d31e998d911f2fc816644362291bb792cc69d4892905ce5dad59f1fe7f1f8be49840b788c218ae53ae074 SHA512 dcff2915f687ce61501c26aee208d7930a12792911bd0b9bd12b54a46f1167cbebd71c08e9cd50f37adaa6c77b509a57f9c0f1d7677e587137593c54e30f57e3
-EBUILD emacs-23.4-r16.ebuild 11340 BLAKE2B 828da59bc867f0a1d146ddbb3a0ebff1b6abdb9f7d2d06f207db73f125fcc60e4d214ab92a70a48f88927ede95dcf4e3f9287763af5467f258b30a8dd5c85991 SHA512 f9891249bcda86d06ee0ffe1c5514b92c5019b33bb96089a04b27aa17a55835d127dc96c060247e51d5239886ca92454f0c715cb0fc001911e3b9848f6849eca
-EBUILD emacs-24.5-r4.ebuild 11167 BLAKE2B 634f3a3d27636482c936131de3155c221463d4a5df9bb7333b772ece99e9955d91ce9dc1e3e98bd0b64a404f004f8a3ee45c074f6498a7a3ca856ab035cdb585 SHA512 c5ad345aace7622b00f8e0bbff7ef2138d8bb62d7e1ae05ecb22ca8acc236f19d04bb972f0ffe003bebc12536c15d0466912ed026f8cb02e5b0539c85f2ea2ab
-EBUILD emacs-25.3.ebuild 11433 BLAKE2B 5c50e04e2568305636bb08956ff9c4d29563fcd60ea257aa9591bb3e9c3c696525166b0e718e830b1b973cc9182e690e1ee3a26bf91caf5cc38871cfba29a368 SHA512 4e973ac3c9bda88676a2c5daf5a33cdb617a7e1d937a21f94711d47136213df1ce5d9449f34e65e30ca3adf2ea74e453a443167a469b8a5e17003163f136d36e
+EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
+EBUILD emacs-23.4-r17.ebuild 11553 BLAKE2B 2a547246425ca1bf5936d07a632a67e942b82163b061fd648631c3dd3cfe70c220b78cc0ffa899b28cc96c39070ce53ffa21dd872e440cae06a263fc486d4a84 SHA512 40cdfdb92d30b355e70d95dbba17f0995ac9209ed23c8a91f3b1e254c5312fa773c903487ee3be567855fcafbeb216f719086d65f90afe3b72bbddf417cb5e21
+EBUILD emacs-24.5-r5.ebuild 11382 BLAKE2B b20b12487f724d9bea33bf26fa23f8887695cd0029d8b020ad2b646d5e5f9dfceb783a631e7d6fa5a256131e08ef059b1fb1a61c2da048f740a369b52bb6c958 SHA512 3750356b1edc38009220da7d9327cf4f990ff34b84513185602baa964b9804392bb970f191a7fdc3a5bee49c81dd90b206ec31a7b53574c16e992873b317886e
+EBUILD emacs-25.3-r1.ebuild 11689 BLAKE2B c663335a2f562523e8c101c4654d6acb37a1e36162d9fde3cb7cb0b9950197bf75bc480298f43b15e290aae9cde19162707399c57af8539b676cba9ca11d1262 SHA512 37b1d591b767188f01950e011347737a2480e85e620d6fd08fada9c44a50087ff5bd2a6bbb4f462b80318c378a1e12edff13f1460454066213b27f15ee65c905
 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index 19abd28b5a20..8b9d3d2c04e9 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -71,7 +71,8 @@ src_configure() {
 
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
+	export SANDBOX_ON=0
+	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }
diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
deleted file mode 100644
index 00d4f14a53a5..000000000000
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-21.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? ( x11-libs/gtk+:2 )
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
-				x11-libs/libXpm
-			)
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	mv configure.in configure.ac || die
-	eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstrict-aliasing -pie
-	append-flags $(test-flags -fno-strict-aliasing)
-	append-ldflags $(test-flags -no-pie)	#639568
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=gtk"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser=":gamestat" \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-
-	# move man pages to the correct place
-	local m
-	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-		|| die "moving emacs man page failed"
-	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
-		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-			|| die "moving ${m} man page failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		doins -r src/{m,s}
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from a previous major version of Emacs, then
-		it is strongly recommended that you use app-admin/emacs-updater
-		to rebuild all byte-compiled elisp files of the installed Emacs
-		packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
new file mode 100644
index 000000000000..09fda80f8ed3
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-21.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			x11-libs/libXft
+			x11-libs/libXrender
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXext
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/attr )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing -pie
+	append-flags $(test-flags -fno-strict-aliasing)
+	append-ldflags $(test-flags -no-pie)	#639568
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf+=" --with-sound"
+	else
+		myconf+=" $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=gtk"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser=":gamestat" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cq" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+		|| die "moving emacs man page failed"
+	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+			|| die "moving ${m} man page failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
deleted file mode 100644
index 8360af8c48d8..000000000000
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
-				x11-libs/libXpm
-			)
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-	append-ldflags $(test-flags -no-pie)	#639570
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
new file mode 100644
index 000000000000..a60d29353474
--- /dev/null
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="24"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	zlib? ( sys-libs/zlib )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			x11-libs/libXft
+			x11-libs/libXrender
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/attr )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	AT_M4DIR=m4 eautoreconf
+	touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+	append-ldflags $(test-flags -no-pie)	#639570
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+
+	local pvr
+	for pvr in ${REPLACING_VERSIONS}; do
+		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
new file mode 100644
index 000000000000..0377eb678615
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/attr )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	#AT_M4DIR=m4 eautoreconf
+	#touch src/stamp-h.in || die
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			#if use xwidgets; then
+			#	myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+			#else
+				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+				myconf+=" --without-xwidgets"
+			#fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		#! use gtk && use xwidgets && ewarn \
+		#	"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser=":gamestat" \
+		--without-compress-install \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
deleted file mode 100644
index 286763c2e236..000000000000
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXp
-				x11-libs/libXpm
-			)
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	#AT_M4DIR=m4 eautoreconf
-	#touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			#if use xwidgets; then
-			#	myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
-			#else
-				myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-				myconf+=" --without-xwidgets"
-			#fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		#! use gtk && use xwidgets && ewarn \
-		#	"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/lfhex/Manifest b/app-editors/lfhex/Manifest
deleted file mode 100644
index d0356e00bbd6..000000000000
--- a/app-editors/lfhex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 01-abs-llabs.dpatch 792 BLAKE2B 5fea08953d7c8c368479a303abc1c9b1b2141fd8e77e7eb73bf681dd8ce0a5641523d8f0a3a953c45d3bce6de86de3089be92cb90a0067703c3bc9e8203e4c58 SHA512 cb23e3541b3ff93ceb86d52fdee6028588bd79f0270bd2bae78ba9c8e729bb7d2fd50ab08b83b6546935b67c4076593f8c5457166c81e1e4ee65adc10b034965
-AUX 02-gcc-4.7.dpatch 717 BLAKE2B ce81dd6c77da9bf56c352c1050d42f65ab6539a02c41ff1dd8a724fcd16fa2c4d0961bbc62e9661641b0b30226a657e301fbc2773797166f7f845f086aa1b0bd SHA512 4f934f4a63b1530e672d59ca3ee5a2304b2be5404d2e4ac708d4e51af69b6f4b5ed818005409ce831701fa92db8f634b06a4cc69ea002205f7985931fd06fc53
-DIST lfhex-0.42.tar.gz 868287 BLAKE2B 23c9879025682dd18ec9b2dce41411e77513f5f09a4295be094de5c20df05b06c5b7689587294417676996724c4548daa33a8ce6f0d66d50410bde612cb5780a SHA512 5b0d61f732b4b3a0ff2d73ae3ea551af78047a2edd45916d6ad61fb6d89c18faa4e28ed321e51e034519635c3310ce7b0b67fb809ed67d6c37cb252b78696c88
-EBUILD lfhex-0.42.ebuild 733 BLAKE2B b7838234d7fc5b405231fbe679dc6ae83ff6d0b8ef7166dbc203d295062a90413d925624f053fc7f42962b58a8f44780f91471d251548a41c7ae2e5990120a08 SHA512 ddd5a34b3eeff8fdc703161ea2d7d6824c56e4023bf44033d055d36ac64fefdf965f3116f6e9356e3a27df3f79e808a8e94682801d0b953a7584a6e2f6f4737e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lfhex/files/01-abs-llabs.dpatch b/app-editors/lfhex/files/01-abs-llabs.dpatch
deleted file mode 100644
index 74ffcbce7299..000000000000
--- a/app-editors/lfhex/files/01-abs-llabs.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-abs-llabs.dpatch by Thiemo Seufer
-##
-## DP: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
-## (#495467)
-
-diff -up lfhex-0.42.orig/src/reader.cpp lfhex-0.42/src/reader.cpp
---- lfhex-0.42.orig/src/reader.cpp	2008-10-08 19:25:57.000000000 +0200
-+++ lfhex-0.42/src/reader.cpp	2008-10-08 19:26:16.000000000 +0200
-@@ -238,7 +238,7 @@ bool Reader::loadPage(off_t pageIdx)
-     // free the page which is the furthest away from the page we are loading
- 
-     // this could be trouble if off_t is unsigned!
--    if( abs(_firstPage - pageIdx) > abs(_lastPage - pageIdx) ) 
-+    if( ::llabs(_firstPage - pageIdx) > ::llabs(_lastPage - pageIdx) ) 
-       while(!freePage(_firstPage++));
-     else
-       while(!freePage(_lastPage--));
-
diff --git a/app-editors/lfhex/files/02-gcc-4.7.dpatch b/app-editors/lfhex/files/02-gcc-4.7.dpatch
deleted file mode 100644
index 0d58072d9574..000000000000
--- a/app-editors/lfhex/files/02-gcc-4.7.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-gcc-4.7.dpatch by gregor herrmann <gregoa@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add missing include to avoid FTBFS with gcc 4.7
-## DP: Bug-Debian: http://bugs.debian.org/667238
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lfhex-0.42~/src/expr.h lfhex-0.42/src/expr.h
---- lfhex-0.42~/src/expr.h	2008-09-19 02:36:49.000000000 +0200
-+++ lfhex-0.42/src/expr.h	2012-05-07 17:03:22.788794002 +0200
-@@ -19,6 +19,7 @@
-  */
- 
- #include <string>
-+#include <sys/types.h>
- 
- bool expr_eval( const std::string &str, off_t &value );
- 
diff --git a/app-editors/lfhex/lfhex-0.42.ebuild b/app-editors/lfhex/lfhex-0.42.ebuild
deleted file mode 100644
index ba168caf5ddc..000000000000
--- a/app-editors/lfhex/lfhex-0.42.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="A fast hex-editor with support for large files and comparing binary files"
-HOMEPAGE="http://stoopidsimple.com/lfhex"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	# Apply Debian patches to fix compilation errors like gcc-4.7 compat
-	epatch "${FILESDIR}"/*.dpatch
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin lfhex
-	dodoc ../README
-	make_desktop_entry "${PN}" "${PN}"
-}
diff --git a/app-editors/lfhex/metadata.xml b/app-editors/lfhex/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/lfhex/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 348cd6a24835..b7f5d8b20acd 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emhacks/Manifest b/app-emacs/emhacks/Manifest
index fef8533f4335..d69717d1bef0 100644
--- a/app-emacs/emhacks/Manifest
+++ b/app-emacs/emhacks/Manifest
@@ -1,4 +1,4 @@
-AUX 50emhacks-gentoo.el 899 BLAKE2B 856a2b253720b43ea16bb17dcbff3b8face07cb9096276a43ce28ef7a8be30b2ce3e65e87fb71ebf44ca26607f8bae1c4ae0b65dc1ef80af7a7d4be1b6b85399 SHA512 aa71cfe32373ed3f0d9b71ee83f1084debaafa22f73c4a0b810e1209ff4352c1aea48e7fec839278f27806d7a2d6cecb3b8232470c8fc257690f0a48e079fda1
+AUX 50emhacks-gentoo.el 785 BLAKE2B 90811c7d1acdc25a1a2a430af1ce8a8bfe9845042f22b6043208dda87a1ffad5946f2ccf04036bb9b1aa433de6f03d09de911b5ce5e1b29d2ec773bc76b96825 SHA512 80961af6c9ba24ab964214e68d464ac88b2c88894b069b90f7041dbbade02c96b3cb2c60876f90134882a4984386a73ff23ebc785c19cd18a11e6b424c2a62ff
 DIST emhacks-20070920.tar.bz2 71232 BLAKE2B 82c80bc41daa37868fe6376461df9cc96ee6d5db1b5e4a2e6414b9cd114fe57f3f5a226e82d2b9e5ac7e42a84faea585fa18621da5c7db4181334fb8db73cc9e SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1
-EBUILD emhacks-20070920.ebuild 935 BLAKE2B 5e2dcbd44b4ce919b5945e3d6e5f0540d0d42253ae24b8d16a8d1c184ab069500490e09c0425fb1c379cc32c9e1b1df70abb27bb8b298299cd3e387298e9ad9d SHA512 400811049928dec6d112e87dc179882599ed9d2115ec4120255c3553e610edee81a3c1872f84080e1637d8a6488060e22f39f34c9c7c9d19a13d6844f680acec
-MISC metadata.xml 824 BLAKE2B 4167f330c53e9433f3e5143ed586396704ad5fa32c2acef5c22537213d7cea3992d99fa97b899342f46997674814228e629fa54f47173ed24561e80bd911740b SHA512 40cedfd1423fe284874092f6075c4d234c4c96f2ef617f36a8e1004f1d382255e31e6ade9b59b3e0132f44e2fdbe510fe47f53789234fa5a098fcaddf9370e7f
+EBUILD emhacks-20070920-r1.ebuild 636 BLAKE2B fe44df7b58e6bd82f832cd4764cb0853b73c2cd81c9d17b659535e1d6c7c77f0e3d81e4decacbe0409b5ca23c52ab9a662efa9b5265a9cffbe1da0bb9c6acf70 SHA512 ac9d715f9671d97799d7baebd5553d4014cdeebb46039eae19263a13c8786ec763b6348a8d79f88b5db0dbbc79316dc539c4ce15e30b073ac656da6e4b7682da
+MISC metadata.xml 737 BLAKE2B 0692d8cde646849a08a2ecedcac9f462f60cdb2e7b04822015f9596df0ef619402691b4f5b5800cb1f32d4b3934287f44b94b41207562d60a031c4063ed7cb31 SHA512 881a59ee9c46825a86254c4be3eb9e75a3486c68869f705e123b49097d8faed3e472253a74e6f0da9c1976fbdba1623ba6f0d128838c0882fe5f970043a4c269
diff --git a/app-emacs/emhacks/emhacks-20070920-r1.ebuild b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
new file mode 100644
index 000000000000..3fdd0d1d1b1c
--- /dev/null
+++ b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
+HOMEPAGE="http://emhacks.sourceforge.net/"
+# CVS snapshot
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="Changelog"
+
+src_prepare() {
+	# remove files included in Emacs>=22 or not useful on GNU/Linux
+	# remove jsee #642588
+	rm -r findstr* jsee* overlay-fix* recentf* ruler-mode* tree-widget* || die
+	eapply_user
+}
diff --git a/app-emacs/emhacks/emhacks-20070920.ebuild b/app-emacs/emhacks/emhacks-20070920.ebuild
deleted file mode 100644
index b094ca266ce3..000000000000
--- a/app-emacs/emhacks/emhacks-20070920.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
-HOMEPAGE="http://emhacks.sourceforge.net/"
-# CVS snapshot
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jde"
-
-DEPEND="jde? ( app-emacs/jde )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# remove files included in Emacs>=22 or not useful on GNU/Linux
-	rm -r findstr* overlay-fix* recentf* ruler-mode* tree-widget* || die
-	# this requires jde and cedet, not everyone may want it
-	use jde || rm jsee.el || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}"
-	use jde || sed -i -e '/;; jsee/,$d' "${T}/${SITEFILE}"
-	elisp-site-file-install "${T}/${SITEFILE}"
-
-	dodoc Changelog
-}
diff --git a/app-emacs/emhacks/files/50emhacks-gentoo.el b/app-emacs/emhacks/files/50emhacks-gentoo.el
index 14fd515ff685..1488d88313cb 100644
--- a/app-emacs/emhacks/files/50emhacks-gentoo.el
+++ b/app-emacs/emhacks/files/50emhacks-gentoo.el
@@ -26,7 +26,3 @@ And update the status window if showing." t)
 ;; jmaker
 (autoload 'jmaker-generate-makefile "jmaker"
   "Generate and edit a Java Makefile in directory ROOT." t)
-
-;; jsee
-(autoload 'jsee-browse-api-doc "jsee"
-  "Browse the Java API Documentation of the current Java file." t)
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index 17d3c9cfeb76..27c2365ffe3e 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -16,9 +16,6 @@
   swbuff,   Quick switch between Emacs buffers;
   tabbar,   Display a tab bar in the header line.
 </longdescription>
-<use>
-  <flag name="jde">Enable support for Java Development Environment</flag>
-</use>
 <upstream>
   <remote-id type="sourceforge">emhacks</remote-id>
 </upstream>
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index f1d8485fe78e..02e1419387c7 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -1,5 +1,6 @@
 AUX 50mldonkey-gentoo.el 604 BLAKE2B 52632176ed6adc1cb0c871bfc94b2c01d5ec26b1950a220981f955e015156581feb932cc73888eb2920b93bdeacf2340b560f6fcce12cdf5f16eeaee4a093c9f SHA512 d89caa4fecb8d16df7595f770ad479adae0e094b36c04a6a6291abff0052d49d14afc835e38466f156a95579889c2f127fbafa1818bc14d4915851f9b4a9a2af
+AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20649087c95153f8ce92323dd977d7878475c8709057a3725ed78cbf3d777fb7b5ae00c6a911da75869232ae228edffc4 SHA512 f00edaf33d8d182e7c7e432cfcf4f0ac9b6a8f6f68d44266e9dbed53657c00bc5db5b1f6c5e190988c217711de5dcfdaef091de2581425be7bce2a44b8a0c9d6
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
-EBUILD mldonkey-0.0.4b-r1.ebuild 905 BLAKE2B 8d188adea68357c7da42fb61fcb558c5cd19ce63006d315864cf21c6a2a41c23e7413f72fa6b2cd131d9436db70347dcaf650af411b3095d64355c31d96c2201 SHA512 695bfae2f15c0e63b35fd1bb8ec81796accc1b4b85ed602fffe52479a79fd072c0a1b40025b984669dc03223d090d950e4176d86b9fc85f34c0f404d2287a9c5
+EBUILD mldonkey-0.0.4b-r1.ebuild 925 BLAKE2B be4cc55f7da8c04d6dc654f194261517e6962f5f3af553a1d249f70c18306be265f6f9966b5b891085bcbd8e3c37a6eaa8a0e99990ed564f4c653a7f44e0f2b3 SHA512 72d79f6ce9e36c0f4e6a9d6f6e9d9401276ff2a00cac3b14018e35a66289ce108370053f5a924d3ee6afbc8aca67714ff8644c6d2788d4eb57486f8a56ffd189
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
new file mode 100644
index 000000000000..0548fd96c97f
--- /dev/null
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
@@ -0,0 +1,14 @@
+Fix byte compilation with Emacs 26.
+https://bugs.gentoo.org/647638
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el
++++ mldonkey-el-0.0.4b/mldonkey-vd.el
+@@ -801,7 +801,7 @@
+     (insert "\n")))
+ 
+ 
+-(defun mldonkey-vd-insert (&optional ignore-1 &optional ignore-2)
++(defun mldonkey-vd-insert (&optional ignore-1 ignore-2)
+ 
+   "Insert the table with the downloads in the MlDonkey buffer."
+ 
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
index 7f128b35f900..5c38394b6e95 100644
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.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=4
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-vd.patch"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 663c53dd9e3c..8ae58a31e7bd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index ff5c6374b15f..4a837ec10069 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -11,6 +11,7 @@ DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B eade80cff35e545a619f7d0beafadde14577
 DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b SHA512 988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
+DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 EBUILD cloud-init-0.7.6-r1.ebuild 2585 BLAKE2B c2f9bd34d430b99f8b78be2c4d2cb8b5ca7613ab71ec02c8e21c4001b35f3c16d637243e93f55a872f7e4ab7b0c990bf78abc36c3a3e822389a191a57e005c2c SHA512 0c82e788cacd91e923ff57c240a3615c20157d2a4ba1fdf7d28eb6f0e9f7c55b64b3ef321dc1f2cadd40e47128d2ef0854f3488fe7aabf5cdcf3f8b326eb6ad8
 EBUILD cloud-init-0.7.6-r2.ebuild 1922 BLAKE2B c67031dd3b9e131e48a568fe4e97a8059d715be3f8721ec0f6c7dce60c6b089df8c27efc0901a50ad111f9b1a590833c449fca99fe7e19d5b8925d936dd4a19d SHA512 a3e22b4b2985670b8de5fe9af2f2ef16df626a3b3acfdf1d1656f247e44ae91b9629fc693829beb7ea931be38509b418c52f5257f24d1f02045f97735c8ff8f3
 EBUILD cloud-init-0.7.6_p1212-r1.ebuild 1989 BLAKE2B da729eef70d23a2a0df1bfdb28d74714ced55a097c8dcc2eb0c25d8d6e9acb57651340ca4d8190f100ca5fe0dcb8eee674e7e513bb8b50772383ef12fd23f11c SHA512 4e71e5ff1b4a2ea8bf600d627911f7eb197d5f90f354e553996388bdef13309ceecab732b168e1f4c3bd8d5fa3dfa736a34bc535eedb55ffe6c23a6b1eb873ce
@@ -19,5 +20,6 @@ EBUILD cloud-init-0.7.7.ebuild 2399 BLAKE2B 54d7784a165c51d994259e70367551addbb0
 EBUILD cloud-init-0.7.8-r2.ebuild 2547 BLAKE2B b508988c338b35cbb4866957fae9a215c53effbdaa5f1c0845e64747296bb5747c3f960bb0f7928e2b26f1d1fb6bb585fab947fe7b2cbdf40e849f2c629c2433 SHA512 972a04cc2c359f7271960820f4212ae1afc13def893b5bd87efe8ed30dd5f03f7219c008c9c7806f918eb7dbe3609e3c0407b7c0d5d5ad66b568abd2361ce2ec
 EBUILD cloud-init-0.7.9.ebuild 2542 BLAKE2B 3f13fa11cc65dd9f2cf1bde72541ed07d4b2991fd010437eabbc70fb8180ed71d06d00781a4679ac7ecbb77d912a74dbb56684ca90cbe97001d348efbd2a138f SHA512 11db9733a73ca6ca53189b2f768e08a471a00adb419d96b00d7a64731299aa43fe45f6b4a03e1ebe16ce7d58316b06eb96933a83b99cb19bd6a6b2453278220d
 EBUILD cloud-init-17.1.ebuild 2014 BLAKE2B 544f5fca45a28b2d1cece53fcbf2397c54cb56e65e0dbb368b78a4f0c08d5d4c84af7436710e4d3e666adf12c6d00f7947bc2de8c7ff5345d158c99a46b4271d SHA512 5dcbc40adbef50088e66e021ca4200293a6f044ed853dc2e1675a68a63d875ce1580d8bda4fe0c74de9738ff09931f3bf56efbad235bed57d81a5c30a9d19cef
+EBUILD cloud-init-17.2.ebuild 1964 BLAKE2B 0fdf3b22c6d01dc957fcf2086f94f7e988ed0b6d7ac0fe58b186a3de0e8c05eef541091bb65497b3d6ca47579f33790b71747ff7ca190ecfbdc857759a96cc03 SHA512 2c1839f5dd324714faded2bd02c7187938f33b3f7e995dbbf7440aa9654705693b272a09470ef8837e56711ee7c0d39abafb65ef8a67c47687f2e82fd4013c77
 EBUILD cloud-init-9999.ebuild 2219 BLAKE2B a2b856ce06b7026545efa2bee186e70aaa28c607eb026f813892ee6fe5f96ed50d091020a563dacac16a433f6fe7404304ec2bac917cd53b890b772eccb2af3e SHA512 f50bf3530aef585d11e8984a2252724d0e0a89e1b912304f26ec0a74cdbde78103eb7efb2ed4d9a7cf69c3db43970c7f40a959c5a969e85a547ce9e2a3894be5
 MISC metadata.xml 578 BLAKE2B 087f92136937d5f1ba4510513f0fd75dadd5a2813cf43b7d92aa8c7c13d3cfd33f63a9eb2ca9844735d116ed0589db0ca04603cc9fe1378db8aee8285cc76060 SHA512 d7cc9ad3a86774be908102fa24f59c5b4bf42228f8c78d15887432eacdeafa2363ab34ec7446a12de28389750a222794653c3b1dfba64d680ca0288da0322599
diff --git a/app-emulation/cloud-init/cloud-init-17.2.ebuild b/app-emulation/cloud-init/cloud-init-17.2.ebuild
new file mode 100644
index 000000000000..d5d1c2d9d37c
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-17.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+# remove pretytable in 17.2
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(  )
+
+python_test() {
+	emake test
+}
+
+python_install() {
+	distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+
+	insinto /etc/cloud/templates
+	doins "${FILESDIR}/hosts.gentoo.tmpl"
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index af5e078b18bd..40f843a2ab6e 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,10 @@
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
+DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
 EBUILD containerd-0.2.9_p20170917.ebuild 1000 BLAKE2B e207ebb992d1c1e47a13c5ebae2004a6e8bb887ab605d9aaf7ac053762aecb58224b0d21cf13cc59fd1d9bc508fc6c0be5d3f7c4fd6a22136059a1a12b0df072 SHA512 c258fd617c1006ccc09506c1ff28d2edfe2e15966cacc62ea4e1194f3cdf96d74a60db5bf1f009a05b97f84bac44c23cef33e73e77ba272b8861244be7dbbe36
 EBUILD containerd-1.0.0.ebuild 1239 BLAKE2B 93aeb4bb834e6d79835d9eee995d0e8ec82d042d344eb2082366c71e56dc3f9376f3621a57b050f88478f5f9874c6cfd458a3c04a4866d3e583ed925bd49726f SHA512 b68d0bf59a5bdcbb98a8d480e5db49b182fcedf16962a6d9570dfeef22670d84215b8dd2b1c372108f92e6dd3b0f6c0b5478b1ce2c61ab2a2f4063820fcce97e
 EBUILD containerd-1.0.1.ebuild 1239 BLAKE2B db235a0f5471485ab766365a0838cf65da8fc1c150fbc1ab2dc1369fcd552909f96161f8c006abb463d59aae0b85b730d2736cfe166e73269fb1a87f04e621f1 SHA512 1a5d5ec6fb8353247ca6109b59158779e4eb22d82fce93aecfd318293506780e8aa90505741711fae3dc169e2b5e601f073ec4826431b9d79fa1589e48e50574
+EBUILD containerd-1.0.2.ebuild 1239 BLAKE2B ddaeffc83657567642894a9d43322704364bbdaba0ee5081ca24cef78b007871b85b565e1743107c5aebfc0f8f6d2cc462e9ffd2ebf31b844bc1eccdcc74f060 SHA512 2739a6f4e78bc64e7dd579444caa0b5a34e88cd9f3c9ceec52f1479936124302bb1e745ab66e3e841521bd5ce9244d92811e475add00db695901e1d681b01b2a
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147
diff --git a/app-emulation/containerd/containerd-1.0.2.ebuild b/app-emulation/containerd/containerd-1.0.2.ebuild
new file mode 100644
index 000000000000..0051a46346c7
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="cfd0439"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index fdaa905dba6f..7fec496a9185 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,5 @@
-DIST kompose-1.7.0.tar.gz 5230263 BLAKE2B c2e50ceadaa3f88b5d6a9c6fbca93a0a45a16fb4d208a9194578174d9b67697f70d52f8f7a517609b56acf0cb646a9ca4e9137e1a830646e1084c10aabfd1cc0 SHA512 bcda4d891cdc8a0e331aad3baca9e88be32d302ed1ab89a561874881ec9e1dd04f7158f9315ee59a49d4906cc9d08821a417ff04a8ebe9871edece842b2e85b9
 DIST kompose-1.8.0.tar.gz 5230179 BLAKE2B 47f2770eb527bb3b40e1734f9e5173ce4de55ef55460f624dcb22374d94d4a4ae650d82db6508dd0e441535c03da8a0f61d7600425e44604b580ecff493ba987 SHA512 4e618f9e9adc65abd2be503dd28b6d7761945a99788e910cc072d04b6088e953152f9354fe168fe7bf22252f698b957e2cc23440d242bed62c4b7415dc513e33
-EBUILD kompose-1.7.0.ebuild 889 BLAKE2B 575e0b5251fd3f41ee591cffc6cac87702171d45dc6018ba077db331d069aa0cf6617e3d3bb9a7b474590e9707354c860321b081a5dc6bdf7c8d6f2ad722f7b4 SHA512 b935247e6d46a5fd34c4205da74719b28e31f7329f89f78f8ab5e97b2ba3d3704307500ac5e99face463814763284ab79e66c78b874d80432d116f6e69da1cd8
+DIST kompose-1.9.0.tar.gz 5229558 BLAKE2B 41c168dea0311ea4663b4056ec10a0a446f0c714a0d32cb6e75d4cb680335acb31d164d390fbde487856c268fb671a7d2e4238de2a542fd54e64e9c3ce693d41 SHA512 72d575bb79fea88de54740ed7a4809b68781b3473431c2c11213a32b9ff3dc9340ef49ea8009ff6f7f16dce8f36565a91b8c28ab45bc860d53075f42f3fde66b
 EBUILD kompose-1.8.0.ebuild 889 BLAKE2B 60e02b868aec4525aee7666909754fca33ac499f6f31148a67d6790f472ca4e033d1f7738b8a2af5bcefdc5d553c41aec56d546afdacb288f55d06eb917ea31a SHA512 86ab3ebd33ab93727adbf2018c0d6e65b49c7fc94295a55c15e3e1e002cef71af60b13de8e9c70f4efe5f4d4550852c3e024316f206d8b2b00861e4a3e77d028
+EBUILD kompose-1.9.0.ebuild 889 BLAKE2B 8e3ea67eb81683c57f537fa266b924e9622c591274277fc0574fe1f97eb834959cbca8eda861c1edc2bd848677f48739ab07e49cd2ec6d0ea9014e776aba7559 SHA512 5a112105fa803089f3f76dcd11db8d4a5f69b82dca857d99642b7e6d9ee6c2f52334c2c996542a1e1d9235a493b6fe5132efe2248ad55c3f80436d2a2e70bdd4
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.7.0.ebuild b/app-emulation/kompose/kompose-1.7.0.ebuild
deleted file mode 100644
index db671c77f93b..000000000000
--- a/app-emulation/kompose/kompose-1.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="767ab4b"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.9.0.ebuild b/app-emulation/kompose/kompose-1.9.0.ebuild
new file mode 100644
index 000000000000..e1e0a9633e62
--- /dev/null
+++ b/app-emulation/kompose/kompose-1.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/kubernetes/kompose"
+EGIT_COMMIT="v${PV}"
+KOMPOSE_COMMIT="093c756"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Tool to move from docker-compose to Kubernetes"
+HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+RESTRICT="test"
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 41b478c362ac..354167df7296 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -2,10 +2,8 @@ AUX README.gentoo-r2 2094 BLAKE2B ccfad63217f7778e97d8de49e20002dffefff32562f560
 AUX libvirt-1.2.16-fix_paths_in_libvirt-guests_sh.patch 641 BLAKE2B e796f4e32f00e8970eabf723520601b26c7fa5f7579d538299538632ba036dafbb2dc64ad40d10152c0637043b2a649e1dc08468d1f250e00ee0af095d94a093 SHA512 df9960b80c7dda852e38d992ab31181d79091bd6e1ba88c0b0c1af8a2f2d1445ee95c957df38ab27b452cd2de01d36b88164e665a867ad69c15ca15c18b1d588
 AUX libvirt-1.3.0-do_not_use_sysconf.patch 4072 BLAKE2B 2281954430dbc38262221bb4d2bc3296a067ef79ce70b7d93fee7da92753d808d208fc1e190e4779c2daf44df5e18ae2d0a0aaea04170f9ffa2d851918533fee SHA512 44428e16cf1998db0bcae1b54d3ba32363a71db3f45f493bd675f6ad7d6bf131667749f33226ab5f40be52e833ec0899bb9202a8f0e150d007c3f7c71a9cf314
 AUX libvirt-1.3.4-glibc-2.23.patch 2049 BLAKE2B 8e283846a2442ef4bf3fd5ca88033387d150818972e1b8f4732584423652179d2d6f8df964a8b8a4e51219a946eec30450838207446e20e9bd77ff97c31996de SHA512 022b610c2e343c9cb595babcc8b2e5e0e0db1a19d6bfc9babdc817bc1e093ff12ee1c26304c188151fecc32481ffd225d7a3d36324613dd5b4ea7139280629c4
-AUX libvirt-3.0.0-fix_paths_for_apparmor.patch 2904 BLAKE2B f84b684f4eaeee85a406730285be852226960e69694356007461911a34a68fe7031775f827fd76b016124cb809f3d3b2f52e4f02c1dc51738252644e502d3d8c SHA512 be4aba4b9bd44bb2f1b4f269f573caafce746783e0a7c08ff72d03a96b9675261346ededaf1d6b6c89afaa6d2b88fe7fb0d9f120d40fd714179e6f9d209a6724
 AUX libvirt-3.1.0-musl-fix-includes.patch 221 BLAKE2B 65f486f4055c0ccae59601970d770f23f570f127ba26ce1d932855e784b83fce99389f22f12630005be61e5de2e64e0125d0bf5270024f736fe597fa5b81ff78 SHA512 876c7dacedcce1d69938779b978b3a23b2f51128f121b4aa53f5f301d7740f90d77f335523210ed492b68b5f7a0b864b25a694ee562fb5e8ab1b6411d3da48e7
 AUX libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 2730 BLAKE2B ae92a37cdfb929862bd58d1cd208e3f8a3aab10dae98ec8e51d6c3ab579295e3f59ff091970499c6c57b625edec77b98421502df625b1d10c1c3d0be3dfbe489 SHA512 751b971fd0f109f3a4147feea8481adb9c868313ea57d293a89ee548661514f124318324823d9380839a7a5c8ae7c1e3ae8c4c6e62027587f163c8856e353a6a
-AUX libvirt-3.8.0-CVE-2017-1000256.patch 3737 BLAKE2B 47f73e5296b8a41148781a4bf1e95e1571b4a9571825d18eb59a267b9c7d9b6e9f301e7818326be6c29392febd42083e8a4696adfe5cef81b029f7d21314670e SHA512 2c3e88670ec9531207c60b89e8e2ec6188834e795cd0e698d63781209182801209d4097fd72607166853b54a9f301a160b575f757741da5aeb995d752bbcb80a
 AUX libvirt-4.0.0-bash_completion_bugfixes.patch 1863 BLAKE2B ed54b4e308297907001bb2fbcba76197c341c292fc29139f50b9c03cb9ea61696dbd177a4d0055cdca3184a9ecbd283f576c491d2d3c581e31415465bd8e92e1 SHA512 f718408ce57c0abd68023356d5980c5e85dfb5c90759a6758309408dea7115b0ae18a18be2e625401d985fab7b1a374ab1e10caa27527ed002a852bb3f08ca73
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r2 5412 BLAKE2B 139c39b65e6297883ab13bb65f8799f6e417a3de841bca3b31fd161a7dd9f64b18dedc1a942d9ee6577c1253e9b45859dec006a17b25da9e6cde2507b88cd302 SHA512 0f46ec5776c61d1776248779fa894b1a6d7b98d0eb8e8374b320c785c25d92468f087e350233b9152eb2cd0680f6b334c3a61684dabc7c5b559d3b55fdcb712d
@@ -15,11 +13,7 @@ AUX libvirtd.service.conf 401 BLAKE2B edd74238f9639ead1d776142e6231d87f39cb6670e
 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1
-DIST libvirt-3.10.0.tar.xz 14952220 BLAKE2B 6af2f4c07dc71d8aa283460640d3fdeccd78616d1678da1decf6b1702984ca0c685d8074963e55a2776ac834e18dbb61d86c20c6032320bf9aa6e02b480526dd SHA512 c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260
-DIST libvirt-3.8.0.tar.xz 14868712 BLAKE2B 4d97a03c3fe4eadb6d6eb3548231527c7d1a95e2134e63af63e72dcff8fd8d1cc8b5332f03d60edc2b200037ec0276b69a38c3379ce830a595bb5e83c3507e6f SHA512 fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672
 DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b SHA512 c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1
-EBUILD libvirt-3.10.0-r2.ebuild 9626 BLAKE2B 8e01b077482188921afc8c76b2384a2fa5d02f35d060df9279967703510f19ce6c2d36da91f4f563c5f75b25d6b5dfbec6ca950ef6c2fdf9ada0067224ba879d SHA512 5133a0d242b3dcb70a9b0daf1153e3c9cb282deed7d94b40fee9e9a543635c61c795a9b70fb8025ed05a8b86613d24568123f0069c82f53e4f7a5473e5fae58b
-EBUILD libvirt-3.8.0-r1.ebuild 9661 BLAKE2B d6afc9ed4f228d62466d825c02e0ff24595c70ee98d5f62c0fe78ec846964ac6de99e6d2de4cd297804da13699afb21f1bd1400917ead16da3fbfa8cdce7c2a9 SHA512 66a28a319d1ed7263524c9c13e4331c3451ad321ccb39b4e608e05ad1e9d40fd1b4a75a05d5910a0a83c3bc47f8c5746aa80eedd16b1c0e8b0a4a4e093d79169
-EBUILD libvirt-4.0.0.ebuild 9807 BLAKE2B 37010d9cbb5b9c6aee28fc1592fb7f16d0f6bd9390e5ed1e005d5d45cc494c415921c5a90bbd27ad21fba890facddc1633ce22c44d1eb36829079f30716c4e66 SHA512 b0de684a990dd7b5b849a73f8e87cc88693b5e33d86c3b585c7382ec060d09e53486811af8a3e6d0c83baf0ee8c6147fab872bc0c4c85d3c8645075857dec1f3
-EBUILD libvirt-9999.ebuild 9613 BLAKE2B 144ed8e703529bb4b9eeaa6048f0015459c8ab79f843e57fbcb882f44d47bda3e45685384d09b7debbd80ae173b39635724c84f525ae513bf918347aa1a87b54 SHA512 60c3061d9b24fd3e66f73555ed4649c35fe1a850e355e1c0262ffdd2113d7563afe4c2bf7df13f8132cf7818b520b29ee86dbdf4199579ad4cbc1704b4e87af0
+EBUILD libvirt-4.0.0.ebuild 9814 BLAKE2B 8d1c80ca2f028732bdcfcec2421d9bdc978a654652ef1381ab1d00d8302fbc3c6417ce606912187a7a1203f0099812bb238da1b63ca0e8dcaa310969862efd59 SHA512 d23e19e182ba63e2629fcc84f2ef63d7c97728159f6bc02640fe95f6768401fd0cbce43d4589dcf9cf30b023ec75aaedf15589712cdbea36bbf4a5d74d5fea97
+EBUILD libvirt-9999.ebuild 9617 BLAKE2B deaea5095a0c395f8a60d8aec71d14ac0752fac2a1b80f5a642d45291aeef758e351ae8665113de638f1df62e7636f943cda52bdf1270e17fe81fbbea6f63843 SHA512 f08d2183f086ec56e1764aeb05ae5c4dbffe89b4d4e5516c5f511d7319ab14b203cccee38edab41a09750a092217456aa0f7ea2dbd34d36b741d05869829e206
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch
deleted file mode 100644
index c9c7eb6ad49f..000000000000
--- a/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From baad1483ed0a699509f66abac6708797f370f888 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Sun, 22 Jan 2017 09:07:57 -0600
-Subject: [PATCH] Update paths to Gentoo layout
-
----
- examples/Makefile.am                                                | 4 ++--
- .../{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper}  | 4 ++--
- examples/apparmor/usr.sbin.libvirtd                                 | 6 ++++--
- 3 files changed, 8 insertions(+), 6 deletions(-)
- rename examples/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (90%)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 2956e14..d81e34b 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -23,7 +23,7 @@ EXTRA_DIST = \
- 	apparmor/TEMPLATE.lxc \
- 	apparmor/libvirt-qemu \
- 	apparmor/libvirt-lxc \
--	apparmor/usr.lib.libvirt.virt-aa-helper \
-+	apparmor/usr.libexec.virt-aa-helper \
- 	apparmor/usr.sbin.libvirtd \
- 	lxcconvert/virt-lxc-convert \
- 	polkit/libvirt-acl.rules \
-@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
--	apparmor/usr.lib.libvirt.virt-aa-helper \
-+	apparmor/usr.libexec.virt-aa-helper \
- 	apparmor/usr.sbin.libvirtd \
- 	$(NULL)
- 
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
-similarity index 90%
-rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper
-rename to examples/apparmor/usr.libexec.virt-aa-helper
-index 4a8f197..a6072f1 100644
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/examples/apparmor/usr.libexec.virt-aa-helper
-@@ -1,7 +1,7 @@
- # Last Modified: Mon Apr  5 15:10:27 2010
- #include <tunables/global>
- 
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-   #include <abstractions/base>
- 
-   # needed for searching directories
-@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-   /sys/devices/ r,
-   /sys/devices/** r,
- 
--  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
-+  /usr/libexec/virt-aa-helper mr,
-   /{usr/,}sbin/apparmor_parser Ux,
- 
-   /etc/apparmor.d/libvirt/* r,
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 8893e75..f0b471c 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -59,8 +59,10 @@
-   audit deny /sys/kernel/security/apparmor/.* rwxl,
-   /sys/kernel/security/apparmor/profiles r,
-   /usr/{lib,lib64}/libvirt/* PUxr,
--  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
--  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
-+  /usr/libexec/virt-aa-helper PUxr,
-+  /usr/libexec/libvirt_lxc PUxr,
-+  /usr/libexec/libvirt_parthelper ix,
-+  /usr/libexec/libvirt_iohelper ix,
-   /etc/libvirt/hooks/** rmix,
-   /etc/xen/scripts/** rmix,
- 
--- 
-2.10.2
-
diff --git a/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch b/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
deleted file mode 100644
index 8c347cd799ad..000000000000
--- a/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 441d3eb6d1be940a67ce45a286602a967601b157 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 5 Oct 2017 17:54:28 +0100
-Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate
-
-The default_tls_x509_verify (and related) parameters in qemu.conf
-control whether the QEMU TLS servers request & verify certificates
-from clients. This works as a simple access control system for
-servers by requiring the CA to issue certs to permitted clients.
-This use of client certificates is disabled by default, since it
-requires extra work to issue client certificates.
-
-Unfortunately the code was using this configuration parameter when
-setting up both TLS clients and servers in QEMU. The result was that
-TLS clients for character devices and disk devices had verification
-turned off, meaning they would ignore errors while validating the
-server certificate.
-
-This allows for trivial MITM attacks between client and server,
-as any certificate returned by the attacker will be accepted by
-the client.
-
-This is assigned CVE-2017-1000256  / LSN-2017-0002
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/qemu/qemu_command.c                                                 | 2 +-
- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args     | 2 +-
- .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args                 | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 46f0bdd18..f68b82d08 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -721,7 +721,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
-     if (virJSONValueObjectCreate(propsret,
-                                  "s:dir", path,
-                                  "s:endpoint", (isListen ? "server": "client"),
--                                 "b:verify-peer", verifypeer,
-+                                 "b:verify-peer", (isListen ? verifypeer : true),
-                                  NULL) < 0)
-         goto cleanup;
- 
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-index 5aff7734e..ab5f7e27f 100644
---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-@@ -26,7 +26,7 @@ server,nowait \
- localport=1111 \
- -device isa-serial,chardev=charserial0,id=serial0 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
--endpoint=client,verify-peer=no \
-+endpoint=client,verify-peer=yes \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-index 91f1fe0cd..2567abbfa 100644
---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-@@ -31,7 +31,7 @@ localport=1111 \
- data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
- keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
--endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \
-+endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
--- 
-2.13.6
-
diff --git a/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild b/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
deleted file mode 100644
index e918ac7a33e8..000000000000
--- a/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	firewalld? ( net-firewall/firewalld )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
-	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-)
-
-pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with uml)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen)
-		$(use_with xen xen-inotify)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild b/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
deleted file mode 100644
index e131f0e87239..000000000000
--- a/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	SLOT="0"
-else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm64 x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-	wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	app-misc/scrub
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	>=net-misc/curl-7.18.0
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	sys-libs/ncurses:0=
-	sys-libs/readline:=
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dbus? ( sys-apps/dbus )
-	firewalld? ( net-firewall/firewalld )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	wireshark-plugins? ( net-analyzer/wireshark:= )
-	xen? (
-		app-emulation/xen
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
-	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-	"${FILESDIR}"/${PN}-3.8.0-CVE-2017-1000256.patch           # bug #635174
-)
-
-pkg_setup() {
-	if use qemu; then
-		enewgroup qemu 77
-		enewuser qemu 77 -1 -1 "qemu,kvm"
-	fi
-
-	use policykit && enewgroup libvirt
-
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-		-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-		-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with uml)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen)
-		$(use_with xen xen-inotify)
-		$(use_with xen libxl)
-		$(use_with zeroconf avahi)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-		--without-xenapi
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--with-html-subdir=${PF}/html
-		--localstatedir=/var
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild b/app-emulation/libvirt/libvirt-4.0.0.ebuild
index 1107c986520c..bed41a07b0a5 100644
--- a/app-emulation/libvirt/libvirt-4.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 84ae6b580a78..3e57dd9a00e4 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
+	"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
 	"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
 )
 
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index b043de6dc047..55eeb8d693b9 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -4,4 +4,5 @@ DIST nemu-1.3.0.tar.gz 70769 BLAKE2B 73108346c70f7ececd2b20cc91da323f2ecb4049140
 EBUILD nemu-1.1.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.2.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.3.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
-MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
+EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
+MISC metadata.xml 499 BLAKE2B 2d190da58be258c1e5e997128bc65e9f928c9ec86e9be23d43cc881c92d9cd65e9cdee6db7afb92abf799aaa552ad5ddcf6dbdafd26d12c2521e8724f7f98471 SHA512 42e56aaad5eff7d180c6af0ef571f5fca4e101e934fc7506387456d89068ab8446e861dcd1124d85d962bf05b48a26833d0883b7c152c7214c79c324c18d236f
diff --git a/app-emulation/nemu/metadata.xml b/app-emulation/nemu/metadata.xml
index 58c1077b82e4..ad75c6dc879c 100644
--- a/app-emulation/nemu/metadata.xml
+++ b/app-emulation/nemu/metadata.xml
@@ -5,4 +5,9 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<use>
+		<flag name="vnc-client">Adds support for external VNC client</flag>
+		<flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag>
+		<flag name="ovf">Adds support for OVA/OVF import</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/nemu/nemu-9999.ebuild b/app-emulation/nemu/nemu-9999.ebuild
new file mode 100644
index 000000000000..fe30968437c7
--- /dev/null
+++ b/app-emulation/nemu/nemu-9999.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info git-r3
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu"
+EGIT_REPO_URI="https://bitbucket.org/PascalRD/nemu.git"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+vnc-client +ovf savevm debug"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode]
+	dev-db/sqlite:3=
+	virtual/libusb:1
+	|| ( sys-fs/eudev sys-fs/udev )
+	app-emulation/qemu[vnc,virtfs]
+	ovf? (
+		dev-libs/libxml2
+		app-arch/libarchive
+	)
+	vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+		-DNM_DEBUG=$(usex debug)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Old database is not supported (nEMU versions < 1.0.0)."
+	elog "You will need to delete current database."
+	elog "If upgraded from 1.0.0, execute script:"
+	elog "/usr/share/nemu/scripts/upgrade_db.sh"
+	elog ""
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+	if use savevm; then
+		elog ""
+		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+		elog "Get this patch from nEMU repository"
+	fi
+}
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 69820999b431..240a3f605456 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -5,13 +5,9 @@ AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-2.10.1.tar.bz2 30821108 BLAKE2B bb096139f6b387a3cf3933dd3aeb97777479022b1b34ed0212b51d7061f9a19b3e83a4e9a13c6cf81c14718731ddf8646226a5b0d99ebbc9abb387d7eec94238 SHA512 1a4a6ebf700ec6851c83cc2a71eaea8d95f14c685d094eaaa86c740eb9401e49a79074b72385f58681ca7646771a99bb6bbd9bebb39162f7220626d37ed0654f
+DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fcfd3e8cd28a7e57f467add81f7bd84363183ef5cc5d18af91bde9186a4da49c0133c8ead83eae4626b9fc364e99 SHA512 3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004
 DIST qemu-2.5.0.tar.bz2 25464996 BLAKE2B c2d36ed938644cb9e3a3541c16ceb09f1bc5f4897bc01d8974722fc167b4e5362e6674760ca7d22a8b157b20505d7643e2eea3810469e180c003857833f650aa SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
-DIST qemu-2.6.0.tar.bz2 25755267 BLAKE2B eae51d5a08a7346102d6ab362a8dc01bfca083eea026eba4ff7ddda3c606a4ea4e0155049ab9ca70788945631bb5ca9fc4acdf9718323d03be99335303b80800 SHA512 0d17075e52f7688cc05776ad7a76509d1f22ae8eda896fddb06c1fd6dea6da485422c8efb3ba118b054d9a413b7b02baba656a9131658dabdb71def50c92b215
-DIST qemu-2.8.1.tar.bz2 28366270 BLAKE2B 5aa044334a854d47ecf433a16e52773c25a7628bf58500ce22c8f857207d2a91e16ebf0dfd60cdc9a0d5e7f26e2e0cd8211afa20638d3cc0b4519cd819c85fd1 SHA512 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
-DIST qemu-2.9.0.tar.bz2 28720490 BLAKE2B 9c82522d5e391be9875ebed8ec097952a99a519b34518f6815c6daff085e9cf4ca2697220cb3fec99db11b89e75feec9f0cb523efb9b853dfcefb1f270925118 SHA512 4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422
 EBUILD qemu-guest-agent-2.10.1.ebuild 1765 BLAKE2B a2f378264661430e2b62a36f6f59dd0583e78d0c9ed4c6548ab15eec74309814ef91e58ef5291727d092c9bdd87f23b367af0e68a903a072d1517fe35a5f2a4a SHA512 d5d088b94119150461695961ab6ef412c3dcfa7e81ebbfe252711f74c398ae6ddf6972798a82e60f123e12cf63201f35c047eeeca1b9f515c9e02720d98f0c9b
+EBUILD qemu-guest-agent-2.11.0.ebuild 1765 BLAKE2B a88289e04d6aa996533f21d90f1a97127001a8ee867a2c24838d2e02f8f952f038e4338c8ed32ec8b152771c9ec9c5f6461bdf6c07986ea838e77b84ea95c32d SHA512 cbd6daffcc0ce49233eef3ade4a7dfea373c68763ee7589784448d4f9caf0ed3aafab174fdc5ace26266ac621eacf33844f46d9230b461c1f3b8034d554f3654
 EBUILD qemu-guest-agent-2.5.0.ebuild 1791 BLAKE2B a8177d254e948ca6d69c41e6b8c69ec01357f779c2fe8a88f07c2c53f48bf191bffef6e0d8aed5e63d1d0eabaa54137971aefb820ab6295a4d6c905cfa5c9592 SHA512 2fbb48f9835c602d42e027cdd50b33d1c62b946305b8bfd78fbdbe36c1c3ebc07e8d32e0ae10e76934db5dea9dfdfdba702c43e5e8deb3f5df037ce6f9dbba80
-EBUILD qemu-guest-agent-2.6.0.ebuild 1795 BLAKE2B d90638489b34423032fae83f0c21a0f9e074fdc9ce8ea3971d679a7ae8d2a9c5c9626610a5c814e6b5e2bbc59bcf7d5fcdb1ca1a07eddcdaba62b54f997eb025 SHA512 99b03e7808629cc14f988ba5f1a855a8fddf45bcf4ad695d4c791e12ddc7b189828b62a025c03a887f3d3d935afaeee4db658ea29a5f1d153e757af841a95e35
-EBUILD qemu-guest-agent-2.8.1.ebuild 1769 BLAKE2B 0ec77acadf54ac656f719659ce29746bb9f8f1bf476ddec24bda9711cc786ba869d0963ef22972eef5c3dc45447e5fe55c4b7ad5c833dec10ed33e436f7c2f5c SHA512 9957f121352745a1067cad18a056dd5afa8e243daa8c3f8d4ebacaad1399ff4f8c435a76b1f0a46d7de9f7939935548018e96473c4f0fc0476b8caf0cd660ff4
-EBUILD qemu-guest-agent-2.9.0.ebuild 1769 BLAKE2B 0ec77acadf54ac656f719659ce29746bb9f8f1bf476ddec24bda9711cc786ba869d0963ef22972eef5c3dc45447e5fe55c4b7ad5c833dec10ed33e436f7c2f5c SHA512 9957f121352745a1067cad18a056dd5afa8e243daa8c3f8d4ebacaad1399ff4f8c435a76b1f0a46d7de9f7939935548018e96473c4f0fc0476b8caf0cd660ff4
 MISC metadata.xml 251 BLAKE2B 710e422c2628b050aa585d9f186a099ed718bd08551b5168327a2d2ac00ba4933e047b0d813676cc0289b2d2ba2b7cef9adc9c1847efb2fca0cb58096d6e20db SHA512 7a5f4f7e0f89c87ab04103d4688e87d1560d63b3565dde0b6089f272ccf6c235e0d2ad31383a5171d425776c4a98b999eb5de420e42d1af8b80e76256b2c9297
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.0.ebuild
new file mode 100644
index 000000000000..87d281523a68
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.22
+	!<app-emulation/qemu-1.1.1-r1
+	!<sys-apps/sysvinit-2.88-r5"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+	echo "./configure ${myconf[*]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	emake V=1 qemu-ga
+}
+
+src_install() {
+	dobin qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.6.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.6.0.ebuild
deleted file mode 100644
index 90f3a629f8ae..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	!<app-emulation/qemu-1.1.1-r1
-	!<sys-apps/sysvinit-2.88-r5"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-	epatch_user
-}
-
-src_configure() {
-	tc-export AR LD OBJCOPY
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
deleted file mode 100644
index 3068067649b1..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.8.1.ebuild
+++ /dev/null
@@ -1,82 +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 eutils systemd udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	!<app-emulation/qemu-1.1.1-r1
-	!<sys-apps/sysvinit-2.88-r5"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
deleted file mode 100644
index 3068067649b1..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.9.0.ebuild
+++ /dev/null
@@ -1,82 +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 eutils systemd udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	!<app-emulation/qemu-1.1.1-r1
-	!<sys-apps/sysvinit-2.88-r5"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 1c93ddc7b00f..917a8a988787 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,13 +1,15 @@
 AUX 65-kvm.rules 40 BLAKE2B bd92ab10d30644654fe38f5d7869d0b499fb969bf32f45aa416531a4de2eca0bdae4552567f41d63e3c609781b45ab90056bcae3f84d391d0c1807b12d45ccb6 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6
 AUX 65-kvm.rules-r1 120 BLAKE2B a0d95f60e48f80e5f00b3a7ef3b520861fb781868844aff7b764875238d41982cfb5535e42757145eaea64f48e856ca92d434b33f7b3aeb5d93b0afcb461fd00 SHA512 4132ec4d3e7c1e3cf5e37224be1a3b864bcc0bfde9109e8fea9c99377289c28a7fdcf9155fbbd6605dbf8ebeb020c2ab575dd35e36bdf69f8ad07c4aa9c7b2f7
 AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533
-AUX qemu-2.10.1-CVE-2017-15268.patch 2016 BLAKE2B 3ed01a2793ca4d558fb8f06fed6587dc731e97707201c5bafb12a2ffe71c503c17ca57a3e24344e75fa79b09a66f28ee277d5290318f3c90a60f2ee65ce640c8 SHA512 b4c69b53c086c6b12273e43512045e71390ae3486621d41c8310603c1739bcf3a67a7b1f105da48dcff312a145411b90c2f9539dbe890c88b5270f01ddaebf5d
-AUX qemu-2.10.1-CVE-2017-15289.patch 1923 BLAKE2B 173b4a09db3404b8fee47f4107dc795476a65ff310444278be8cb37fcdb46e8f09951aa09f0972dcee9584c4c82f9c396a1c4e4f765536f4eeecfd856eabcd77 SHA512 0541fac994f5989fa74b4909249f216011073e87de60d4df49654c2068d718d2a84b13c2751864073c25f5dd5ce5b5d871f8d0f55e56629d80a8b67599606baa
+AUX qemu-2.11.0-glibc-2.27.patch 1481 BLAKE2B 513430c8c3d10d3e9ec2d16bf95013fc639266a73d7e9d1d285a9daa62cb2567212b167d07235c4d6df31c63d48a4924d180bbcc568f60dc2f042f7087dd7eb0 SHA512 b3fe1d933f43e4a545e3aa6bce024d38b4431fa854cfa2342888875d0735a0a3171a00da2032238da9dc3b7a1ad4fc456a8d5b469394e2de1eea79b0957cbb7c
+AUX qemu-2.11.9999-cflags.patch 864 BLAKE2B 2b7c7daf5274ce36f6c676d950e2e3f866376c0be09edd34ad5a995c2a589f1810f1a4d473389bd02038a0a10cc7053b3b4411662b4452ce2a8bb5b6ff04bafb SHA512 50bcfaf620cf729f6146a9c6ac1508f3ebde1c4168b4a9323b0f37a4e11373433e3ceead83dd73b2f17346abdd69920c01cb3bbd04556941a841bc6ea72bfb9c
 AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf103faadb5dd42daf36ad1c5e39c5bdfdc2b5f2bb0bfec2ea1255b4182caeb467614a487f5cfcb341109a4884 SHA512 0194d28de08b4e51c5bd1c9a2cc7965ba7f66dfddb8fd91de3da93677e6cf2d38ad3270f69aaea8a20cf2533c2980018d6e0fed711be2806fe2053fba7c081f3
 AUX qemu-2.5.0-sysmacros.patch 333 BLAKE2B 8c38410c6ea789f669d89c7321cdc9e5c734bb3db332272657302977241f157b04fb07e27bda4f67ee560e39a7494344ad79616835e6ff483927f2b72ed9c597 SHA512 329632c5bff846ca3ffcdb4bc94ae62f17c6bdbb566f9bec0784357c943523e8ca7773790b83a9617734cab3b003baa3d636cbd08f7385810a63b0fa0383c4f0
 AUX qemu-binfmt.initd.head 1445 BLAKE2B 5762a38034331a13e308f6fc8cb979e38ae01a053691726edfc1d99e1bca1698919ad564a593e018308f1fd00e2f887865fd9db157d8de83941295bc47c1db6c SHA512 a735268ae9ac84d8f2f2893bf018ee6de33231fa94a823bd8502b529bb456635c1ab5cf9b440df5ede8e414291f8bf45fc53898c2f3939c50d5ec4ffa554396a
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
-DIST qemu-2.10.1.tar.bz2 30821108 BLAKE2B bb096139f6b387a3cf3933dd3aeb97777479022b1b34ed0212b51d7061f9a19b3e83a4e9a13c6cf81c14718731ddf8646226a5b0d99ebbc9abb387d7eec94238 SHA512 1a4a6ebf700ec6851c83cc2a71eaea8d95f14c685d094eaaa86c740eb9401e49a79074b72385f58681ca7646771a99bb6bbd9bebb39162f7220626d37ed0654f
-EBUILD qemu-2.10.1-r1.ebuild 23525 BLAKE2B 656ee4c6819ff584e754f0f56fbdf6337c1ccae796817d5c624a3c32be2130d9aa3815a028f9cf10ac50bd4adc4c7157a4f8f1dcdeafb78f67b873ffc4a5ae72 SHA512 c9abfee1bf8efcade96dab738d6d4e3868ba49ec0513cb17f9de2f6fc7953e9013704a5b83659bf51039af20aec576f3ef67c2034aae00816cd7fae97a24c3c5
-EBUILD qemu-9999.ebuild 23363 BLAKE2B d4f89913aab43a08d582a6c3251ac61222a4b085c4c7b425e5f68bdae9994b624dc7234e2bcb55cbc54ee3bc97fe0b2e2185a20c75892b8ccf0aaa4e472ecf45 SHA512 82717b7f42c5ce42d80047faaad344bbf848a074d78e6145148f107daa8a110c3b67f401ccfffa8b3744ae74f0858ca98e3409685306b60b629021c97f76e9b4
+DIST qemu-2.11.0-patches-r0.tar.xz 16140 BLAKE2B 2e23908075195a7c28df574525a159e171277a2da6d7c0656a341a2db6a622237106d2dd8de5c9d61b5fb62fa5a163e9657406a2996cebc05baa53d42c5f5d15 SHA512 f7d92c2232398565b8cde294d38dc281c13503fb5967cc7871a2233b7fa354799619445e9ec89c285ef051f62ecef0bd38a135b0093bf5528c0b28c6e580c839
+DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fcfd3e8cd28a7e57f467add81f7bd84363183ef5cc5d18af91bde9186a4da49c0133c8ead83eae4626b9fc364e99 SHA512 3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004
+EBUILD qemu-2.11.0-r50.ebuild 23613 BLAKE2B c0434f730029c1e404d4258f5739affc2fc127e3f1497ace9912b6ffa3687ac03c39769cb1a45423f711a4ecd30e04ff2e487b1443e36ef3f70cb2a605a96a5d SHA512 fe4a65d73168c6b1691d1dda304600430ff1be1c293138c345874d5ebae1883265715b270e9759dbe5c0b19f71ce2ffde85e1871e5dfbb779ea091d78acc82c9
+EBUILD qemu-2.11.0.ebuild 23581 BLAKE2B d2b1cb0fe791f060403233de7b574cff1e9efd4b2dcd3c604a222104e0728f821b5a7d644e53a8525c4b6e0dbcb4af00c7c4b612bda8ee7363507116e0c75a96 SHA512 c4cc27015cf279013bcd7e2d6fd6e13944b51879ea2a5779cb0204df4d9f70dd476b471467117a938eae375e89ab464ae8057b3b276988b8e7eac0399fa27119
+EBUILD qemu-9999.ebuild 23422 BLAKE2B abe0fbfd0cde763379dd647b73ccd5139c01a7867da41ba28d9c15130181340878c5b2db4758c89d420cb2cdba53e2aa32458534312262271a08decefc3bd991 SHA512 cf7489a649e1b749cc15b773c64d0c9d6ee9806f109eb99f812c3bb9fa05f272258a8827f3caa369eb4d2fa354b209a9a77c8a2a9ce0ba78abee6da827d69d16
 MISC metadata.xml 3794 BLAKE2B 626ed8aa0c868513122b44083f2c76fc758f09624600770b1b267328b08335cc60b4167b37a4f418985c810dfea23bb7792c9b874166842e8fd34ba2c24a146a SHA512 10f130f225b90dacf8262247d795a247abfdcbf3ad5fbe0693e8d4db79f755984f690cb150a7eb5a8e5d669ce404145c4fbb6b200d6362319be74759fd78b6d3
diff --git a/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15268.patch b/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15268.patch
deleted file mode 100644
index 7d08b32b0272..000000000000
--- a/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15268.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a7b20a8efa28e5f22c26c06cd06c2f12bc863493 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Mon, 9 Oct 2017 14:43:42 +0100
-Subject: [PATCH] io: monitor encoutput buffer size from websocket GSource
-
-The websocket GSource is monitoring the size of the rawoutput
-buffer to determine if the channel can accepts more writes.
-The rawoutput buffer, however, is merely a temporary staging
-buffer before data is copied into the encoutput buffer. Thus
-its size will always be zero when the GSource runs.
-
-This flaw causes the encoutput buffer to grow without bound
-if the other end of the underlying data channel doesn't
-read data being sent. This can be seen with VNC if a client
-is on a slow WAN link and the guest OS is sending many screen
-updates. A malicious VNC client can act like it is on a slow
-link by playing a video in the guest and then reading data
-very slowly, causing QEMU host memory to expand arbitrarily.
-
-This issue is assigned CVE-2017-15268, publically reported in
-
-  https://bugs.launchpad.net/qemu/+bug/1718964
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- io/channel-websock.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/io/channel-websock.c b/io/channel-websock.c
-index d1d471f86e..04bcc059cd 100644
---- a/io/channel-websock.c
-+++ b/io/channel-websock.c
-@@ -28,7 +28,7 @@
- #include <time.h>
- 
- 
--/* Max amount to allow in rawinput/rawoutput buffers */
-+/* Max amount to allow in rawinput/encoutput buffers */
- #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192
- 
- #define QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN 24
-@@ -1208,7 +1208,7 @@ qio_channel_websock_source_check(GSource *source)
-     if (wsource->wioc->rawinput.offset || wsource->wioc->io_eof) {
-         cond |= G_IO_IN;
-     }
--    if (wsource->wioc->rawoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-+    if (wsource->wioc->encoutput.offset < QIO_CHANNEL_WEBSOCK_MAX_BUFFER) {
-         cond |= G_IO_OUT;
-     }
- 
--- 
-2.13.6
-
diff --git a/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15289.patch b/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15289.patch
deleted file mode 100644
index a4ad2d5e4359..000000000000
--- a/app-emulation/qemu/files/qemu-2.10.1-CVE-2017-15289.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From eb38e1bc3740725ca29a535351de94107ec58d51 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Wed, 11 Oct 2017 10:43:14 +0200
-Subject: [PATCH] cirrus: fix oob access in mode4and5 write functions
-
-Move dst calculation into the loop, so we apply the mask on each
-interation and will not overflow vga memory.
-
-Cc: Prasad J Pandit <pjp@fedoraproject.org>
-Reported-by: Niu Guoxiang <niuguoxiang@huawei.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Message-id: 20171011084314.21752-1-kraxel@redhat.com
----
- hw/display/cirrus_vga.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
-index b4d579857a..bc32bf1e39 100644
---- a/hw/display/cirrus_vga.c
-+++ b/hw/display/cirrus_vga.c
-@@ -2038,15 +2038,14 @@ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s,
-     unsigned val = mem_value;
-     uint8_t *dst;
- 
--    dst = s->vga.vram_ptr + (offset &= s->cirrus_addr_mask);
-     for (x = 0; x < 8; x++) {
-+        dst = s->vga.vram_ptr + ((offset + x) & s->cirrus_addr_mask);
- 	if (val & 0x80) {
- 	    *dst = s->cirrus_shadow_gr1;
- 	} else if (mode == 5) {
- 	    *dst = s->cirrus_shadow_gr0;
- 	}
- 	val <<= 1;
--	dst++;
-     }
-     memory_region_set_dirty(&s->vga.vram, offset, 8);
- }
-@@ -2060,8 +2059,8 @@ static void cirrus_mem_writeb_mode4and5_16bpp(CirrusVGAState * s,
-     unsigned val = mem_value;
-     uint8_t *dst;
- 
--    dst = s->vga.vram_ptr + (offset &= s->cirrus_addr_mask);
-     for (x = 0; x < 8; x++) {
-+        dst = s->vga.vram_ptr + ((offset + 2 * x) & s->cirrus_addr_mask & ~1);
- 	if (val & 0x80) {
- 	    *dst = s->cirrus_shadow_gr1;
- 	    *(dst + 1) = s->vga.gr[0x11];
-@@ -2070,7 +2069,6 @@ static void cirrus_mem_writeb_mode4and5_16bpp(CirrusVGAState * s,
- 	    *(dst + 1) = s->vga.gr[0x10];
- 	}
- 	val <<= 1;
--	dst += 2;
-     }
-     memory_region_set_dirty(&s->vga.vram, offset, 16);
- }
--- 
-2.13.6
-
diff --git a/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch b/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch
new file mode 100644
index 000000000000..1562bb3c64a1
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch
@@ -0,0 +1,54 @@
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a98b..99ccc1725a 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1aba8..412e94a405 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+2.11.0
diff --git a/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch b/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch
new file mode 100644
index 000000000000..8d7c387851a5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.11.9999-cflags.patch
@@ -0,0 +1,24 @@
+--- a/configure	2018-02-01 22:51:53.068467555 +0000
++++ b/configure	2018-02-01 22:52:23.965041387 +0000
+@@ -5212,21 +5212,12 @@ fi
+ if test "$gcov" = "yes" ; then
+   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
+   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
+-elif test "$fortify_source" = "yes" ; then
+-  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
+ elif test "$debug" = "yes"; then
+-  if compile_prog "-Og" ""; then
+-      CFLAGS="-Og $CFLAGS"
+-  elif compile_prog "-O1" ""; then
+-      CFLAGS="-O1 $CFLAGS"
+-  fi
+   # Workaround GCC false-positive Wuninitialized bugs with Og or O1:
+   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=24639
+   if cc_has_warning_flag "-Wno-maybe-uninitialized"; then
+       CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
+   fi
+-else
+-    CFLAGS="-O2 $CFLAGS"
+ fi
+ 
+ ##########################################
diff --git a/app-emulation/qemu/qemu-2.10.1-r1.ebuild b/app-emulation/qemu/qemu-2.10.1-r1.ebuild
deleted file mode 100644
index dcf84b71ab60..000000000000
--- a/app-emulation/qemu/qemu-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,800 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="2.9.0-r52"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo-r1 pax-utils l10n
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
-	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
-	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
-	spice ssh static static-user systemtap tci test usb usbredir vde
-	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
-	sparc64 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	gtk2? ( gtk )
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	sdl2? ( sdl )
-	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
-	virtfs? ( xattr )
-	vte? ( gtk )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.91 )
-		)
-	)
-	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		!sdl2? (
-			media-libs/libsdl[X]
-			>=media-libs/libsdl-1.2.11[static-libs(+)]
-		)
-		sdl2? (
-			media-libs/libsdl2[X]
-			media-libs/libsdl2[static-libs(+)]
-		)
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:=[static-libs(+)] )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
-		~sys-firmware/ipxe-1.0.0_p20160620
-		~sys-firmware/seabios-1.10.2[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.10.2[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
-	"${FILESDIR}"/${PN}-2.10.1-CVE-2017-15268.patch
-	"${FILESDIR}"/${PN}-2.10.1-CVE-2017-15289.patch
-)
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i -r \
-		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	default
-
-	# Fix ld and objcopy being called directly
-	tc-export AR LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir=/usr/$(get_libdir)
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-bsd-user
-		--disable-guest-agent
-		--disable-strip
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		--enable-docs
-		$(use_enable tci tcg-interpreter)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser bluetooth bluez)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser seccomp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh2)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-	)
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts="oss"
-		use alsa && audio_opts="alsa,${audio_opts}"
-		use sdl && audio_opts="sdl,${audio_opts}"
-		use pulseaudio && audio_opts="pa,${audio_opts}"
-		conf_opts+=(
-			--audio-drv-list="${audio_opts}"
-		)
-		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
-		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-			--with-system-pixman
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/scripts/qmp/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dohtml check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
diff --git a/app-emulation/qemu/qemu-2.11.0-r50.ebuild b/app-emulation/qemu/qemu-2.11.0-r50.ebuild
new file mode 100644
index 000000000000..cbd136db0a82
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.11.0-r50.ebuild
@@ -0,0 +1,804 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="2.11.0-r50"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
+	KEYWORDS=""
+	# KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+	# Gentoo specific patchsets:
+	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r0.tar.xz"
+fi
+
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
+	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
+	sparc64 x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.91 )
+		)
+	)
+	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-2017_p20180211[binary]
+		~sys-firmware/ipxe-1.0.0_p20180211[binary]
+		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8[binary]
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
+
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch
+	"${WORKDIR}"/patches
+)
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	default
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser bluetooth bluez)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh2)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+		conf_opts+=(
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
diff --git a/app-emulation/qemu/qemu-2.11.0.ebuild b/app-emulation/qemu/qemu-2.11.0.ebuild
new file mode 100644
index 000000000000..3965ae8920a0
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.11.0.ebuild
@@ -0,0 +1,803 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="2.9.0-r52"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo-r1 pax-utils l10n
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+	# Gentoo specific patchsets:
+	SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r0.tar.xz"
+fi
+
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
+	glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
+	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
+	pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
+	spice ssh static static-user systemtap tci test usb usbredir vde
+	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
+	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
+	sparc64 x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
+	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_mips64el? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+ALL_DEPEND="
+	>=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? (
+		app-accessibility/brltty[api]
+		app-accessibility/brltty[static-libs(+)]
+	)
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	bzip2? ( app-arch/bzip2[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gnutls? (
+		dev-libs/nettle:=[static-libs(+)]
+		>=net-libs/gnutls-3.0:=[static-libs(+)]
+	)
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.91 )
+		)
+	)
+	infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:0=[static-libs(+)]
+	)
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[egl,gbm]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+	snappy? ( app-arch/snappy:=[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virgl? ( media-libs/virglrenderer[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools:= )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
+		~sys-firmware/ipxe-1.0.0_p20160620
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+		~sys-firmware/sgabios-0.1_pre8
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/edk2-ovmf
+		sys-firmware/ipxe
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+		sys-firmware/sgabios
+	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
+
+CDEPEND="
+	!static? (
+		${ALL_DEPEND//\[static-libs(+)]}
+		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+	)
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static? (
+		${ALL_DEPEND}
+		${SOFTMMU_TOOLS_DEPEND}
+	)
+	static-user? ( ${ALL_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch
+	"${WORKDIR}"/patches
+)
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/s390-netboot.img
+	usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or1k
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+	For AMD CPUs the module is called 'kvm-amd'.
+	For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+	$ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it.  You can tell udev to reset ownership/perms:
+	$ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+	# rc-update add qemu-binfmt
+For systemd:
+	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	# Force C locale until glibc is updated. #564936
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror " po/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	if use nls ; then
+		# Delete locales the user does not want. #577814
+		rm_loc() { rm po/$1.po || die; }
+		l10n_for_each_disabled_locale_do rm_loc
+	else
+		# Cheap hack to disable gettext .mo generation.
+		rm -f po/*.po
+	fi
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	default
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	# Run after we've applied all patches.
+	handle_locales
+
+	# Remove bundled copy of libfdt
+	rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets. This simplifies building
+	# static user targets (USE=static-user) considerably.
+	conf_notuser() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_notuser accessibility brlapi)
+		$(conf_notuser aio linux-aio)
+		$(conf_notuser bzip2)
+		$(conf_notuser bluetooth bluez)
+		$(conf_notuser caps cap-ng)
+		$(conf_notuser curl)
+		$(conf_notuser fdt)
+		$(conf_notuser glusterfs)
+		$(conf_notuser gnutls)
+		$(conf_notuser gnutls nettle)
+		$(conf_notuser gtk)
+		$(conf_notuser infiniband rdma)
+		$(conf_notuser iscsi libiscsi)
+		$(conf_notuser jpeg vnc-jpeg)
+		$(conf_notuser kernel_linux kvm)
+		$(conf_notuser lzo)
+		$(conf_notuser ncurses curses)
+		$(conf_notuser nfs libnfs)
+		$(conf_notuser numa)
+		$(conf_notuser opengl)
+		$(conf_notuser png vnc-png)
+		$(conf_notuser rbd)
+		$(conf_notuser sasl vnc-sasl)
+		$(conf_notuser sdl)
+		$(conf_notuser seccomp)
+		$(conf_notuser smartcard)
+		$(conf_notuser snappy)
+		$(conf_notuser spice)
+		$(conf_notuser ssh libssh2)
+		$(conf_notuser usb libusb)
+		$(conf_notuser usbredir usb-redir)
+		$(conf_notuser vde)
+		$(conf_notuser vhost-net)
+		$(conf_notuser virgl virglrenderer)
+		$(conf_notuser virtfs)
+		$(conf_notuser vnc)
+		$(conf_notuser vte)
+		$(conf_notuser xen)
+		$(conf_notuser xen xen-pci-passthrough)
+		$(conf_notuser xfs xfsctl)
+	)
+
+	if [[ ! ${buildtype} == "user" ]] ; then
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+		conf_opts+=(
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+	fi
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		local static_flag="static-user"
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--disable-tools
+		)
+		local static_flag="static"
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+			--enable-tools
+		)
+		local static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		tc-enables-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	cd "${S}/tools-build"
+	default
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+	local out="${T}/qemu-binfmt"
+	local out_systemd="${T}/qemu.conf"
+	local d="${T}/binfmt.d"
+
+	einfo "Generating qemu binfmt scripts and configuration files"
+
+	# Generate the debian fragments first.
+	mkdir -p "${d}"
+	"${S}"/scripts/qemu-binfmt-conf.sh \
+		--debian \
+		--exportdir "${d}" \
+		--qemu-path "${EPREFIX}/usr/bin" \
+		|| die
+	# Then turn the fragments into a shell script we can source.
+	sed -E -i \
+		-e 's:^([^ ]+) (.*)$:\1="\2":' \
+		"${d}"/* || die
+
+	# Generate the init.d script by assembling the fragments from above.
+	local f qcpu package interpreter magic mask
+	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+	for f in "${d}"/qemu-* ; do
+		source "${f}"
+
+		# Normalize the cpu logic like we do in the init.d for the native cpu.
+		qcpu=${package#qemu-}
+		case ${qcpu} in
+		arm*)   qcpu="arm";;
+		mips*)  qcpu="mips";;
+		ppc*)   qcpu="ppc";;
+		s390*)  qcpu="s390";;
+		sh*)    qcpu="sh";;
+		sparc*) qcpu="sparc";;
+		esac
+
+		cat <<EOF >>"${out}"
+	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+		echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+	fi
+EOF
+
+		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+	done
+	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets.
+		generate_initd
+		doinitd "${T}/qemu-binfmt"
+
+		# Install binfmt/qemu.conf.
+		insinto "/usr/share/qemu/binfmt.d"
+		doins "${T}/qemu.conf"
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	cd "${S}/tools-build"
+	emake DESTDIR="${ED}" install
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		rm "${ED}/usr/share/qemu/bios-256k.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+		fi
+
+		# Remove vgabios since we're using the seavgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+pkg_postinst() {
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+
+	if use pin-upstream-blobs && firmware_abi_change; then
+		ewarn "This version of qemu pins new versions of firmware blobs:"
+		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
+		ewarn "	$(best_version sys-firmware/ipxe)"
+		ewarn "	$(best_version sys-firmware/seabios)"
+		ewarn "	$(best_version sys-firmware/sgabios)"
+		ewarn "This might break resume of hibernated guests (started with a different"
+		ewarn "firmware version) and live migration to/from qemu versions with different"
+		ewarn "firmware. Please (cold) restart all running guests. For functional"
+		ewarn "guest migration ensure that all"
+		ewarn "hosts run at least"
+		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/edk2-ovmf)"
+	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/sgabios)"
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 97e3556cc400..cf81dc0a7aa4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-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"
@@ -34,13 +34,13 @@ IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
 	spice ssh static static-user systemtap tci test usb usbredir vde
 	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
 
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
+COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
 	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc
 	sparc64 x86_64"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
 	lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
 IUSE_USER_TARGETS="${COMMON_TARGETS}
-	armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
+	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
 
 use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
 use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
@@ -78,6 +78,7 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
 		app-accessibility/brltty[static-libs(+)]
@@ -112,7 +113,7 @@ SOFTMMU_TOOLS_DEPEND="
 		sys-libs/ncurses:0=[unicode]
 		sys-libs/ncurses:0=[static-libs(+)]
 	)
-	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	opengl? (
 		virtual/opengl
@@ -201,7 +202,7 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
+	"${FILESDIR}"/${PN}-2.11.9999-cflags.patch
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 )
 
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index b776546e3646..5e516c8fcb33 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,7 +1,5 @@
 AUX runc-1.0.0_rc2-init-non-dumpable.patch 4016 BLAKE2B 8f39ce2a9862939b797e5b9ca74c990669afa3ff966b5a9b4e0d97d57fc390af715785272100940c73414209012de2cc9720fd97103442fb4477c00fbd8666a4 SHA512 2e10cc4ea85f0a95c53a4de6922b8a20395b6225f06449b9f3a994a79113f476563bb6acf365ba12de7896fc537141130790e14de1c612b97e283eeb82877139
-DIST runc-1.0.0_rc2.tar.gz 550449 BLAKE2B b2e8f122c8a469baddddb661b4c719f737be483966c3b374e2a86e556e84fe9d054ce2d5a7ff6b1be99970a22393426fdb21421a44532873b05fa29aa7503734 SHA512 83a3d45efbb86d3d583b96062202b9e60121d250af2c0dd37d07fda574b642aa6f05e29cac6644ad3d624647400db694082e280383e41ca9f31dc0a33b87ed76
 DIST runc-1.0.0_rc4.tar.gz 1090513 BLAKE2B 276303e2085eddd549290e3af1a3af4570d0aef43f66f956267451810b0f0fb77f13ed12fe13b76efcd820fc7e0b46eac370a062f43c8600091a807cb12cf733 SHA512 cc2ae38b96f3f3355d9ba26f7af15c57975276aeaf58dcfe7fe5f0f0411ece8584a7cb51ae7fdd2f4109366f55ac8dfb86f225e26377fe07b685bbc56a2518ed
-EBUILD runc-1.0.0_rc2-r2.ebuild 1365 BLAKE2B 785dcaa11da004eeefd392f45c6675b7a894455d0f2477deff2486f72432841b48e9f549c80613b5cc8287435b121ec917476ce2cd9754c08350f5c4a9bdb495 SHA512 6e5d05c224d4851c3b92b9da5fa4cc3934093bc74742c1b8cb3b50652014aaef46bdfbd17abd7fab4729b37cb7a8c3c9fa0e98ddd3725ae4c4e3ac5b1ae22c1b
-EBUILD runc-1.0.0_rc4.ebuild 1257 BLAKE2B ab96072ea0fcd2edbcd65c2d179a32befc09d178960ca42f590a3353029c3f62eda5052eecd814e0e03b64eb888401cc273fc574bdc4cc8fd235f147b48301aa SHA512 8187b832cc7793f4914f6684077f223a855ddb16b962bb8a8b7cdee9e9db36dd7b87864e30ecf6e226279d32c9b4c9fbc00c2fd037dd74c27bf0578e78a7672b
+EBUILD runc-1.0.0_rc4.ebuild 1256 BLAKE2B 7f7b657ae6f25116fbb7945a4c1e4c3690b736965152be821491ea4fdf4cd5ed5e0b3d7dd1a95607f40706e78f1aadab95b2b5d93324adf0ac7ce94c2cb7b463 SHA512 5236b7ffc8c95960f1590d59bb1dccedb4755aea162c9c5c2cce6239fffbf8a2d951bac4c19bcd513335aa9bff24865f1cb0a1ef2909cdea416d8c18684f96ec
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
 MISC metadata.xml 911 BLAKE2B 577fb47d934c680f1c9d131185104fbae1d6b00f1668e215ffa1eef7925038b0a9691bedd2c566bca2c7b5e7385304a841117e0cbd700de2381c60cf9a4387a0 SHA512 f142b0f774e96873a78da61de3826c967912dcf081ae6849e7a9b9c02ba621ce3637987b53ec54fd51858ba492f34c891e4b1eabcd568eaebcf665937f36701c
diff --git a/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild b/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild
deleted file mode 100644
index 0ecb0b79d1f7..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc2-r2.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
-EGO_PN="github.com/opencontainers/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="v${MY_PV}"
-	RUNC_COMMIT="c91b5be" # Change this when you update the ebuild
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor hardened +seccomp"
-
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-	!app-emulation/docker-runc
-"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-PATCHES=( "${FILESDIR}"/${P}-init-non-dumpable.patch )
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
-
-	# Setup GOPATH so things build
-	rm -rf .gopath
-	mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
-	ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
-
-	# build up optional flags
-	local options=(
-		$(usex apparmor 'apparmor')
-		$(usex seccomp 'seccomp')
-	)
-
-	emake BUILDTAGS="${options[*]}" \
-		COMMIT="${RUNC_COMMIT}"
-}
-
-src_install() {
-	dobin runc
-}
diff --git a/app-emulation/runc/runc-1.0.0_rc4.ebuild b/app-emulation/runc/runc-1.0.0_rc4.ebuild
index 886cd2b77286..76500c6dd5e5 100644
--- a/app-emulation/runc/runc-1.0.0_rc4.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc4.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 @@ else
 	EGIT_COMMIT="v${MY_PV}"
 	RUNC_COMMIT="2e7cfe0" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-build golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index b278715e79bc..43b55111bf02 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -3,9 +3,11 @@ AUX spice-0.13.3-reds-Avoid-buffer-overflows-handling-monitor-configu.patch 1902
 AUX spice-0.13.3-reds-Avoid-integer-overflows-handling-monitor-config.patch 1022 BLAKE2B eff6063372af35b926663393afc022a4e0b875c22402136ed41be394951958789a2c8de26e8791664cbef1c8bee7e9344f8fe7f39563e7b14567f9ebff2b0fa8 SHA512 4f815f091c0eec1ccfaa3438390087d4b7390e3ea84e353e42638a850e0faa552077af443719f2015ce36375ac2ac400721677462a2739ecf05fdf8c2e778b41
 AUX spice-0.13.3-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch 2988 BLAKE2B 99bca01b78b4acb875085628613f47a8c07c87061b77a50fdb4abc45770aa75a88bc75310e3a8a558d303861f17480b6362751f4073a54c5909aaca8c11422ef SHA512 ee15a37c45527869415d301968857f47a4536462bcea6fb5608862fa7019b2eeba36d08563b74feb7a96bc565dd6fe09349c736c4677d43c1f13fc95f1c42c06
 AUX spice-0.13.3-skip_faulty_lz4_check.patch 566 BLAKE2B 4775395c0e39e8c930078365ac2b05c21d30698b4cd472e56eb77fcde3f83894f3649c066824ad424dd0178200e17a8cd207046552dfebd3944de88e96d406e9 SHA512 aa16b86446f42a08c5d76927090e6b01817308520b34affcdd28a9e89d70d344f5ce47d1600c5cc564ecdf428cbfe8cf456ce8d3ccf4e686bd0cfb2f9fe5fe33
+AUX spice-0.14.0-libressl_fix.patch 488 BLAKE2B ab316ba0e5ca7299304dae229216291f0c2e80720f16dd0bd3de825b311b57cea3dd52b1afa029e5c246abe4244c30deda55f40262085ed2290799748cdb27d2 SHA512 80d809aa7cb92cb5b51a00c1d92f3160110ceefedf6fbebdc77726dec99f253fa9c308b5e5356620ea5b426c14857ad87d8aa861913b22c5b1eecb6df1ce922e
+AUX spice-0.14.0-openssl1.1_fix.patch 576 BLAKE2B 0b2f86239048722c7350ce63274d022994f6a9a13f3e12c0450ca7c1ec9e9c79b0e688b46e387fcc9cd0c606f2e0631baa20b29cfabca697f0e1a848d7f2f604 SHA512 50d2121760fdb5e3da75cb33e5d63855501cb9045dbb1e6ab26b13b27bcaf32a4c02daa4d28951ad9431cfea533061196f0157068ea846fc19e458604ff7dc77
 DIST spice-0.13.3.tar.bz2 1322505 BLAKE2B 56f9cd34bb48fdcf750230242b27567db713ef749649d4b780a82d0d4ec5d326b19540c9bb4f36c164d40a692eb0368c39e05ee8dba319dd8461a0315e5a9a17 SHA512 63496fbd3df0fd453052cef8e1fb00a3a28f0105610676fdc4a58043cbc6da571ae4407701af2b817e410d05ce727d60d5ee0c93c8897231e25229897c51d95a
-DIST spice-0.13.90.tar.bz2 1364173 BLAKE2B 1bc0e71d8c5a21f9961ac6c0567bde19d31983bd5b0f5d4df30cc5634080d288f277689d875334d94c6a276284313bc82f15eaf0ce20916c6c912c2dcc4bdfc0 SHA512 a5a6ab328a2d3cb405ead6eef40a1b896432f35accf1f8b015fc9deadcc4e5eb5f6d8d575a94fa3b2505e206986887badecf721ab015efd88dad174d7340c01c
+DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 EBUILD spice-0.13.3-r2.ebuild 2712 BLAKE2B dc0b6c6ec539682690d5a7f240beb49669fa7260a92214a8434b8e527b4f07434fa0feee54db5906fea7cc3256d8fcaed207bbf255aa79bdc640577647dc1110 SHA512 d0cbb81eaaacdf131c914b83ef42071e3f373d1154b0d3c530db6d4ff39c44f814e5a20c3ba2182bbf3cea3598cab1f6e7201ca74377cadb710808554a4f3228
-EBUILD spice-0.13.90.ebuild 2384 BLAKE2B 4e492b1f09f5c2ebf4c0fb7a862ab40fa04a0e6d6c5fa73655965bdbae8a390604d67e80e852ed34a534c49f298f2f93d6c67436e94935099400361c04105fba SHA512 60a13e6974938a603d082f76c54f062a8109be23787430baa9cd557b5d4ccf1f363fe73a1e233976caf1be1a1961cba45a09f520f4a725774feaf5980ac940ba
+EBUILD spice-0.14.0.ebuild 2412 BLAKE2B fcc229345c3111f59604673fdb0022c840f5ca0ee68d592b1d95df1a5994f5a93680904b382fa44622db786da3eaf9e6d0cfb7b4156df7c18541159738132f50 SHA512 aefaa63c2e9f35e000c6c4cccb330c7eb1e514aecb319d571138bedb7ea3206d947cf2ed27cb7c8b5d6b1bb2aca9d2c8979f02c57bff5120ccb851382fc972d7
 EBUILD spice-9999.ebuild 2386 BLAKE2B da587de7bed6da379e3a91a50911cd9069a4c72d35b75728c3554f07026438392a7ce8f5aedc55f9fb7ada93ff6e46167b610f23cf5d3def2004fdcff1d818c4 SHA512 e9c217c888229996b61a6fd38c0769fe5fc579117b0f2f54f07d44d45d720d4a1bd7a1c6b8145f01d7aa99c03aa88ac2a5edd1c44ff6a4bd17fd0950eb29397f
 MISC metadata.xml 476 BLAKE2B 2cda64935d0117db099551f30928c447c4d1d7f4e1c355e619c0134ec31e4d7779b646329218c48f9be671d0f0e92fa496caaa34f6aa4136748dd9bd6d2d868a SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b
diff --git a/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
new file mode 100644
index 000000000000..2f77fa5a0006
--- /dev/null
+++ b/app-emulation/spice/files/spice-0.14.0-libressl_fix.patch
@@ -0,0 +1,13 @@
+diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
+index a9ed650..27aa5d3 100644
+--- a/spice-common/common/ssl_verify.c
++++ b/spice-common/common/ssl_verify.c
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <gio/gio.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
+ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+ {
+     return M_ASN1_STRING_data(asn1);
diff --git a/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
new file mode 100644
index 000000000000..5854d8788c75
--- /dev/null
+++ b/app-emulation/spice/files/spice-0.14.0-openssl1.1_fix.patch
@@ -0,0 +1,26 @@
+--- spice-0.13.90-orig/server/reds.c	2017-07-27 01:04:10.000000000 +1000
++++ spice-0.13.90/server/reds.c	2017-10-18 21:42:12.054934199 +1100
+@@ -34,6 +34,8 @@
+ #include <ctype.h>
+ 
+ #include <openssl/err.h>
++#include <openssl/bn.h>
++#include <openssl/rsa.h>
+ 
+ #if HAVE_SASL
+ #include <sasl/sasl.h>
+@@ -2795,9 +2797,12 @@
+ 
+ static gpointer openssl_global_init(gpointer arg)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    OPENSSL_init_ssl(0, NULL);
++#else
+     SSL_library_init();
+     SSL_load_error_strings();
+-
++#endif
+     openssl_thread_setup();
+ 
+     return NULL;
+
diff --git a/app-emulation/spice/spice-0.13.90.ebuild b/app-emulation/spice/spice-0.13.90.ebuild
deleted file mode 100644
index abf7a28a67bb..000000000000
--- a/app-emulation/spice/spice-0.13.90.ebuild
+++ /dev/null
@@ -1,97 +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 autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="SPICE server"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
-
-# the libspice-server only uses the headers of libcacard
-RDEPEND="
-	>=dev-libs/glib-2.22:2[static-libs(+)?]
-	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
-	media-libs/opus[static-libs(+)?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/jpeg:0=[static-libs(+)?]
-	>=x11-libs/pixman-0.17.7[static-libs(+)?]
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
-	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
-	smartcard? ( >=app-emulation/libcacard-0.1.2 )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-emulation/spice-protocol-0.12.12
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
-	smartcard? ( app-emulation/qemu[smartcard] )"
-
-python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	xdg_environment_reset
-
-	local myconf="
-		$(use_enable static-libs static)
-		$(use_enable lz4)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		--enable-gstreamer=$(usex gstreamer "1.0" "no")
-		--enable-celt051
-		--disable-gui
-		"
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/spice/spice-0.14.0.ebuild b/app-emulation/spice/spice-0.14.0.ebuild
new file mode 100644
index 000000000000..11420b4ea1be
--- /dev/null
+++ b/app-emulation/spice/spice-0.14.0.ebuild
@@ -0,0 +1,100 @@
+# 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 autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
+
+# the libspice-server only uses the headers of libcacard
+RDEPEND="
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-emulation/spice-protocol-0.12.13
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	smartcard? ( app-emulation/qemu[smartcard] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libressl_fix.patch
+	"${FILESDIR}"/${P}-openssl1.1_fix.patch
+)
+
+python_check_deps() {
+	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	xdg_environment_reset
+
+	local myconf="
+		$(use_enable static-libs static)
+		$(use_enable lz4)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		--enable-gstreamer=$(usex gstreamer "1.0" "no")
+		--disable-celt051
+		"
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 6c2ab0f1f01c..97847f9eb7b1 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,10 +1,10 @@
 AUX vagrant-1.8.1-disable-embedded-cacert.patch 742 BLAKE2B 8ee0008edd9f58eec1e2e5382dd88ad4db9453f4d06da1b0d2db68057de758a35f41b2e16a91bbbf1ac99d0ddf37d801caf0390230a33b61c82d8d3a5618ac1f SHA512 a3c791490f2b34965a3f3303ce064be76c86a6321d3d5616837b104e2db9a318c57ded7c59a925de7c79e6a5dce9a35ca0d90ef37cf8012d257f3e4e03d84508
 AUX vagrant.in 1541 BLAKE2B 92f8ee0f67eb1088003b99071d4764f9b1a09a39840dbbf88bbc36db417104bc7e7f177b97368ed10dd65f47e2abedef4f848588c21729f5a5ce1b55a20af430 SHA512 05b6c08eab0f4d5f523cfb4231db673ed66052fc72c27e97228be06a5f881da301538b8ff2e4872e8190ca996b994820a468c54b26759e2ca4036da409ca1a82
 AUX vagrant.in-r1 1872 BLAKE2B 9a5f7f98d1aa0713b2e9777b8d4b5d01f7fc23068c7d920e5117150850547d8809d4d30ef8617e3316ab678bee7a73d3c7bccf732920baf469aea801f2bfced7 SHA512 0adb540aa4a8925de7cf5099357aa555c36ea9afc819ee9f24028e318c46ab9d41bcf4543eddeda70b8c1ba97c3742f0b6544c03e4c20f2ede41edc8938c48f5
-DIST vagrant-1.9.8.tar.gz 1127560 BLAKE2B efb6c8b985e92dcf0f933a24480934ec09b990f6cd1ea0ed373eb72c3d41f343cfcfef99ff77f39e5a40ee010dca8c45db68c07db106a73078d2841d65e2e3c0 SHA512 d22cc0a6800aa5ef84085c750f5ec8729f7b3adefd9a5df1a1fcaf60d1219e781869ede4f57ce4fdeb269224603dfc3a8024545a0250ebd9e144745ce9aa670b
 DIST vagrant-2.0.0.tar.gz 1142850 BLAKE2B a37baa3166e812635a8ce7e27280108660a347b8cfed396f29cb8f7b7266b5dc47501be6793a95d9bbaf289dd3be3bcef67ff37c35b51987a328194f275ae7f9 SHA512 ee9059dfd205253d6f978fd225d85eef5a281532a1992bc9382eb713c95a0280d4b6518460106227237ae4e93cf5e2eaf670bd378627c3e9696b0fe9a2427ac1
 DIST vagrant-2.0.1.tar.gz 1153702 BLAKE2B 66c15ab3bf6fd5904e25d4689b6ce70b5c87c833e1ed943b49f53d6ce63924486d65c2db3990625a1fd971fae5e7961f7b9d0624e71576daa7967cbccf21c202 SHA512 4458fd819cfcbf732dcbb5e334986afc986e3da4f4ea883260ed9b7ff8dd90ef9b0078c067a1bf7fbf51562f235ab447234762a38aa0ac539974f6205f6d9cfd
-EBUILD vagrant-1.9.8.ebuild 2169 BLAKE2B 6a8fca05bcb8544be3202fad124d3528065ede3dc1748c636df8309f579917c22fcf29f6fdd8374523609962de86259a55a86edae3fc45b354baf50e73fa4a74 SHA512 ece9364b5437f22a2f441408c0811d14dd93138e7d9cce5ed785847b9e38982c880c808a1ba7668ca24fdeadfdd59a77a931461897eb54266aec4c834549f6b2
+DIST vagrant-2.0.2.tar.gz 1177773 BLAKE2B 7624ce0bbc5f606bff89a0ef7d9d562f5caeea50b2b13744aef5e037f0b7861ccd2b6450f1686f4285027540b795539ef548ddadaf2f6c1476c87717078ebc7f SHA512 27e8157cf8a8d102a0ca328403410639bd4a9f7cb90d443f5be3ca912aeb6177208b26ba9751b49d98b5ba1e92f8bec74db0baca4cd22051d5ef6d3aca558f3a
 EBUILD vagrant-2.0.0.ebuild 2162 BLAKE2B 089a4d828d04c1450df47093ab9eb528a4d2812f0706baf5217136514130e757c05b17f4e9558ef468a6d257ebcb6d379af64c8e827b71a67de63c06727e7392 SHA512 149763cc4f924a7879e0ad2da42f1d8dd74ff2679b44ad4fc3f16be588dab3794a7415decb089a73c15f4a86d44102d4fa58198c49106dc1e58dead8ba8bdea4
 EBUILD vagrant-2.0.1-r1.ebuild 2051 BLAKE2B b13ba8764cc2b29654cf05a7439abc56c24fbe4d4fee7938ace3cce2a2c3356952170f6a43af93b4315752fa27044b74c49f9239f1fa70a2818c8cf1db5d80a4 SHA512 c3557a23b98e652ab5f9d37d50f29ed119f4e172d056c749c7f30507322cf334f8a0287b3c8db49b438d70ac125c8048e15d137546486f57133823959d9c5e39
+EBUILD vagrant-2.0.2.ebuild 2069 BLAKE2B dd0117d12c8884866ce4c882f30f684110f95e17a8a831550eb9da340c983f54c9d322227958e6211e853d1c6bc9e64754b9d9e670ced4b3cbf21c905874cd2f SHA512 5c4cf1e5616a5e44cb14863a65db05c728c0cbd78ee4733d68a76de566749f8818f25c5bfe0e4d039c3d3bb38482b2c1b102d8917012b037b6a1ae6a06433fe0
 MISC metadata.xml 526 BLAKE2B a8d050fda7277001be0e472a1631c5d03620eae6d2adbd7fa985dfe478a137b444883587c37e2e8b1f6e6b55099573da1b4ec0a0d31863beb033eb17126d6d2f SHA512 a7b05fb9aa3c0e94bc5e3a32ed7da703dde28e254892e76575a6fe47ceef60c4134ee9f75dab48bcef72e98b1be32494d739e74e66f3aefab77fa4a5d55e346d
diff --git a/app-emulation/vagrant/vagrant-1.9.8.ebuild b/app-emulation/vagrant/vagrant-1.9.8.ebuild
deleted file mode 100644
index 7d133f044ebf..000000000000
--- a/app-emulation/vagrant/vagrant-1.9.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem eutils
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="http://vagrantup.com/"
-SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/erubis-2.7.0
-	<dev-ruby/i18n-0.8.0:*
-	>=dev-ruby/listen-3.1.5
-	>=dev-ruby/hashicorp-checkpoint-0.1.1
-	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-4.1.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
-	>=dev-ruby/nokogiri-1.7.1
-	<dev-ruby/mime-types-3:*
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-12.0.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	# disable embedded CA certs and use system ones
-	epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	newbashcomp contrib/bash/completion.sh ${PN}
-	all_fakegem_install
-
-	# provide executable similar to upstream:
-	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	dodir /var/lib/vagrant
-}
diff --git a/app-emulation/vagrant/vagrant-2.0.2.ebuild b/app-emulation/vagrant/vagrant-2.0.2.ebuild
new file mode 100644
index 000000000000..09af0d9c7406
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.0.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="http://vagrantup.com/"
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+virtualbox"
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/erubis-2.7.0
+	<dev-ruby/i18n-0.8.0:*
+	>=dev-ruby/listen-3.1.5
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+	>=dev-ruby/net-ssh-4.2.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	|| ( dev-ruby/rest-client:2 >=dev-ruby/rest-client-1.6.0:0 )
+	>=dev-ruby/nokogiri-1.7.1
+	<dev-ruby/mime-types-3:*
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.0.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
+		-e '/ruby_dep/s/<=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in-r1" > "${PN}" || die
+}
+
+all_ruby_install() {
+	newbashcomp contrib/bash/completion.sh ${PN}
+	all_fakegem_install
+
+	# provide executable similar to upstream:
+	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 0f5832924b70..dc944f1ef097 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,10 +1,6 @@
-DIST virt-manager-1.4.0.tar.gz 2667631 BLAKE2B dc245a295f62cbdeccb728935484761cfa0b35aa306e14f356bf0ba1de4c764769875f2a5a81662397996ce499fa7756d0e64fca1e1ee50d866b5fd2724da98c SHA512 6e28b0c4a91a9d96a0b5402e2af2bb0e670eb545824cf73877053c84891449bce236ffe2a79834a34d46443a7e5caa102cbbb0ac54af840a3997fbb61e155d51
-DIST virt-manager-1.4.1.tar.gz 2715863 BLAKE2B 489be4033a2781e7e66e27a2158beb39580f4f7395dcf40bc51c71721e77e64ae1c7525c5c57311808962047760820437457b53c46f438a6b45723591f902952 SHA512 ea4cdc16d7adecdb85431fdfbe7305518917b7d66342375b6773462d33d5647c2a4d3f054c08cd44d7c4e7785da92e38b18881a422083e82303b5a3dbd7b4cdd
-DIST virt-manager-1.4.2.tar.gz 2770982 BLAKE2B bcc808ffd3b39aea487909a63a1c5d9eb38f465643435b7dee7771fa7a7834c8c59512fd1b44473fb557fb78afc0b4d1aa3244957de0c07f4d03cf580ef2686b SHA512 df154a5dc2724e03f8e0b1646a39c4284fb5f38a4326b6ef42f4e1efc16187164c1b5259608bac366860fe6707e2134e8729228f6cf4d6cd9eca4b0edc01a53e
 DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d0e82b7840c9d4ec1857dfd2e62f39172abf116ca3f4d99f4a2c4366f06695a52561e6c816969928df79e623fb4ce9bf SHA512 007f125503fc2c774beefc8047ca2c36aa7177af40d9bc78fa3448fd50d4d35abd4a1dbbf761a8cd538fdf6541eba46c2cd019ba3ff0c7e29b1944d873b74274
-EBUILD virt-manager-1.4.0-r3.ebuild 2711 BLAKE2B 71da7d4392610379b0fe3fae4919cd381375c57e350ff3acf150be818b347d454beb87fa19532a8fdf01b9a31c43914ef9e0e0e64936667625ef634b2be5c487 SHA512 998cdcbfc46786b8b3dc07fbc820bf7252e1b1b1671b707c2db4ae96b4f613cc05581004d4386fa2fad0789cfc6b0b144fd55ada96040380530956a302047db2
-EBUILD virt-manager-1.4.1.ebuild 2427 BLAKE2B 4392a2102a51a5bf89ff53bbfca88bf20d0bd77ac6de3f9fa7576827d9ba714caca791e958ba2147e3c4eb48ba22d7c1fe8a2583853632b937794c1105e23f8d SHA512 356b82caf17405bf74d80809a83f685ca6941fe64cbc0ce6775c9dd79c75c578df9f3a1d11e96566e604a9fa8df2f4a883be81f9a9f3733f7da94412ec5a71c0
-EBUILD virt-manager-1.4.2.ebuild 2399 BLAKE2B ed2c3878c9b3ae043459a154a25a3161a09523909c296c632b32d08c5ae8466472654086c2177a7b6c1e212a316463734b4a399256e8636f641787cbbf981780 SHA512 73a108a870ac382b3a72b5ecd9119941137208f257b7606b91bdbdbeacccf107c8fc0b5cd562378828e247b4dc75470584e6b0c534688caabd511c9e142b4f6f
+DIST virt-manager-1.5.0.tar.gz 2797380 BLAKE2B 45ef8c2b98fa1d6f7c4b4fe45bca74e27d595eb4d2e7c80c4e7671c445d8e523b8a4c21eaffc02dea756b7a93f5b3c7f3bdc795a0cf6ef99230bcf0c5683c81b SHA512 b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
 EBUILD virt-manager-1.4.3.ebuild 2406 BLAKE2B b18ed780d146def605866e8468edf5505cee6913169381fa591a804bd25ce6b6ec4b09801ee42827871f6b08d9bd8aaa621ba819bbec682f6731fbaa8e984411 SHA512 0db0e050d64b2b6cf820c4dfa2a21c1154ee7a3bc124b38b78bbd5e6ab18239a5cdff49838597daeb3a1fe71b2b4ee167c685f2217087404fe7d6bcf9fa82c44
-EBUILD virt-manager-9999.ebuild 2399 BLAKE2B ed2c3878c9b3ae043459a154a25a3161a09523909c296c632b32d08c5ae8466472654086c2177a7b6c1e212a316463734b4a399256e8636f641787cbbf981780 SHA512 73a108a870ac382b3a72b5ecd9119941137208f257b7606b91bdbdbeacccf107c8fc0b5cd562378828e247b4dc75470584e6b0c534688caabd511c9e142b4f6f
+EBUILD virt-manager-1.5.0.ebuild 2408 BLAKE2B eae4524fbacfa095a48dda0fd3e4cac44281ce5d7df862990cb8fe8ab72049185aaad886b3ccb4a957fe0367e1d587b62304a94065146f1b5e3d27ed90c80108 SHA512 960693352f33803ffb0049790e944482b6f7272a040137e25f78f4e0ef7015d0fb4a0fde922110aa6f90dcea9c35d075425d851a0550821b200834275666cf04
+EBUILD virt-manager-9999.ebuild 2442 BLAKE2B 7783010edf8e1e41eda8c74d5780f8e4b3246066b7b6ac97f89a85f61d79239e4425037131bc87bcc145d5165344720ec20c83d0e638d0941a89d03b75f834d7 SHA512 e0424714069d08b0e0de868d72e45d57953c3ea2dd0910b683c3bdb2b73ca0274a7444661c8df212cca0fe47d10c0aea5c455ecddc8d033b89c88590118b30e6
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-1.4.0-r3.ebuild b/app-emulation/virt-manager/virt-manager-1.4.0-r3.ebuild
deleted file mode 100644
index 04113c1f918c..000000000000
--- a/app-emulation/virt-manager/virt-manager-1.4.0-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
-	it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te
-	tr uk vi zh_CN zh_TW )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
-		x11-libs/gtk+:3[introspection]
-		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
-		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		net-misc/x11-ssh-askpass
-		x11-libs/vte:2.91[introspection]
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-		policykit? ( sys-auth/polkit[introspection] )
-		x11-themes/gnome-icon-theme
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool"
-
-DOCS=( README NEWS )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	local lang
-	for lang in ${VM_LINGUAS[@]}; do
-		has ${lang} ${LINGUAS-${lang}} || rm -v "po/${lang}.po" || die
-	done
-}
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--qemu-user=qemu \
-		--default-graphics=spice
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-
-	distutils-r1_src_install
-
-	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_pkg_preinst
-
-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.4.1.ebuild b/app-emulation/virt-manager/virt-manager-1.4.1.ebuild
deleted file mode 100644
index 7e64ce32473c..000000000000
--- a/app-emulation/virt-manager/virt-manager-1.4.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
-		x11-libs/gtk+:3[introspection]
-		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
-		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		net-misc/x11-ssh-askpass
-		x11-libs/vte:2.91[introspection]
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-		policykit? ( sys-auth/polkit[introspection] )
-		x11-themes/gnome-icon-theme
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool"
-
-DOCS=( README.md NEWS.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--qemu-user=qemu \
-		--default-graphics=spice
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-
-	distutils-r1_src_install
-
-	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_pkg_preinst
-
-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.4.2.ebuild b/app-emulation/virt-manager/virt-manager-1.4.2.ebuild
deleted file mode 100644
index 7d4df33db5db..000000000000
--- a/app-emulation/virt-manager/virt-manager-1.4.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
-		x11-libs/gtk+:3[introspection]
-		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
-		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		net-misc/x11-ssh-askpass
-		x11-libs/vte:2.91[introspection]
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-"
-
-DOCS=( README.md NEWS.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--qemu-user=qemu \
-		--default-graphics=spice
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-
-	distutils-r1_src_install
-
-	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_pkg_preinst
-
-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.5.0.ebuild b/app-emulation/virt-manager/virt-manager-1.5.0.ebuild
new file mode 100644
index 000000000000..7725679e8339
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+	gtk? (
+		x11-libs/gtk+:3[introspection]
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		net-misc/x11-ssh-askpass
+		x11-libs/vte:2.91[introspection]
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+"
+
+DOCS=( README.md NEWS.md )
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--qemu-user=qemu \
+		--default-graphics=spice
+}
+
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+
+	distutils-r1_src_install
+
+	python_fix_shebang \
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 7d4df33db5db..a3b8ec6f3540 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-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
@@ -26,20 +26,21 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	${PYTHON_DEPS}
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/configparser[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
-		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
 		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
+		x11-libs/gtk+:3[introspection]
 		x11-libs/vte:2.91[introspection]
 		gnome-keyring? ( gnome-base/libgnome-keyring )
 		policykit? ( sys-auth/polkit[introspection] )
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 3d7691465700..a7f5c5803e01 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,7 +1,5 @@
-DIST virt-viewer-4.0.tar.gz 897593 BLAKE2B 297abe8193894b3158c4a7fc1803e616bdb8a66b7cf0d0f6b55e4864a74193f06b3790d9aec562b340ad404d6dc1360c5dd26fe4e6de32d888a2571ce35fa618 SHA512 7d1e470a159c8784dff6c4fb1f9228689f76ddbdae314bd57f86c6dc975d1d50590732640768b7e08d6a3bbc02eefbde090cd8f05c97151cd8abdc7ae97e66ea
 DIST virt-viewer-5.0.tar.gz 908726 BLAKE2B ffc1e8ce7b74f888289a65a0ad7566c84278cbf1a412b426883313f1b66bb95e10b74fedb256b4ab6b39e4dc6e292e518585fcbaf07e7669b51a5be87cfd257f SHA512 924fa88fd0ca7cc5b3d0a348c0d1104337fe0a06328e32110b4417c64f5d9efaf6df534adbc1eaa69157d229763b773307fa834a66f16156e3703731525eb690
 DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
-EBUILD virt-viewer-4.0.ebuild 913 BLAKE2B c653972e7f7a548f4a1cf7fdb54bbe68c37cdec2434be8304fddb0577a7a9cfb275682d231c8bb2527b4689b1843fdedb8d2a94960bc3f8e77b9e9a2f25c89ab SHA512 76829320e3268f0faa660e9ecd21dcb8f042301bd5b54b68a3cb6ad7081ed68d4df76c49553850d6e9a8513f43fe58783132c7c87153eee35f45a56e19e80f88
 EBUILD virt-viewer-5.0.ebuild 913 BLAKE2B 82aabc3c398e50636ab8d934366b3c560382d10c848f94d11fadab63e83043cbd9c197e71b196f22d29edf96bcb5571d2f0618838bbe9cb11dda249580f901d3 SHA512 38e81719acda11fbe13604f607632bf0519c7274fb4617795589ac12e187c8801f5a93af46ca052ff2b5198e74af52c4b5acea34e96732637204db88e497d24e
-EBUILD virt-viewer-6.0.ebuild 915 BLAKE2B a73e9452d21043dfbd775c850c80d08d912b3599273c5e85e560acb38f8c23fd4abe9b0844c793d05b266480068ab9deca971458a205c670d82c9d3e967db578 SHA512 ebd9128f32f94bb4cf1246d09dad9723f497acf3d7dbac7cf9329268e1f94a054811ec45971e2a581d5680fa547dce64d6304773dd13b450d779bd960d79478f
+EBUILD virt-viewer-6.0.ebuild 913 BLAKE2B 72016aaacda1f38e7c35a2e032bac8aa1be31383b046c72d31e9f45b55774cfb9f64dba2190776dac6da3819104ea12a8120e30f601875442c32e36744e40589 SHA512 e491e7ab83ad8bd407a624196e39e9bee3e043b6dbcb160e3ab3937b8794ee29c126e63eff6cb2dbeff961dcbd92e75b06e73acf273aada49628b219c11851da
 MISC metadata.xml 452 BLAKE2B cb307dd6593ae8c96ca9c6925783e0b26335f1d1b11c21ccbf7e54003ef2e9e32701304464380afea75a642914e2334c053417aa5e18de5737443b2b60f65d0d SHA512 c97651a4477db1452310d3b53efec56c596963827d1b13385bdbaee5bd8725774b40edc88dc5389b5c0a4ac50f9801de5f649d8f941d315f1e28b6ebf1c9cb79
diff --git a/app-emulation/virt-viewer/virt-viewer-4.0.ebuild b/app-emulation/virt-viewer/virt-viewer-4.0.ebuild
deleted file mode 100644
index 13739f01c47b..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	spice? ( >=net-misc/spice-gtk-0.31[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-6.0.ebuild b/app-emulation/virt-viewer/virt-viewer-6.0.ebuild
index 46d6fd6281cb..dafa029a2682 100644
--- a/app-emulation/virt-viewer/virt-viewer-6.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-6.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
@@ -10,7 +10,7 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="sasl +spice +vnc"
 
 RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 948b6e0fc527..933ee72c472e 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index 9bc54eaa575c..af53e23099f8 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,7 +1,5 @@
-DIST eselect-postgresql-1.2.1.tbz2 3645 BLAKE2B 17262fa368b30142599145b8d0afcdb4cc82be70e40bb7b72f157abe70eb31b7f35f6acb135ef7fab0f6f95044a2150b3550968903722cc741158d21043f72a2 SHA512 9b24cb7620dd3de979ef595c60ebf607cd9da5c7d3c4da19ebe242c25961883e2db54341f916690abb9fe7a76663d9f1ac73fc76c90389f72eff425aa6fb43e4
 DIST eselect-postgresql-2.2.tbz2 4428 BLAKE2B f18b7daaccb9ab2fe08bb6e7f88dd41dcdf69b951a3c20b65ee2955ff33fc614e5740ddbbe8eb8f55d20f5705d47fb2da8c3f3fc89e403ea24eb4b8d912404a0 SHA512 2a0b9b3c8c75792fb6b6f90f034562a3bef7c9391cac0d7c95a6a86db38b4c9840fce2fa0edb32b745905f974920ee1ce5dfb21d33f22c79d1bc776e013edf76
 DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
-EBUILD eselect-postgresql-1.2.1.ebuild 660 BLAKE2B ef4ce36a08143aabae164306cb7081c31690d0b9a29fc9d4dcb54c650668d1dda08fa3ed8ae39dca7a1d3bca4e7afc08f6c7e871812526d3528dc844fd0dee8d SHA512 e677531aedefbb4fe5941ae86af4743e08f118399a52cfa2c4f93fc473486ebe26cad2626467c808bf4b714e8be948a61cc605f0278127116c863c26cf335d05
 EBUILD eselect-postgresql-2.2.ebuild 932 BLAKE2B d01c59555bbe680338130b0aa452349ea2fbfd53fbde30c766618b3b8fd3ea4758c6a208ae5f02e83e2d36f3ec28c880ae4962ee71cad028b43b0dbf526d862c SHA512 43c9abe89dd5b84da6ed838e80c52f3c2349db0fbe2832881568a879b5fcb220673391e7cb124761aa4e8320c9a13755670dcf2ea3a9031ffe776e8f9f6d2052
-EBUILD eselect-postgresql-2.3.ebuild 931 BLAKE2B 1b5f3e5e20f28577382f74d84c95918e13d1fec34455dd877b3a2872de89fe232e97cfdf3dca5dd266ba1f9d901404cafea9a752598aa7b68e41cb20e10c16bd SHA512 6ce4389c77f936bd70b63b79389b298ac66943a4659ec34499bb1a29db149ed9499a7f88231bdf4c82b1c873480cb90794bc74b4dd1b4870e46c3bcaaa68ba83
+EBUILD eselect-postgresql-2.3.ebuild 930 BLAKE2B 062e11d304966a46e19cea0723d6ce5d8a0bd741cdbe9f554feca1348d6aaa72d06de79bdccf12ecdb030cbaa65df8fa739309e5d81525b91d7da18c7de6cc59 SHA512 c77e78368981fdd7b48fc4ac8a958227f8ee50acb7ef75ad3aaabf767d67fef6b719c594acea4a546c5f67ed066243b82cf2656d0d23440d0aeb0585d94989ac
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
deleted file mode 100644
index eb35bc0fe1c3..000000000000
--- a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Utility to select the default PostgreSQL slot"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-
-src_install() {
-	keepdir /etc/eselect/postgresql
-
-	insinto /usr/share/eselect/modules
-	doins postgresql.eselect
-
-	dosym eselect /usr/bin/postgresql-config
-}
-
-pkg_postinst() {
-	postgresql-config update
-}
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
index f15a7b3400e9..90af64fe8229 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 913d2a3a90da..3fb5ef9e2952 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 2a034fc41a53..f52288015489 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,8 +1,10 @@
 DIST fcitx-qt5-1.1.1.tar.xz 56352 BLAKE2B 1fea4484f79fa9f9bcd52ac59b4e64cb9947a2cdc46e3df3c3729ef37d136c4fcf787d7a8abd946e5a0d02f909c0a94b6d19b98a93cf9dc2ec49d172a5f19550 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c
 DIST fcitx-qt5-1.2.0.tar.xz 134224 BLAKE2B 8358ec0b1cf95534f15536dd9529d4f7da47e6c08c050cc93503db958348ce4d940eb1903be8f161fec8adeca58c03838f021e36ecf39908361cddee40d806d4 SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915
 DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
+DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e SHA512 902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
 EBUILD fcitx-qt5-1.1.1.ebuild 846 BLAKE2B 2473b95b1dac058ab06d279c79de3cbf8d211439173ff31faaa2cfbef1f4050e257903f47f99b08aab01f7541600dc3ba2e6db393635e60a395db799d5202f52 SHA512 1fdcacc24874adc4ffd7e110265fc029eaf3c2a6e5ef4a427d161f091081e5e8f76d1b9e03f3b3e873ac2e7f2852fecf3e7e0572556e8de23493ee46b2daa4a7
 EBUILD fcitx-qt5-1.2.0.ebuild 872 BLAKE2B b7a400a699a427eecfe044c5aaf0a2521e959ca26b1fe7be59a75c1295d9408ccfdc8f717ef85ec955e7c7af054a9af15292c723388944ec8965ab695cb4bc57 SHA512 93a1876b5b9684f9c624dca1e50b980e37017714cd5bdd24625c51a2a0bff4dcb265a1e7175325ce6faefe509460cc99440d5d6b6928741eb20ace4f39426af2
 EBUILD fcitx-qt5-1.2.1.ebuild 873 BLAKE2B 24262bf61697f53de093458a87e2a91727bf7978ca95485572673ca712c1374b55fbbb3dd82a567b03794216a63a3df869dcb1d9269c85fa03965ad09955f40a SHA512 ec9cc8db96b8ecfddb38c174aff447f2af5a1c99a3ef9f096015438e9220d56507fd38a7526f2fa9ea327d9a8ba00b71af44b492d17e182756bbd71bd72d58d5
+EBUILD fcitx-qt5-1.2.2.ebuild 877 BLAKE2B 613673c016250439dec89bf8f6df512836b690c62108a10edd4bb2541fd404da46e3828dcbc070ff797e0b1c794687131c9c77c1d26ac1e50a8d6be0045d2306 SHA512 a595a9372c0f7592f82a40643e2d3cd72a7b4b4ce9ad1a5a96c5a52c69210f1c140573297e54c7ef01478ef4b2d11b76c4e8832a970d187c409d643093a95419
 EBUILD fcitx-qt5-4.9999.ebuild 848 BLAKE2B 9dcd52abba77d2b9679721edc4c5d4614182739cd59912d4a058d2ed56cd34478b934f783aa03d4bdc2912047fb269859d298b91d7f943053c43dd0524948ca0 SHA512 2b13a220dbf44f0acd6872961930dd9f01374bcd4c54c1b668dd49dc1129039a87a620e37cbc04c091a6fdb06837fb75ef8b7c171e030457ee239201dd4426fe
 MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
new file mode 100644
index 000000000000..70cf97b61829
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	virtual/libintl
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index 2c372cc44d31..1599e95fe5d7 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,3 +1,3 @@
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
-EBUILD ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild 1085 BLAKE2B e5e6ea35603f8a5d010bdcdbbde922da26ad6781dd1345c22cfd0286fdaa2de9b6e8bb38ff421a9f59057f1827821f947f71330b7892c37c91c019b82feab7b3 SHA512 0d66fc225945eb28bc74a6774ea9b7658131680e91aad5bb812dfaa482a654bac5b39c876fbdf416e7ea2cb3c128df8bc2af0441da7784c9dd8beb5d467f4db1
+EBUILD ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild 1080 BLAKE2B 4403780f922c47cdda854d49666869696e88b6641af9db951c62eef14fba97acf824761bee5485c1e1075ce43ae17bce1174a63d9d13d136bbc11d699a9d0b56 SHA512 e76aefc9199e00ced36d430bf40b82dcdd44de91786a6283f7712efd7fe0c505ba71b5744b427226b38555e989867ec57a918b0069112be83b2ecc7079922577
 MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
index 11703f187c92..77a59d469623 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit python-single-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
 HOMEPAGE="https://sunpinyin.googlecode.com/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/sunpinyin-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0"
diff --git a/app-i18n/man-pages-ja/Manifest b/app-i18n/man-pages-ja/Manifest
index b8154d90f6ac..b9ddeefce23c 100644
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@@ -1,6 +1,4 @@
-DIST man-pages-ja-20130215.tar.gz 4384182 BLAKE2B eb6a4be0a53763776b629369028eeae96f472a8dcb0752559d124cbffc7b18a5d939fe6e37d05c1162aeec79701c63fe1602754f260edbb281cd543144d98c77 SHA512 655e9481dfdfc619013f8cae2928d7ccd70bba31631f7b10b894b1d96ab64bae4846be68d8a633791f1c169faed6d42466bd60ee4d7f92031f596d8f23cb6138
 DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
 DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
-EBUILD man-pages-ja-20130215.ebuild 1967 BLAKE2B fec0a8181dcab4faf724961902c7cf6f980fdf3175da33958de92f528e81f032eb319d39a29a11f45e4552a64ab934faafb20f50c8bdd908fc5929968fe1f7bb SHA512 c1bdafca8b2048360ef75d1bfd83aaea3284239eb1cc801f862d60cb1cba13736457f077f9914504e98ebe8995e7dfe33fb727613ad5109bfbb27b0db8694ed8
-EBUILD man-pages-ja-20171215.ebuild 2035 BLAKE2B a61644598567204c4d3155578ccdafd947928819d10d5ca3f63e4ecb083fab81850c022e0b252116c895e77737e17c940ea8a618cc38d22bc08c146bc4ee4adc SHA512 5c1feb8268a2f654399e67da1d80b470fa79f54ff48fcdb85d29d5b462c1c924cc4f5bfdef7df84cfdec4fa4676c0160c2e14c0f219c9e7743bc5ba1f03a0dd6
+EBUILD man-pages-ja-20171215.ebuild 2026 BLAKE2B 8206aff3e0fc7188882b4541efdffc7829aa124ffd7718c855340a901a9d67b08c58d7bc8557eb3f0a28d52b25accf77e7af8ad4bfc827e41d63bddf79697a03 SHA512 6b22c156fc08bddbb7f372965062c528183a1540455e5bb3d50beb9f25b6155766996040df2cb5479242461573d9bff9274a8f2ab0ac9c3f4afb72d65f38235b
 MISC metadata.xml 674 BLAKE2B 52381f36a78ec6aaf9855e9828d0f6e25f46c78d9049f90c604ef6ddd339e56831731c5e2a6c25731725767763cc37e9ece2a6d862500ed3de63c9501d305fa7 SHA512 4930172347182e65fa0fa30e2fcef5bfc391e6fb1dfefaa872ebe609c9583b58a5d8a62bfbddaf8b8ecf2a80ec30752c71fb658dfd4569a4493bc9eeff6de2b3
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
deleted file mode 100644
index 18dd7e540c6c..000000000000
--- a/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
-	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -f manual/rpm/man8/rpm*.8 || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README || die
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP || die
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
index 6964ecff2812..c6dec00c02ab 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 385e9e1313bf..ee575320c760 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -7,5 +7,5 @@ DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc10
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
 EBUILD mozc-2.20.2673.102.ebuild 9271 BLAKE2B a5cbd77595500d0c66b6871ebf9177c183a015396ee51388d79f2693d1681a046eeca1e39f7549a6c617dd3a319a72b386f9022a8b6e603bd0fe456bb12d446f SHA512 8b24b700137299bf6626e3cc0e4d140b364e126383e51336fe3e718fa720453cdda2a6c099bba093b22e5aa6bd9f6b8490a50f96af3bacfcce6a5a87d952fd33
-EBUILD mozc-9999.ebuild 9204 BLAKE2B 5faf12f397fb5d6cd536216759281583417d41ff3e27fc35468015fd95e2ee0b234d3bed6032b8adef9c0750b171a6a2508e1fe38ca14ed76cda4ace193a474a SHA512 d8be6dd3690e2912ff1c5f744b9b04371f073840648de8927caa787c2495a2ae07e4aa63c0108c823c3b105a10aa2a3ed17fa09cbef6394246eafa0f49ae80c6
+EBUILD mozc-9999.ebuild 9146 BLAKE2B f1142aabd7e3fd032d003bec42f211ea92e5375890be5f16eadbb50fd5ad48e135aa7de2384441a3829f4320ab2c9353ddd06c0bf60044970f0b735b400bcb18 SHA512 14227c13147f01fec14eef094de630e479c5fc0c44c5e20705afd62c5e1649e375841c2935ced640d450f4552ba1a125534164a0de2fb02ecbaa3fe6bf623354
 MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 388857a1862e..96d3d9bd6f2b 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -99,7 +99,6 @@ src_unpack() {
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
-	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 85bc9f4e1e40..6dcd9dbf3de3 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,3 +1,4 @@
-DIST translate-shell-0.9.6.2.tar.gz 69544 BLAKE2B b49a2c6d7101f5063c8c548c2dcd26ed8b5a310d5e723293b8082bb1bdffbb926fb6f0050953825c9fc4567880cfbf1e9956236db3c28b176db851983c743d0d SHA512 a7bd3fba43485a22c2fdd4261c24579b03aeafefa40863c3b8eb1c814a167b9a6f5700086c1cd411063c66c169875b96d2634ed04f45beb6d53b4725eb7fbea9
-EBUILD translate-shell-0.9.6.2.ebuild 694 BLAKE2B edd23e727aa577a1d8a024918661945fb6c9cf4274401f47c15a584736416d33fd5ac277059300cfcdd9be1968b2991415ff7937e2a74a63ff8bc54e2482dc6b SHA512 9246fb2636169db79a4c4f14ef002b14e398985db146a5f0fddc34b97b9808b2ed20e114c305e42fe511435d36224417ee3b5fb2d7d26fecf23ed0304f92ff08
-MISC metadata.xml 726 BLAKE2B 3a8c78ace5e508be4b1e14119594b17e88bebe36e6ac74e631437193a6c5506cacfa3951e768c431c11e1f96ba9f8ac37e09cfc2df8625c648d190c7dc4fae29 SHA512 34f7283a7cfa16e87f3a97d0480e3b8469506d096f565ca121a7dea0249b1f2c34e101ae45561540a81f7a63b1caecd995a21e57a42313ab30574474bcc013f4
+AUX translate-shell-0.9.6.6-remove-online-tests.patch 1199 BLAKE2B 3d502db0cbbf9b7174c136b7d01f040b07bb72a5a60aa40c4874a75f2e49cd15fcae5509fcec96182762c2e8b69411d0998ebc6e24e0f2567e1b165fe6eed166 SHA512 111e11c9c9756e7de709ac6e2477aa1a3e81ddcfc8227db1d6435c77c0196411ec5aef8dba584a767b4b43f94132efbf63e30bb0d3975116bcb3920350431098
+DIST translate-shell-0.9.6.6.tar.gz 73189 BLAKE2B ad4de403f2c95a1e4de5c963cb017f5a744f08d3bb8256dcc22f28c0916f6a0e693bce171a5dc500de5353c954bab7681f1227df9e48be286ad5aa07c5d06fa4 SHA512 c5451e537f44e325ee2f59d54942f91b8e2ccc0e322c42a2c4a0e98b8a933fe0630798a45e6f587ad5aee2cbb092204710ae36779c94b8333376a8072678d868
+EBUILD translate-shell-0.9.6.6.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
+MISC metadata.xml 856 BLAKE2B 0bfbb3ab59d613c16732c000d7b66f618b05be517ea8976fc187deea834b214f9dc405b1140fa51d98940935beadd3a3c94d35274fc75444360491f5be99662a SHA512 3c5b5a99f2ca8d41ea076b0190ea06a23e7334282a55c5664dd417e34c92cc5df7d03f33bd1d9b1708a1632de66c4d02587c6fe3e6761a70be75783e447c3d00
diff --git a/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
new file mode 100644
index 000000000000..2eaf607b4bc8
--- /dev/null
+++ b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index acc96e0..622e136 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,6 @@ test: build
+ 
+ check: test
+ 	$(BUILDDIR)/$(COMMAND) -V
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 忍者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 'hello world'`" = 'hello world' ]
+ 
+ install: build
+ 	@mkdir -p $(DESTDIR)$(PREFIX)/bin &&\
+diff --git a/test/TestUtils.awk b/test/TestUtils.awk
+index 08bb2e9..3465327 100644
+--- a/test/TestUtils.awk
++++ b/test/TestUtils.awk
+@@ -30,24 +30,6 @@ BEGIN {
+         assertTrue(newerVersion("2", "1.9.9999"))
+     }
+ 
+-    T("curl()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curl("https://httpbin.org/get"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/get")
+-    }
+-
+-    T("curlPost()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/post")
+-    }
+-
+     T("dump()", 3)
+     {
+         delete group
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
index 83da660a81a6..bea3adaede38 100644
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@@ -9,10 +9,14 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Translate Shell (formerly Google Translate CLI) is a command-line
 		translator powered by Google Translate (default), Bing Translator, and
-		Yandex.Translate.  
+		Yandex.Translate.
 	</longdescription>
 	<use>
 		<flag name="tts">Enable text-to-speech support</flag>
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.2.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.2.ebuild
deleted file mode 100644
index bf6def292ff8..000000000000
--- a/app-i18n/translate-shell/translate-shell-0.9.6.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=5
-
-DESCRIPTION="Online command-line translator"
-HOMEPAGE="https://www.soimort.org/translate-shell/"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+curl +bidi test tts"
-
-RDEPEND="
-	app-misc/rlwrap
-	>=sys-apps/gawk-4.0.2
-	curl? ( net-misc/curl[ssl] )
-	bidi? ( dev-libs/fribidi )
-	tts? ( || (
-		media-sound/mpg123
-		app-accessibility/espeak
-		media-video/mpv
-		media-video/mplayer
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( app-editors/emacs )
-	"
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-}
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
new file mode 100644
index 000000000000..6447ab3f65e0
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+curl +bidi test tts"
+
+RDEPEND="
+	app-misc/rlwrap
+	>=sys-apps/gawk-4.0.2
+	curl? ( net-misc/curl[ssl] )
+	bidi? ( dev-libs/fribidi )
+	tts? ( || (
+		media-sound/mpg123
+		app-accessibility/espeak
+		media-video/mpv
+		media-video/mplayer
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( app-editors/emacs )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-online-tests.patch"
+)
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index d9ed60be8d75..b78a57a84427 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index e4c776177a9d..aa4d3c425687 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,5 +1,5 @@
-AUX ibam-0.5.2-build.patch 1317 BLAKE2B be4dfa7a24266fe68a67f5cdb0a2294f545fdae3a3e9d171f56e6e601928c2f521d16ec8ac2641c872f044e456ebbd2f86b36abfdf40cdd5a0a3fa27cffcecb9 SHA512 7675b497b516f750d74604072d138876ee84684d8f12f1d8be3bcf0173f321a63fc0f3def0c519091506275e55027bf13fedb1c328983ac8016f6c78210b95f4
+AUX ibam-0.5.2-build.patch 1311 BLAKE2B 3e58e55331cf21e1f9bf7825d89c7c72a7fdb83decc1ba4942019de347facab1ef19534dadb079c13b7c9761ef864b7e3611e5f17d5e1c3411eda23ff1a8d3be SHA512 415d36b8d9b212ccc84728e83ce11ffea439542766d9ad6f53659618194a144dff491589a4ed49c0f3707ac37199773925eb357166915193c55e77e246e2d00e
 DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
-DIST ibam_0.5.2-2.diff.gz 5914 BLAKE2B 791062b242e21d6e9624309a2bed82745fd266c935e2b73dc0104a4aa7433080dbc775edd92bdde7fb1b52383a7ab96b21b3b4f843a9c5a9671c514cf3d472da SHA512 baad1e6bdc416de6d82181e55ba5a8c9871dcdaf756172558d093384cd2f4d0fe89d37f1266407e2bea784d18e429eeab5fde0a304b63bce97c73ba9391e7556
-EBUILD ibam-0.5.2-r3.ebuild 1141 BLAKE2B 25e0c16a01be870fb20a611b8d91ddbc98236b815385d0fca31da33c09bc88029a82ccf441482068853cc209ce8d8d54eb1642dce328fee855cf9396ec0df828 SHA512 d77950a8d21151dc20a81168516b2f3b58d21dc96ea97563f3f413969c80d5d8f3bd27c3e6e93f4d1f091ec54d9668ce4081f8958bc340d5aafb05cd7939aeb8
+DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
+EBUILD ibam-0.5.2-r4.ebuild 1175 BLAKE2B 4d2e45f591d7b7e713e4e8999fc28f4772d7cd9baa60b014d6630b70964c9f723c1bdd937aa54583a35679d929f08b4858912e95fe56e50ca025890381fdeebc SHA512 6056a58fdaa44212b2dac5e93281a2864d5586ddee4c970715281a69135364e33dae65c68bcc90c693cfc0d19bf632cf91bfa65f164fdb3b7aa149d50087128c
 MISC metadata.xml 330 BLAKE2B 23b7606f4008dab2d8de06938cd2c36bda69bbc025bca0d2234224d37242359299a65b17b5c55b3080d7fcea4ac7a9e4c2359437e355f960b6c217b0931bccd6 SHA512 bc1e4eee7bc08f8e90b37ca0401fd7ad68645a6c50d22d22816ea944c50e47b1b00bc7da95eea38bd0e77f7c1c8baaea0a63c26cfbc9b6941a96612f145a9059
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
index 77854b5f3d5a..665e50798b18 100644
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- /Makefile
++++ /Makefile
 @@ -17,8 +17,8 @@
  #
  IBAM_VERSION=0.5.2
@@ -22,7 +22,7 @@
  
  ibam-krell.so: ibam-krell.o
 -	$(CC) $(CFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -Wl -o ibam-krell.so ibam-krell.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -fPIC -shared -o ibam-krell.so ibam-krell.o
  
  ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
 -	$(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
@@ -32,7 +32,7 @@
  
  ibam-krell1.so: ibam-krell1.o
 -	$(CC) $(CFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -Wl -o ibam-krell1.so ibam-krell1.o
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -shared -o ibam-krell1.so ibam-krell1.o
  
  ibam-krell1.o: ibam-krell1.cpp ibam.hpp ibam.inl
 -	$(CC) $(CFLAGS) -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` -c ibam-krell1.cpp
diff --git a/app-laptop/ibam/ibam-0.5.2-r3.ebuild b/app-laptop/ibam/ibam-0.5.2-r3.ebuild
deleted file mode 100644
index 2cd5cf10f92e..000000000000
--- a/app-laptop/ibam/ibam-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PATCH_LEVEL=2
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Intelligent Battery Monitor"
-HOMEPAGE="http://ibam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gkrellm"
-
-RDEPEND="
-	gkrellm? (
-		app-admin/gkrellm
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-	)"
-DEPEND="
-	${RDEPEND}
-	gkrellm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-
-	local f
-	for f in $(find . -name '*.dpatch'); do
-		epatch "${f}"
-	done
-}
-
-src_compile() {
-	tc-export CXX
-	emake
-	use gkrellm && emake krell
-}
-
-src_install() {
-	dobin ibam
-	dodoc CHANGES README REPORT
-
-	if use gkrellm; then
-		insinto /usr/$(get_libdir)/gkrellm2/plugins
-		doins ibam-krell.so
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "You will need to install sci-visualization/gnuplot if you wish to use"
-	elog "the --plot argument to ibam."
-	elog
-}
diff --git a/app-laptop/ibam/ibam-0.5.2-r4.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
new file mode 100644
index 000000000000..2076603b9f60
--- /dev/null
+++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PATCH_LEVEL="2.1"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Intelligent Battery Monitor"
+HOMEPAGE="http://ibam.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gkrellm"
+
+RDEPEND="
+	gkrellm? (
+		app-admin/gkrellm
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+	)"
+DEPEND="
+	${RDEPEND}
+	gkrellm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-build.patch \
+		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+
+	eapply debian/patches/02*.dpatch
+	eapply debian/patches/03*.dpatch
+	eapply debian/patches/05*.dpatch
+
+	eapply_user
+}
+
+src_compile() {
+	tc-export CXX
+	emake
+	use gkrellm && emake krell
+}
+
+src_install() {
+	dobin ibam
+	dodoc CHANGES README REPORT
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins ibam-krell.so
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to install sci-visualization/gnuplot if you wish to use"
+	elog "the --plot argument to ibam."
+	elog
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7e2e09af2158..d8241e4e9d03 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index 8d142d12085b..75a85c9767df 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,4 +1,4 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
 EBUILD away-0.9.5-r1.ebuild 846 BLAKE2B d774832642767b543d15faf8ed8ef6dc497c4b3147d11e5c2a3a013845d0a9bc9baebc85b6f87259df1b726495d2aebac322e29dbdd9dcea2e7b7fc04b952289 SHA512 1ed2bf3c0a588bd5400c17f71859049b2c24dccaf3f00ac4c8374cf07838542a4e8069d1874b16143ce70daf0857d63adb3677c87d4cdbeb0b4c057ce50714e4
-EBUILD away-0.9.5-r2.ebuild 811 BLAKE2B 2ea94c4d71aea4f8b5933369ff9f3edc9bfc792effe05110660bbbd6e67f95e41576f302f8da78f7e0c637c262f7d9c89096e46e8d5bac77886815a8003feeb6 SHA512 937f62d6dda240ca6e0e14264da32a19f3dd0e209f54e7ae5da85fa47ede297fa57763938d286a255c3628ec8a30ca2f8236a1ee7771ab4d2651e1b57793a67d
+EBUILD away-0.9.5-r2.ebuild 810 BLAKE2B 4161d711c3ced4d61e08b392024b7a502b25b5a6f3e58c139476460281074612210c49684b4cfe83eabe8de80d8af33d7872db9181df37befcd655dbe7324639 SHA512 210917b3ccab3eac9f052d3f985b2f944fc8122cf46e108b0f1713f0cb5080700c92cb87b8cc5500274412bff30c2ee2561c1a27940512c3869ae1761316fe27
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index ed55ee02ecef..e4f0e4077fa3 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.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="http://unbeatenpath.net/software/away/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/pam-0.75"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 043b5ad393bb..83c767fb4a49 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 637 BLAKE2B 8d52d0e1cd4ce622984f2e19f4194fc858d64365c827a2288ef21b7308f22d463951d4b44929bd94cd1ea45b95302e1ea82e8e7c4e3a63036db873616574f1fb SHA512 a4c9de7325a74cc93e11de66f54b8d4c5ed1d845bcbf3fccb437aeed0190da6658b065ac93c7e5ee8167dcb8a0f658ce0bb274de940d2583a3a8f3947ff93f03
+EBUILD calendar-0.9.1-r1.ebuild 636 BLAKE2B daa79ee020fb60a151bd609abdc63c98b6babe9b8683e3ccfee26c95f41b5cd51c97935b8a6fcdd6e80e868ce7281fc7c491ba80c16b706323ff0a1edc4974cf SHA512 07c45d10f1765746ee30b103cb7f55841c3a1077b1783c683376f9d51d3d6d27374d509105c0e521409145b986d8ba047261b34c2943202c56698be0471fbb92
 EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 2b4f7f69342c..2d8dc85b28d2 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-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
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 28b4eed694aa..27514c0c2370 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1,6 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
+DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
 EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
+EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
 MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
diff --git a/app-misc/ckb/ckb-0.2.9.ebuild b/app-misc/ckb/ckb-0.2.9.ebuild
new file mode 100644
index 000000000000..0516a27502af
--- /dev/null
+++ b/app-misc/ckb/ckb-0.2.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
+	sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin bin/ckb bin/ckb-daemon
+	dodir /usr/bin/ckb-animations
+	exeinto /usr/libexec/ckb-animations
+	doexe bin/ckb-animations/*
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	domenu usr/ckb.desktop
+	doicon usr/ckb.png
+	systemd_dounit service/systemd/ckb-daemon.service
+}
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 1041843acc8a..bf6364f92fb8 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,4 +1,4 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
 EBUILD dailystrips-1.0.28-r2.ebuild 810 BLAKE2B de7b86da861863a1df925985b36033df94d32ba4e919ceb78ec1567ec5ac59bc7ff797f2ab954fee4259df87e6c3e33e2fffd1c3e840fc49f40ba86ffbb1dd08 SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618
-EBUILD dailystrips-1.0.28-r3.ebuild 752 BLAKE2B e13318def4854db0257d7c990e95852f1b0dfb6fae78d14ff2e59358f4a50b63280fb4f5593c2c01e99339aaea2b94881836347eeb7598a98df4fa581229011c SHA512 52fd790664043171c0627e84a3a285336d29a20673677b398181f39db9786859cfb0626044fba3b4cfbe289db3cf5f4e2d404f832511b47ccd13eea8657edf66
+EBUILD dailystrips-1.0.28-r3.ebuild 751 BLAKE2B b0cc15ba88a99c460fa7fcadc320ff60e49aa849a5d902fd6d39e3ed769764e9e94f49ef49edb62bea3abb4dc3008231111ad7f4aff7527b50c27ed2fcc681e2 SHA512 9b00871a38a99a2fb9e6c0845a0fdee6515a056320bb208f57cfb92e1346d169ebe0442a01ad8b7fe24b8f1d84c5e25f771a9ee8f8d1247f8d011cb50b61ca71
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index 1926018367f7..2f22affa9df9 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.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://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 07fe7a71da67..6d0e2ed0f39b 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 919 BLAKE2B 45b8f98bfb02799a4c72204094e5edfec472411a4281c0ce28bd585117b180369a0185a1e6a20aa8285ac6ffb6c1f2f28995ba37e1b46572c30ac5ad9835a684 SHA512 d95464cd756f8d72211bbce18f7a70fe955c339910acba2b07064403ce579c1a3978451c47d97f7e014fbf85249ee89dba8e21f5ebbdd02c0791cf26dbe1949b
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8ef121d05af783c710cca42c3bb0557eca47e3efe36beb4a091b55120fa660d713873c8c6167e02911c22c0bdbf9620ac265733f3e96b244f24be4576cf41146 SHA512 fac8d739132bb197411e82a324e566b5c64ea6604e84f23d74a2604ec4d4691ae1a6c95a43a23a8ed9692d5ac2071dbfbd96beef04c48eb747cdb991af329a37
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 4af5a2785623..a4cae3011502 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.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
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 548f7552e314..4aaae2a4ec92 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,5 +1,5 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
-EBUILD khard-0.11.4.ebuild 1046 BLAKE2B e4e57caf5ed87cf291f06b264a9479697fb6f875fb5345d7f294f6d41f095332da2ff77a46a4d811befdd30eb1847d306eec2a62c4119398c434ff8f09c0cf5f SHA512 280bee426b66aff557f7db2553ec6c39a4d9a31fea287ed1e80ec7ca2aaaec334f22fd54a06c080740c6fcc61753ae2115ea6d1bca079f18cb7c7b61b50f2923
+EBUILD khard-0.11.4.ebuild 1051 BLAKE2B 5891de1ed28450092504a2d09c34f89ed95e2210c569f315987bf010f19aae8cf733f68e6aff3fc4abca57a4479b3f2b92da005dfc3d117fa65590f86247c5d8 SHA512 048bd52341389756f0b18fc4b57b6e4b2a5a7d8596e9327b14a4fd946a7e6853e5590f981e6be7275998f97b64f25f07ca5fa702b047ac2eb869788c22ab413b
 EBUILD khard-0.12.2.ebuild 1091 BLAKE2B 1ca26abe6df8231997245f32b64b4a47366eec81e0acacb7867a41d3e3ce477c10dda779c076ca9fe067a7be0bfd83c23f829224de46e8ad59a51ac6fa83d611 SHA512 d17264b2be3b752c6c25cd132695d364dc8a1ea606a103a2c49de1c9410501933a3dd18bdc1e096df155276330aabde9259be6cd0fa0055731482ed6d0e798e2
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
index e80f2ffbfcc4..d903befe0862 100644
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/scheibler/khard"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index cc687ad12173..f3042f1df818 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -8,5 +8,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
-EBUILD linux-logo-5.11-r4.ebuild 2262 BLAKE2B 5bd9fb9e2f49e1a93dfd7abc82eb335a38997333d9b5405ada909d0779b0de7cacd68bfb05f737db0ea430e13eb449189e5a572b535074b3c05a1468c1590f53 SHA512 8d627e314dc3efd3493fe7b597e5f8cc155820164598040d247c5b0a2c5496576c00fc5af878d23c00f35db5c0cca2e74e31870bcd480c4d98ccd6aa857c7122
+EBUILD linux-logo-5.11-r4.ebuild 2261 BLAKE2B 07f78be5618e1413c8ff58c53f2a42e354800f57f3660f55ea9e89c1edbb1c97409ff3ee90a4422cefbcd08e53e1984d7960afbc53c62fb7bd79ac0a49e015e2 SHA512 88f18bd0d00f510183a9bb557f78f7eeb87debd09ec7e28e0e33f4e7262136fa6e06f63546c74126e6b60883b527b33d40546b198a52940dd7d9059f2cb1864a
 MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
index 41b2d773b41e..1a8a23105ab4 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index 30a22698aa97..8582385dcc28 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,6 +1,6 @@
 AUX gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 703 BLAKE2B b5c6abb91a1af69eb1ca9d7298ba7a0d3710e0ded9cd9ebe02590c60a9040d52619c20cc08f830626c9224979b4c6c3a7c73aba60ee471b2ecd1e2d4ce3734f8 SHA512 69ee20e09351548d5aed2b080a0455d6e642fdaf6f90aca61ff4c93c14fb504f535bba1cc22d5f67df141ec0c8330cbe36f3da7b8fa7bedbe49599392fab0608
+EBUILD mepl-0.45-r1.ebuild 702 BLAKE2B 21cec2768a0bce49121544a4ddba1a6f675ac30f1218e414a41b504809c63289d6f185782d3bb2a9b6c96e1ced2b10715f10b39d42383fae59e17a82952c23bd SHA512 6868bb0dec7d0841b680ae818dfccc50ba2a67ab606a17b143b800e771678f65829dd6f4eb3dfd021c65b0e1850034eec1bd068fa5e57de45bbcde7bc57bea22
 EBUILD mepl-0.45.ebuild 751 BLAKE2B dc57323a6975a3f7449239fa0b43002fc4513585ab34aeadd447e3c4214ff0bebc037d948373619ba54dad62cbc9920f6667bb2d92e7013bcc49727cf64d7b70 SHA512 4e05c749580e35532731f1aa48fca36efc95be8f49b13b6734c100a9bf347b9f2c92fda2863e2a14f120bf19177c4817f6753adc6d1da73616c7cf8044ff6c45
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r1.ebuild
index a2d1d730c8ec..fc4836b314e9 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 S="${WORKDIR}/${PN}${PV}"
 
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
index d8cd4cfe47fd..c87ea7d6fd73 100644
--- a/app-misc/pipeworks/Manifest
+++ b/app-misc/pipeworks/Manifest
@@ -1,4 +1,4 @@
 DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
-EBUILD pipeworks-0.4-r1.ebuild 646 BLAKE2B b47dbf81dd8edc54ee65f9f59ab5ed2c6cfa1b4a897a2f872ec4fb6afa8d346d2d6fc63cd12ccdaefb07eb6c7cb1ebf4d8f07080aba38ff4ec12543b5168464f SHA512 221f3fba526fbab303f98430ca66b2923e80fde676598a51c45609eec5a92551e5db4bddce622c3954fe66aafcfbfa75f7f8223c9963bf0078e6597c53fc7b72
+EBUILD pipeworks-0.4-r1.ebuild 645 BLAKE2B 850662572b09ec6cef727e56764203e08eef73091af724a73fabd06bbe261b4cbf77a6eb806523cac6900853a4381a35ac6dd82de8e6da13ddfb19c34c467df4 SHA512 da3d06fcd463b5e33a7f115fadbcf19d84983cc7dacb37a0d3c6c11c647ac9c8bda73e0898dbf77d38e0775d5fad06d1ea7ddd01531d357a834743668c16e092
 EBUILD pipeworks-0.4.ebuild 614 BLAKE2B 149f3927c70ba4092d804b6c8e407ad7d6c784f7bf2158a79090f4a497517976e6a7338ec5c323219dbe732a2d6af0c6dd791d0b6933e2eaf8a2ef12cf1dab45 SHA512 ab7c7a5630b261a4a6d1548c8b1e2b8e8f7f0d9eb327b99c0fc58e5fc922c1df70306de325d8bedcb110e71a39a7e396da66fc8344e9599bac231efcd5db65a7
 MISC metadata.xml 520 BLAKE2B 7c3c2102bcdad8698d9970f496002e43a7b93a88368555cf4e6762e0752e1dc56df82b66d4560dccebfa4b1bfb817d2c975019946e269cf074871f184078baa5 SHA512 f95bd764a974893a6ec46c0761a8b7a5edbb467c5b393a771163e42451efb34d75e25b73efb984d960b0aa46f19c233a5fd2df1f90aafebf4365d425d63c7243
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
index 2d278167ebec..3f6c50acf2f2 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pipeworks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest
index 1f16def6a65d..252dba4f40ab 100644
--- a/app-misc/timestamp/Manifest
+++ b/app-misc/timestamp/Manifest
@@ -1,4 +1,4 @@
 DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
-EBUILD timestamp-1.1-r1.ebuild 487 BLAKE2B 758e1fb1e7733d1e55f71305aa850eb8a6ea9c1eedea5bd61884bb1dbc3bb33c56c637fe619c4254e3385da47d43915c0c30f463deeec37699b3550d4308e3b3 SHA512 1775fce859aa67d2ced6ea37e2ba60a93f2978d3471822aa1e23eb5b829e9fd4c8e8630d55e77a8908dbb3d806414c3c8502c4b630731949b323fc99310c4b80
+EBUILD timestamp-1.1-r1.ebuild 486 BLAKE2B f3b5455504dedecb03d7f8d6b0b337ae6bd378c1126426f278eeb1b2ea5915f980ee625b643a8304f61b84c0eea41ebe407a4faf8eda8301103366355ca2d302 SHA512 80579fc844d468efbed574e7d3fac14f2e4f497e1a73ba7fb4da413ce2d5ab575c1988ebdf58a64d934d01114a37e38fc76c9a64bb3df4e220d7e2d4de3372fa
 EBUILD timestamp-1.1.ebuild 503 BLAKE2B 15251f7614236e3a4ee0640ad84fc9eb62d621d169d423c4ae6121702b3015c9cefb6b358ea318c8004f273a68c8d5e7db6fcdc7da66b36061c3c7fd7d37740c SHA512 7bd92b0ecf3a40cc7e149ba237b05f6afaaca5a52e4f933e5483a2470a2e0c2b937ddd15069660592f183da0e5d4318ff544b2b70817c2f26408c29cd8883dea
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/timestamp/timestamp-1.1-r1.ebuild b/app-misc/timestamp/timestamp-1.1-r1.ebuild
index ee19c78f56a1..82d8717a12fe 100644
--- a/app-misc/timestamp/timestamp-1.1-r1.ebuild
+++ b/app-misc/timestamp/timestamp-1.1-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
@@ -9,7 +9,7 @@ SRC_URI="http://math.smsu.edu/~erik/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="!sys-apps/moreutils"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 1c811dfdd26a..27df45df720c 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -15,6 +15,6 @@ EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd5
 EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
 EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
 EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
-EBUILD tmux-2.6.ebuild 2145 BLAKE2B bd4b10f4f4d56043d3aac25e312ac2e51978526b3854853a27c35c81d48908c948abeeb2d85bac018963a1969595ff581d1ee9ed4fc784922d2f6273e9d45222 SHA512 8e9d295be0447556596e157135c58a02463a3763b8f8814775b930830c2f81fdb495527507f9e4a4ba408aaa14689121ea58338f88870dc94bfa3a7e614b7a69
+EBUILD tmux-2.6.ebuild 2144 BLAKE2B 3a59af25ae6fe4f50546180489cda3b1cdf97fac0685e176487556ccea7551c5d1e68e3d3f1ea1a0eb26900a54cdd161e5eee0a26d58a6da13c9671e02b04860 SHA512 c31938eeb6ff25b52737e99da1aa041e25908345063668d2bde4b94e84c7da36449c826392394de3868118995281d97e129caa692ddb64bab94b78faf0f3ba1d
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
index 78905b54e38c..dabbb790530a 100644
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 21af2e11e584..aa7e605947e4 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -2,11 +2,9 @@ AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc9
 AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
 AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
 AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
-DIST xmind-8-update2-linux.zip 120800791 BLAKE2B 2128d3d6a2c120b226b02128aede12aad062e72e4e322f910100663a37be9ae9a722270c36318a21897aa6489d9bfad118145e0852463e31b17bc1d377c12725 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58
-DIST xmind-8-update6-linux.zip 120903858 BLAKE2B 8dd45f06a0a1486fe65b99668dcba7f17d4763caa2ec2542c60040f0e3701b76946810b7fa242726a8a3c6d3c46b4b7d9a0a67666d4c2814509215395170ce80 SHA512 0e4871a385c8449da000ee3bcf1a44fe63075af4f592f43a01635e017ab253a996739c63f9c71f098529adf62b5df4018440c7db1c44040488c0e3186abe6248
+DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2215 BLAKE2B e7cfad25893f5c2a9433b0600fa5f96fa1012a4a315c53d3b3f008b42b82dc56711d35bc546501117a4146e9f86f0a501c1e653df6e5b4bda140c1c9d424d241 SHA512 af0c431cca019f4b5b1228daf2931e1bed1d8d01711aa1a19aa3b73d75176f08e10d6353c8a0460f33dff0b13dcd9d4f3b7cd8d32fa89611663ead849674d7a0
-EBUILD xmind-3.7.2.ebuild 2186 BLAKE2B a815fab4ea635fa0b2f2fc22ca6878dd55f9316bbfe23b0b87afa197c5096aa627a7816c99e4d6da0acf2e7f75f84b15a96b4b49e516290cd994ec168f1ef621 SHA512 d5960a6dbedff1000859ced4aee8e43f86bd5fe63ea61e046c78a31c1634e1e653523f2f446e9429fb5d228623e81fad90279c18d29e1111a9b667543e2c9f1a
-EBUILD xmind-3.7.6.ebuild 2186 BLAKE2B 8d28428f983b211f5b7624d8825a9df417c59402a7ecbe77e158dc503abc207f0538179c714bfcffac7765619d98fa8c9635284d3c662694d45f8a3de807e43a SHA512 e90cabd43dbf81d828d79475cda33f7d6dae3edf295d2407355fefdb4a39ad59e0fe95e647559d1f141a4480f49186e95e03a0cf9920ffc76a9ea6872a640bdf
+EBUILD xmind-3.7.6_p201801311814.ebuild 2170 BLAKE2B e45c6fa4d2f074d63b18af8a106ec92038598e75d40e5ba95a45994d64af3cd914b4fa120d05f1ebfc342fc13b0ae53161c279ebe624601988c6555e77b5e305 SHA512 117453801d73331af8f76040e8bc293ac392adf17e75624cd6b5d66301ace686980df8a8d2b37518a3376a1daa08b9c3552486eaf016458c7e800ea63121ade9
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.7.2.ebuild b/app-misc/xmind/xmind-3.7.2.ebuild
deleted file mode 100644
index e8a9a4ed312c..000000000000
--- a/app-misc/xmind/xmind-3.7.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib gnome2-utils font
-
-MY_PV="8-update2"
-MY_P="${PN}-${MY_PV}-linux"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/XMind/XMind
-"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}/fonts"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_amd64"
-	else
-		XDIR="XMind_i388"
-	fi
-	mv "$XDIR" XMind || die
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/plugins/\/opt\/xmind\/plugins/g' \
-		-e '/-vmargs/i-showsplash' \
-		-e '/vmargs/iorg.xmind.cathy' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r plugins configuration features XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.7.0" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-	font_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	font_pkg_postinst
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.7.6.ebuild b/app-misc/xmind/xmind-3.7.6.ebuild
deleted file mode 100644
index f1ab65c41091..000000000000
--- a/app-misc/xmind/xmind-3.7.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib gnome2-utils font
-
-MY_PV="8-update6"
-MY_P="${PN}-${MY_PV}-linux"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/XMind/XMind
-"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}/fonts"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_amd64"
-	else
-		XDIR="XMind_i388"
-	fi
-	mv "$XDIR" XMind || die
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/plugins/\/opt\/xmind\/plugins/g' \
-		-e '/-vmargs/i-showsplash' \
-		-e '/vmargs/iorg.xmind.cathy' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r plugins configuration features XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.7.0" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-	font_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	font_pkg_postinst
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
new file mode 100644
index 000000000000..21d20c8af343
--- /dev/null
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils font
+
+MY_PV="8-update7"
+MY_P="${PN}-${MY_PV}-linux"
+
+DESCRIPTION="A brainstorming and mind mapping software tool"
+HOMEPAGE="http://www.xmind.net"
+SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
+	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.8
+	x11-libs/gtk+:2
+"
+
+S=${WORKDIR}
+
+QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
+QA_FLAGS_IGNORED="
+	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
+	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444/eclipse_1617.so
+	opt/xmind/XMind/XMind
+"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}/fonts"
+
+src_configure() {
+	if use amd64; then
+		XDIR="XMind_amd64"
+	else
+		XDIR="XMind_i388"
+	fi
+	mv "$XDIR" XMind || die
+	# force data instance & config area to be at home/.xmind directory
+	sed \
+		-e '/-configuration/d' \
+		-e '/\.\/configuration/d' \
+		-e '/-data/d' \
+		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
+		-e 's/\.\.\/plugins/\/opt\/xmind\/plugins/g' \
+		-e '/-vmargs/i-showsplash' \
+		-e '/vmargs/iorg.xmind.cathy' \
+		-i XMind/XMind.ini || die
+	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
+	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /opt/xmind
+	doins -r plugins configuration features XMind
+	fperms a+rx  "/opt/xmind/XMind/XMind"
+
+	exeinto /opt/bin
+	newexe "${FILESDIR}/xmind-wrapper-3.7.0" xmind
+
+	# install icons
+	local res
+	for res in 16 32 48; do
+		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
+	done
+
+	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
+	font_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	font_pkg_postinst
+	elog "For audio notes support, install media-sound/lame"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 26be3a09d06e..64aea326ff4d 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/past/Manifest b/app-mobilephone/past/Manifest
deleted file mode 100644
index a0bfeb62fe02..000000000000
--- a/app-mobilephone/past/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX past-0.0.4-gcc-4.7.patch 144 BLAKE2B 5a7ec19759bc85569f511a9e4eff64b3ba799ec4dcdda28fc78134669314cb8193894a15d0268ee2e7cc4e4515da558a131d174187f586c2f3a8e701ffe0db57 SHA512 c677fd97119f0fc8f43b89232ffd266653c4b2a6857ce311e949b4c5584a2521e8e730fa5ea34224b34f4e92a6fef58dd98a3dbf3c634a8d99fa138c40332414
-DIST 74036-past-0.0.4.tar.bz2 166745 BLAKE2B ce0e85632e7d3ae9e8c547321448d6d5fd9d50e6e2473652d9979e3b2dd338ed1e46a549f276919ec50c4f44a51df1ee65fd487c956a2b254c44986574b75188 SHA512 5ebce95f501e057cbfceb4019041e1dd844a464e656396c107ac9750e280dd544d0175d43bad53c94e10b587229cc5cc16e9d6f57401cdba6c539557daf3b0b0
-EBUILD past-0.0.4.ebuild 584 BLAKE2B 65cdbf4f1edc503d49004763f3fe1d1ad224cf2b7bb89f28d11c06fea770defa05d952bfc20326bee64feca340a759a523588a2ad58f9e1855896a37e250279d SHA512 4df5e9f91408d5fc05e69618d918f2cbaab00ce778c03aad7049e67d637ce6585a5c77b9a26f137dde2d3b52a12dd1dbef0c7816bc394e277514c7e8f34562a6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/past/files/past-0.0.4-gcc-4.7.patch b/app-mobilephone/past/files/past-0.0.4-gcc-4.7.patch
deleted file mode 100644
index e04de42b7ef8..000000000000
--- a/app-mobilephone/past/files/past-0.0.4-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- A/src/device.cpp
-+++ B/src/device.cpp
-@@ -22,6 +22,7 @@
- 
- extern "C" {
- #include <gnokii.h>
-+#include <unistd.h>
- }
- 
- #include "device.h"
diff --git a/app-mobilephone/past/metadata.xml b/app-mobilephone/past/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-mobilephone/past/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-mobilephone/past/past-0.0.4.ebuild b/app-mobilephone/past/past-0.0.4.ebuild
deleted file mode 100644
index 13223531e4d0..000000000000
--- a/app-mobilephone/past/past-0.0.4.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 cmake-utils
-
-DESCRIPTION="Simple SMS tool"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/past+-+SMS+Tool?content=74036"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1466626318/74036-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	app-mobilephone/gnokii[sms]
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog TODO )
-PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1577f317e9cc..cf94cfda9e79 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 56a30e926a06..7d89fbc6d30e 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,5 +4,5 @@ DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d268523
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
 EBUILD calligra-3.0.1.ebuild 6816 BLAKE2B 5378a9dba936cd143bd07c97ead77d42dd437133d9e99d46de7629751c2f869cbc5d93b658f965ddac3452e22cd83ee81fece8d2badb101eaeabb15a9d43ee8d SHA512 20746aca48106f77de5bb29431f99907922317a5435f5292a86dea0372243bf846bfb05d5cdf8f9017e2e0c7a1259a40336dd654b4d8706eefbebbee3a67f516
-EBUILD calligra-3.1.0.ebuild 6637 BLAKE2B 8da8854afc98d70b65fc821d524b6dbd0e73d84f51359c5e9ee26f32f5726ff2da3c16809ff5ece4c3b08566735c5a52b491a94a86072c6a304277aa8efea83b SHA512 8dc8266b4d22419c365888847dc0f2ba7dacdf534f0884dc5afff106a8847b43079080b7a09df50772eca00c345b2f2c0e9ef7941bef338f6a6a9401951a6780
+EBUILD calligra-3.1.0-r1.ebuild 6640 BLAKE2B c1513d043f6c53f3749b17c30b39b651cecadcf2a76b91ecea76ddbec181993ca2ef6dcc03e6e7d945ddaab5dd8debbb0dee2663aad3ee4f6df8aaf6b8e94265 SHA512 ea7102c35352a641a6c263f09d58035f257f38e8c9be8d1ed1b3c7e47c7acf284059daf116948abac3eb85d6dd75365990de198069c838357789e06142e6704f
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..7a42c16449ac
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_APPS_MINIMAL="17.12.0"
+KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po plan/po"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5 versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+		calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
+
+LICENSE="GPL-2"
+
+[[ ${KDE_BUILD_TYPE} == release ]] && \
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon plan sheets words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
+	calligra_experimental_features_stage"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+# FIXME: Disabled by upstream for good reason
+# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled in plan
+# =dev-libs/kproperty-3.0*:5
+# =dev-libs/kreport-3.0*:5
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(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 knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-lang/perl
+	sys-libs/zlib
+	virtual/libiconv
+	activities? ( $(add_frameworks_dep kactivities) )
+	crypt? ( app-crypt/qca:2[qt5] )
+	fontconfig? ( media-libs/fontconfig )
+	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
+	gsl? ( sci-libs/gsl )
+	import-filter? (
+		$(add_frameworks_dep khtml)
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	lcms? (
+		media-libs/ilmbase:=
+		media-libs/lcms:2
+	)
+	openexr? ( media-libs/openexr )
+	pdf? ( app-text/poppler:=[qt5] )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+	calligra_experimental_features_stage? (
+		$(add_qt_dep qtwebkit)
+		okular? ( $(add_kdeapps_dep okular) )
+	)
+	calligra_features_plan? (
+		$(add_frameworks_dep khtml)
+		$(add_frameworks_dep kholidays)
+		dev-libs/kdiagram:5
+		pim? (
+			$(add_kdeapps_dep kcalcore)
+			$(add_kdeapps_dep kcontacts)
+		)
+	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_words? (
+		dev-libs/libxslt
+		okular? ( $(add_kdeapps_dep okular) )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+	test? ( $(add_frameworks_dep threadweaver) )
+"
+RDEPEND="${COMMON_DEPEND}
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	!app-office/calligra:4
+	!app-office/calligra-l10n:4
+"
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch )
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde5_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
+		mv ../${PN}plan-${PV} plan || die
+		sed -e "/add_subdirectory(plan)/s/#//" \
+			-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
+			-i CMakeLists.txt || die
+	fi
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+			-i libs/pigment/CMakeLists.txt || die
+	fi
+
+	# Unconditionally disable deprecated deps (required by QtQuick1)
+	punt_bogus_dep Qt5 Declarative
+	punt_bogus_dep Qt5 OpenGL
+
+	if ! use calligra_experimental_features_stage; then
+		punt_bogus_dep Qt5 WebKitWidgets
+		punt_bogus_dep Qt5 WebKit
+	fi
+
+	# Hack around the excessive use of CMake macros
+	if use okular && ! use calligra_features_words; then
+		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+	fi
+
+	if use okular && ! use calligra_experimental_features_stage; then
+		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+	fi
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use calligra_experimental_features_stage && myproducts+=( STAGE )
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake-utils_use_find_package activities KF5Activities)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		$(cmake-utils_use_find_package gemini Libgit2)
+		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
+		-DWITH_GSL=$(usex gsl)
+		-DWITH_LibEtonyek=$(usex import-filter)
+		-DWITH_LibOdfGen=$(usex import-filter)
+		-DWITH_LibRevenge=$(usex import-filter)
+		-DWITH_LibVisio=$(usex import-filter)
+		-DWITH_LibWpd=$(usex import-filter)
+		-DWITH_LibWpg=$(usex import-filter)
+		-DWITH_LibWps=$(usex import-filter)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		$(cmake-utils_use_find_package pim KF5Contacts)
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular5=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild
deleted file mode 100644
index e74f8c930b4d..000000000000
--- a/app-office/calligra/calligra-3.1.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-KDE_HANDBOOK="forceoptional"
-KDE_PO_DIRS="po plan/po"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled in plan
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(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 knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		$(add_frameworks_dep khtml)
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_kdeapps_dep kholidays)
-		dev-libs/kdiagram:5
-		pim? (
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	test? ( $(add_frameworks_dep threadweaver) )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch )
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
-		mv ../${PN}plan-${PV} plan || die
-		sed -e "/add_subdirectory(plan)/s/#//" \
-			-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-			-i CMakeLists.txt || die
-	fi
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-			-i libs/pigment/CMakeLists.txt || die
-	fi
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	punt_bogus_dep Qt5 Declarative
-	punt_bogus_dep Qt5 OpenGL
-
-	if ! use calligra_experimental_features_stage; then
-		punt_bogus_dep Qt5 WebKitWidgets
-		punt_bogus_dep Qt5 WebKit
-	fi
-
-	# Hack around the excessive use of CMake macros
-	if use okular && ! use calligra_features_words; then
-		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_experimental_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use calligra_experimental_features_stage && myproducts+=( STAGE )
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake-utils_use_find_package gemini Libgit2)
-		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	kde5_src_configure
-}
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 2e16ce0e3628..d638b9ecadaf 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,5 @@
 AUX 50ledger-gentoo-3.1.1.el 166 BLAKE2B f833556da775338829a7dbb288b89f267cbc9723b82fe21a502e96253a132043a12b3737c208f025635cfa8edf8e3d406bc236ad8debf708a66fca3edb162446 SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5
 AUX ledger-3.1.1-boost.patch 774 BLAKE2B e201dbf7d7af357081112518cf6b615162802307fd708d58df59ad79f12aaf19c3f2ff4645e025145e6afe6078b48f6df27d4128cd71e12e7605c976a4650aa0 SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8
 DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
-EBUILD ledger-3.1.1.ebuild 3202 BLAKE2B c8392eccb2659bcb6cc061863dca6acd67f9fa76d195016ee0454c1a730e7fbe90a9a8372d3aca4f87af1ea648cc0d2713dc64f14140916666823e7ea82713e9 SHA512 86954ff4ffac4f5105e13f4a362e8a5f46dccedf236e0a465dce878996308e12a7302931c87bf08f7bbedfdd5b577fe486c363c5dd80ee28afebc6f7b8e78082
+EBUILD ledger-3.1.1.ebuild 3207 BLAKE2B 7a6764868596f6ba5d807a06abb17123a86ecca02e977d5c5f983b41176f6f5a48947acb0e2084459f44615cb52efe5b0669f1304e7bdc7ec7e86a335fd2efb1 SHA512 d8543a0877eb080b97c01eb5306ad2967dab2cf5d522875cc03d07d4b6f899aaa01cb0333e5e0aaba8341939e09207a4f19acfa62c1ea0c1c67d6afd9b413fde
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
index 31ed49d068b1..f04a61c0cd2b 100644
--- a/app-office/ledger/ledger-3.1.1.ebuild
+++ b/app-office/ledger/ledger-3.1.1.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=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit check-reqs cmake-utils elisp-common python-single-r1
 
 DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="http://ledger-cli.org/"
+HOMEPAGE="https://www.ledger-cli.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index af490ad9ef1d..edf34f7d0787 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,40 +1,27 @@
-DIST amd64-debug-libreoffice-5.4.2.2-r1.tar.xz 1156508068 BLAKE2B c7b399d7e70ff5e757bb5c80fef2c044a6ffb807c816ee489c9d9b39b82290ae4d0bb774079ec5b0d1bc13b0f891a295b7f6ab99798c2c064702580a34dd2168 SHA512 4125fcd01be4dc4587095f4c7da641dd0dd2195399a3965928d7447fa6ec7743bb355c6fab767b652c04da2d682dc285d8722e0ad4b16860b02390370f1697eb
-DIST amd64-debug-libreoffice-5.4.2.2.tar.xz 1138708128 BLAKE2B b2daf5b0afad8be984dba09955ccd5ec5ee28762bc4295a921ff39d152ae9b3e73f5f15fb832cf5cec5f915cc705862f4cac2d3ca4ae239e457c991fcbaec06a SHA512 60d1d6560e44471572cf024db1ca5b00c6b3ece2a0c02c09dc523bca101351c24bcd57db25d8a5616496b2d74656c4b8f5e9c8d7d084be53143c5b050e8315d7
 DIST amd64-debug-libreoffice-5.4.4.2.tar.xz 1157249908 BLAKE2B f3f54787550e151b23d9d40d5fa17d37dde0343570bda58c271be6eb5b59722cee784c799a675d6e4bbaf253d2e93534d0509908dbdb899e76f1d45d7660f2bf SHA512 9df6da88372d326694737c67d5f6333b36aed6661e4e1dbd079aa102cb910d23e152c541a456f05852be3aea6994f5ee7a555ce3444b81d9b8bb8e91f9ed65ce
-DIST amd64-debug-libreoffice-gnome-5.4.2.2-r1.xd3 331470039 BLAKE2B 540b21340e8bc95ac1fda1d886566860bd8f69eadf8922354b5e298a1612f4385ee761d16ebd1d2f369a6b286cec40e3cd09ae5f0c5f95137c0a330d3daa95fc SHA512 33048353072959c22d22108aeaf7a9be42139187a89493152f3a3b987f6caed6fc61647d090ccf1241da2afcacb80f2e6dbba3f503960a0f22886a49f4a0d46a
-DIST amd64-debug-libreoffice-gnome-5.4.2.2.xd3 320539580 BLAKE2B 985493066127f8a2c3bac5ac4fad083dd6de16b0504eab928fe61e2fcbf8e913d8cf40488ed70fb40585ec4cf14b068392a2f5a7af1bb62a2288ad926fc9e2e0 SHA512 bdae4832e9ea5c0191ebd1d3e46cef75543088ba0591f25ad70ab5b32b86846b72857b61ea44ad52453b42f2a9c9277a967b6fdd8abd3c33517ca1ef422b5af8
+DIST amd64-debug-libreoffice-5.4.5.1.tar.xz 1157575908 BLAKE2B 8e1d646aa90c6739afe00da67fcaa93431c2504c190e8537393cac5a77033672a3df45f2b261e8dd262cbcb0e0cea0992994e8bd53f5cebcc5b55d0044115553 SHA512 dac4a9bc7e0c2c11f2d4d45dbb4bc6b91ad32ab226a26cebb81b070b2d672fa03c0b5bc9aee08447d55b285b915a118e6d0fc27c9cba27d9d93ea233c12915bd
 DIST amd64-debug-libreoffice-gnome-5.4.4.2.xd3 331643342 BLAKE2B b61c70427b1a279275829542b135891204f258cf526b2b0f8d892e1f1a9b37477bd859099638385cd7bd342671a476b3f0bbacaa02b2622cb9bb080f6fe1deea SHA512 592287ef7358385568eb80d3420d84de2f8322f0c76bc187fd0147a8007ca2bab879caa04cca3f7aff9601de3b5d9b3210e262c6c6aaf9d7197ed61d1988ce97
-DIST amd64-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 560720309 BLAKE2B 2e9a40728b82427aad554c8f2d718adb76039ea42b317eac811a70dbe1e5295d932da9cd7652244254bce724fcb07ba0f34e39a05fec6c894bf3a6c3ab85bd9e SHA512 f72e0b405720091d039b7cc9268408a1e4894fed8a686caf59074700ac177638d62b38790890df5b73e58d53e287ad268c2054ef9777def417edfb5c68cd7c79
-DIST amd64-debug-libreoffice-gnome-java-5.4.2.2.xd3 550445993 BLAKE2B 29923d61be3412e51a12aff824f0f46836dda99864b4cf152d58e30153e7cc7261eea041b064a0010b664b19e174dcd586b09489d630f7dfef04ef864afb652c SHA512 85e95fd1fa0519ba60a39185245c15ca1cd6ffce084df65016585645a5b98c1d13ebc6df96ef8583697b6388d086e20a48845c879a83cadc5124c8b5b145e041
+DIST amd64-debug-libreoffice-gnome-5.4.5.1.xd3 331679185 BLAKE2B aa8e055aa7be3cbca196934e4f2d7ddceb3cccf92a1d3f1bb4bfc8b8e73274abd7b36dfa515e3f11052e131fa31af500761d88e28839c697ca2951e62015b2a3 SHA512 c3d9f4b5732a870090c598fc3d697a7c508b418574899fe36aadc4e691155887b9366ca46dedc30ea4d59bbf7643d839bdcf949abe3fbd683d4e161a20b6ae8c
 DIST amd64-debug-libreoffice-gnome-java-5.4.4.2.xd3 563946969 BLAKE2B ab9d4bd1367ddc03a4a2857235b366deff616f28424efe253877cb0eb66c12b2d43b2e8fb7b9dcbcfe3f348b239728ad0f990ed03db419fdc9bb46d38e2493b7 SHA512 080f4f86358f5180781460f1eee501bc34654ca2ef5a0445d24c3d1e72edef5275ba0e21da6aa3838b51438c39701963f6e151e6c8aed4325967bd0cba26385e
-DIST amd64-debug-libreoffice-java-5.4.2.2-r1.xd3 552785398 BLAKE2B 417ced59083618c0f2b8ef92c5d70677c43f94a2fd5637400d2d89318ab4cda033f8b852e421c70061ad76527346651021dae68097020cedd157aa2b762dbd67 SHA512 84701111da26928577ef5c03c54016c2c239e219681bdf95160a462889a15be54aed4d2075dd96700b70bb86008cd3c09f31bddf406fe93918e986b6fc09dd6f
-DIST amd64-debug-libreoffice-java-5.4.2.2.xd3 543230548 BLAKE2B 32e16d1e8d1847dff3152fea0723dfe95b429340a4155491c6ac8a805a0ac403a75db97afa86add13050f00a30c80122f6fcd9117667a8fd532fa51f227fc85e SHA512 a0a6f92102c7e9a81b4653fbb260e012d27eae821b9b1148f4022d752bc55aa740c12d27309889b171407bc16311b0982ae3320ad81766616735491e3b850cdc
+DIST amd64-debug-libreoffice-gnome-java-5.4.5.1.xd3 563805504 BLAKE2B 8b4cdf10ef011c4657cec26a78d8ed79c1c8de36a67a62a0fd0daa3d7f9d739bd38d611cf1f79aa7a25c189ec2fb1fa22f292bb79769686dc73be11373b7135a SHA512 52c618371722136bce7440ed20b7d3a01c66a215d13c037a8bb2eb8691f51d38ff37310b063598f8e5750235304de018de9acb77f93912d44f9e22877ed27670
 DIST amd64-debug-libreoffice-java-5.4.4.2.xd3 555918957 BLAKE2B 7bccebd636c89f14eafa942b09591f36e45339690bf64266feb8aa13f243547a1f4cb64287c9a896ac44ab42db8ab6549d149f34932bd727cef06236c335dd7a SHA512 048aeac43dc6751faafd9541323fc219dab5aae34781a292113e75e6ded96b20a002ecd03f10f8b7df0d538e4cba9dcbf659f42b45d14940dfe89054ec5a1fde
-DIST amd64-debug-libreoffice-kde-5.4.2.2-r1.xd3 338146804 BLAKE2B 5e5636792fdff2c4f42b5004937a88f7adfc3832f11243a6534eab2e679f7ecbd43619825dbde25dcef6338554c1c46575a4a5aa1bbfb9bbc838c53adf047995 SHA512 cc16b11664e2e86f7f2915ef767f4116a98445b9aedbc7ad440c4ef7b88d42f8dcec957f0f92c24ab8c0d78c73301b244f9aa4ba06b595186d90e4e084ed06f3
-DIST amd64-debug-libreoffice-kde-5.4.2.2.xd3 327453528 BLAKE2B 78ee5cbf9d411b5c355f8e86322a156624f0541994d966790ef81c4ed4ee9a3bf0f1ca937daa1eb076e3e30784b5fa329f95bd8c4d90a39377dd75e0a619149d SHA512 fd25a18f0200b37081d4cf40cfe5127f60e090776ae42d2b7a62f79ec66aaa79cf8ea26cd1b7fdb14b082cd242e34b415a4dd6d2b535e8fd5615b65ac9093129
+DIST amd64-debug-libreoffice-java-5.4.5.1.xd3 555709754 BLAKE2B 13131e8c9e61663b6b595af308d307806ab3ded347796d669d397782b3795dae4bb477ca214007cd7470c7476b7ff0fb8e4b0b90a2581ff09bfe273f1ac81eb2 SHA512 809c7787b36a5354295d60a311ae3e5f48f078f7e0a596aa48ab099796d59f3aa30d40441cf834480665717dd72b98e28205e3cc985611901d8ba85d99c4a318
 DIST amd64-debug-libreoffice-kde-5.4.4.2.xd3 338710001 BLAKE2B cc11889039cdddceb109b6274c19a5311ca1900466e4e4bcfe9c67280eaca63f6c6a09dd3dfdb824d3571c2cc23a967d0242cc3e93f5803c80fee5abfb6ab523 SHA512 66868097eb0c9dfcd727903066838e56ab16d163268300efab51d77ec70912bbc8973d926b7d0282e311cb01f21e576536e004ac1c555c4d6b151045d5699ac5
-DIST amd64-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 554592932 BLAKE2B d095455bc430cdc7ebc79af7569a2160005bac5c86aaadb65f1898f02721155306ac33597abb3816fc3a2f70fbc952d330503b5d3bff8ca8e84634ee70d341b9 SHA512 2698392c7644ca06033767b1eb01e4cf74ffd16b093369bb7b3e19d75f0b58e21629db7f626fb675bad6ba3cff61d1f6cd2f5df21f19d3b9a540cd3f0c928411
-DIST amd64-debug-libreoffice-kde-java-5.4.2.2.xd3 544806690 BLAKE2B 493462e6cd2e50343a08563cf726a55e8a64216da1aade02875d597a92266471e3d41f9b80408903d4047a88f27fc897a31b9ffdfb101b62a3db9258820f7354 SHA512 dd3867e585ff6f91d5aa8edc878fd6f9f6f3d4e780faa836c9986ef8fb359cf7fdf2cc24ff6124277d7af4e1ed73ad86fbee3b3ce6c1d8114b48be4219db8a02
+DIST amd64-debug-libreoffice-kde-5.4.5.1.xd3 337957489 BLAKE2B d7599148be2770423226666c10511ce721bc59ed29ba54dacc696b6b00768baa6f4f2ebaebad227457db22454e0adc1ea59aab4a63c592b10b87ac773af02b2a SHA512 06a2afb7d014fd6ddbfc935267e59c82a9295c37bd30d17d210627b0678bd6050810c54e675e41627f5f9fe4814c14768c7cc25436388bcbafe5839868fe4964
 DIST amd64-debug-libreoffice-kde-java-5.4.4.2.xd3 557723085 BLAKE2B 014a3ec204e5253b15cd6375f73a4907951444f076c8acf5f7fbcdb8dc85fcf617cc659e25cf61343bb4826a9c0d47b3187e96d0f79c5afafdf6e5243033d994 SHA512 0a5b44a3579e315e58a44b32299cd67d06ebef5c2dabc70ddf6403b1502de15d228f0496980cf9b4decbde3213600b0686ef016d93877c22d7ddcfad9b51090f
-DIST x86-debug-libreoffice-5.4.2.2-r1.tar.xz 1128856012 BLAKE2B 75b72abadb56bf02456cf60b39d89c811dbcd275547cfa53e961d42bc8eb124fadaea666b7dce9b9ebc5c4758a83e81532f164c59317d98d2cda3a39416af233 SHA512 feccb169682c979820f402c0ecb0d5be1455c01a56f350e7cc0e335ebe809215c6f4a7201ef12270b882e2dbec206da8bdf85dceeb589de7748a790844354c97
-DIST x86-debug-libreoffice-5.4.2.2.tar.xz 1107530632 BLAKE2B 3bd31738d031755c05fc1c2c8edb33d845d3a64b578c812f2fc473e6a6981851bf30b450a0cfe8a63e24f35cc1a3853b4fcd9d045cc3f6ac4403f6f61807ebee SHA512 78aad2e4bd7ff3e6b561008c65f538aa2d7941eb0290b374e82cb96e7d327ee8d7f80a298805bd38fd94884b66e14295a93b4319bb45a7e0fc860d1287f7c241
+DIST amd64-debug-libreoffice-kde-java-5.4.5.1.xd3 557521078 BLAKE2B 343b9dc888cc1582e2ac14532f5de2e2b728be3919204296696e208774da82f3e90a2f447bc5c3d703383c57e6155486fd0b7f5900185969141c69877dfafb16 SHA512 519a0977a003c2e1b47832a0a1ebc2de197522b4193a1890330f9f040d23a93b285a1b4e8efbe4de357a40537b68592c8f40cb72dec3d80fa871938f3c246e64
 DIST x86-debug-libreoffice-5.4.4.2.tar.xz 1129709360 BLAKE2B b4147a670ccd30ca6c459571190cf52d2f94f038c934733230c0b88878a1c30c92f3e8837ba69ce30f8ab219fac79572fdf92d5e280d484a53d574105dfec7b6 SHA512 510ea4e36459a18144a041e0d111c668e6514a3291fd23a3d495bf5cf11ed13fd58c6cb0774fbd3255da666ac473f901a07ccaf35e36be33b3b0558a31de35e1
-DIST x86-debug-libreoffice-gnome-5.4.2.2-r1.xd3 321601178 BLAKE2B dc9fc8b94f1c7cb856c2af96560ef6c4da5f6f12a65c55c1dfb001ca14306a8a654d53841671d6be07b742f0c69b68138275bae48fa0eaf2398f6fadd50c9b4e SHA512 81f0173a4eac6fe73b3d9a1f773e7f4d463898b4f347e6465df66449094cd7cd5b9e3d0e119e67a18dbe0d56c6428cda50b2bd08d633de8c9097acae79eee8bf
-DIST x86-debug-libreoffice-gnome-5.4.2.2.xd3 309369878 BLAKE2B a190f404a835fa80f95ca637c3e60bdb3d4dc4e53f5cc1ff4d0a58b142cd71780e397270f011128d034c258ee5d007104cef73cd30cab0ba4541dfd04ab59b11 SHA512 1f97dce9172034cdaf6e86e3d5b485119e577cba79a0013fe9efb0f326e21598bb0856b656619ee3c273b4252db0327d86e38e4c717d215fb29936c08eb3ef0a
+DIST x86-debug-libreoffice-5.4.5.1.tar.xz 1130163208 BLAKE2B 2288afbf5773ca93d7eb28e95ea388b4f8770684b55923c291dd80327853d7b58a0895ff053769809a407981d36c4aca3a94bbc3e40ed4daa07acf07c2a40e4e SHA512 7cd7a73996ab43e17b4b6c941c109a0ac99a44727056a54a6ea40a45d59bcb86c1875748834a7b0e84b31c92f1d120898bc63b4400e3be0743bdcfaeae2d04b8
 DIST x86-debug-libreoffice-gnome-5.4.4.2.xd3 321695199 BLAKE2B 2333e2305c49fb6eac21b01604f6c0d79b5782a51258ed9a192213438c7352322d3a2272b1d37ea393531237e8150e207b779bb05f02b4a6c1c6cd86c814701c SHA512 f9d194503fffeec5ea8b5647b500a746f7ec86d1e9d05cc88f84c5f956f66aa5d5048d60de2be6233ef1b55617840c572097432a7db72ec2ee6043b05546fbb7
-DIST x86-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 538276484 BLAKE2B 607bd39450aea3720086abca0fc32b60f09b2a704296887bcede01f4c5b633fba5ef72826b7af1b138539849d35b9c581e79b2597e55524034794f904eb8ec96 SHA512 4007d50c3c8644edd8e5ef061c5691d6c0a5d5595331b75fc9e29deb4b557e52c645a6722085e6187527d2c9269df0a23880a6a79175bb2b03a8c8370acd5b08
-DIST x86-debug-libreoffice-gnome-java-5.4.2.2.xd3 523725289 BLAKE2B 3101a58d45e94f2b890fb07060aaead80d57a0fb3b3a2e7919b40fd15bcef731cf2d5067b65ffd9f567a8ff68f73bd091beb61988c8b7d7583ca188714732a83 SHA512 f9f1fe8b602c0b4dd59a1bfd110b24ff50f1ec33e1b41f5af2f28bc2da610c05e3ba5f4571420047261e206e5e7f89cac747e9a795957238e975ee8d77f313b3
+DIST x86-debug-libreoffice-gnome-5.4.5.1.xd3 321731155 BLAKE2B c6c459e01ea90133773436c1ade2911099f8299808c30f92bb55e095c42dc30fffb8052bf43b0f4aa7635e0eb17569644d02bcce9eafe5f6ccce1d35c1ccfe09 SHA512 1047c0c633914ddcb06e430ef8aefe6d3c74d1e70ac63005c6e22982210daa6eb092380cf74d8b41c87d979249f4fe0cbbf6bce7793a3b0a6785acf484616cad
 DIST x86-debug-libreoffice-gnome-java-5.4.4.2.xd3 536476843 BLAKE2B 79b54f3d2d6b16aedc89f7be84b98433f3a9b5988a8959d49c28043aebd3b4d9170e8a4f2ab976eb0da6b6ec4ac24258e7eb38fb888ed8051ec9e44de5f7b4fb SHA512 2aacd941b34c6efe565660bb204651f37688d2ddcd2ab7a4dc5382ae335f76f97dc1228a63b31a48531de12d8dcc1e3df70bb6650390f9b930e7f8a61c582070
-DIST x86-debug-libreoffice-java-5.4.2.2-r1.xd3 530463158 BLAKE2B db2c2ac52d6071626c453cfa5cd35bcb45567e21598d7d6dd1bdd0c556f29927e591ee43d0b1364271aaf9071099f45af3b59d69b4f9627870afdb538383ba75 SHA512 45cec98e3d4d04edc8daf1c711b6e28a661ab2899a4a931867d42cd0b4704a2b22b59beb98d1bba1d501a10c5de0158ca3b8e952de88ae71871246be60bcfddd
-DIST x86-debug-libreoffice-java-5.4.2.2.xd3 516739219 BLAKE2B eea40866178941f96d66a5f5d1061b47a1fb187093afcce4bfbc372a36f629722f45a3e60117c9c7a8601c6526fd67b300611363d96431b48bd47d037faf22ca SHA512 f49bd0fc9609015e892d9da046083b121165aad445b336ab99e8991a5c9077b603c6c8c052238358487839dbdf5379f13074e1a25bca6d8ade0927055e92da7a
+DIST x86-debug-libreoffice-gnome-java-5.4.5.1.xd3 535171694 BLAKE2B e3467d6d9656bc76c76fc98a2c5844675b85da47c56512588cd8221935aa53ecebd4bff07e09a27cb9980fad8015fb12f458b47fcb6ac1b6e8e8794a9f1fe621 SHA512 03f065f5a2e4d7fd608cd8820866562d40fb1db64b729522c27e8732c809f5425046858286d91085fe01dcfa3bd33725f8fad7a55f1b078c8b06815982acd5a4
 DIST x86-debug-libreoffice-java-5.4.4.2.xd3 528672548 BLAKE2B 7759d9e612cd87c9cc568922c4750376e757d79d17502075f63a97b952afb7a7aca2ed4523ecfaf5ca07b58234c1caf4ffc9fa9101695de227a48ad326540896 SHA512 c1e6c3e199ce03af538158cd587708642464df4bf003768b94f9188eee509843c0a7ac2b758d13ab61c6bdfdb92e3d333dc1432b0a39b7fd82e91ffac5645e99
-DIST x86-debug-libreoffice-kde-5.4.2.2-r1.xd3 328224707 BLAKE2B be0e44514784a79d36bfe445ec20a90629c1b715f5705a83fb3604aa53d0137180e008f484c27bf004bcac91b3763d692658045d620236656fdb9563bf7d4d83 SHA512 e7909d4557e8999aa62126da7bed480e255a1486882e7e4524fc997e358cc81c35a3a30fa87d7f185a2c17aea0e5536fe464bfe3cf5870fe65c20611d4202f40
-DIST x86-debug-libreoffice-kde-5.4.2.2.xd3 314850500 BLAKE2B b7b6e3b03e99f7fc44452b57d8eebf254bcc0b2d9cb40e248dd07399684dd54f821fd8b9356c0e12d650a0f9ac49c96acbcc319456764642f556770716a1c620 SHA512 218c51994cf8c27e3a20d1c88443b7cdb4501263342f01b4bcb555bad1b36cf05ec9b0def4b14e5262654819d17ce77dbbc642d4e646b46a3b2b72271b4e9dbc
+DIST x86-debug-libreoffice-java-5.4.5.1.xd3 527291958 BLAKE2B 5fb90285b7573e4d4bd3b6aaa8fdda01c3bf14fed3f4c9eb0b754ceb899627e2b091e6901370cad28fa407a8a3940e717b191bef3487c54d4f61dd8eaf6fe323 SHA512 8cbd19d8983f310976242c6c4f46be6bcc5e5693e074e997ae4e2b18589bb1d99df6417a7bae1cb7a421374049f5878f333452b12f56b672a48683e4ea72181b
 DIST x86-debug-libreoffice-kde-5.4.4.2.xd3 329354953 BLAKE2B 98713477df17bfd72f7458ced98672e03b3f40be2a5e95409a11ecb245d89416c93fe0ee11b81fde17543e228d19edde2ffbcec0bf82fb9fdb124401115a9f78 SHA512 5ac7f9872349b1da14994562840dfd203d2ae4413cf4437e5acef69690e41e17d760e0562aaa356fe76e2ff643e8a33e7e05c1a00f06735669c81a9f4dd95bfb
-DIST x86-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 532241334 BLAKE2B 50a0a344a6458d6773ee9590122ee3e0ba5debdbd1e67e73ec08e4a68969962ba9e5a42c223ed6ed3d58d4d067c80925a2e551f1accb78cb468c2e5b158a6944 SHA512 19df982e8642f068c8147bdf82b37ffc5b2b95b9070a87dd97ffab8ae054ae2c842f83961620571d0485a6455c576920af62eeec197539f6855d1b6d1613f52a
-DIST x86-debug-libreoffice-kde-java-5.4.2.2.xd3 518297724 BLAKE2B 580d482859c27ae57fcde8605561b0e1315f942853b9e3dd3b341c03099e8824be879ebd7af90432126050beb8c00d655dcec8e200a433c9064bc2f4dd3e3197 SHA512 e89c17e1cb65c28d4fe2961de12e22321b19456e3562466fdf601a20a0ff22704bf385311fda971892ea25a6d4bc74444ec93e39bc59ce7d95682b08603cd1df
+DIST x86-debug-libreoffice-kde-5.4.5.1.xd3 328651433 BLAKE2B bd54186c17798909ca555d493083b7fe2f7f0820def97b6c09644e7652e722cb2be4cbd8cb6bfc637bd9d982aeb5f5e5dd19d7fc7ec79ca8599ab8e3f913e12e SHA512 776f17374f45d2914946e0ebbba3a75585b2a416660c1a0c79c5b395c33bf1cbe9bd9b37276c9ba82dcd5ca820ad4dc6c1e932e06c0a5adc70e315db72eca2fb
 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
+DIST x86-debug-libreoffice-kde-java-5.4.5.1.xd3 529080140 BLAKE2B d6cc31c28189ce1dd1b1e085bf6317914c85abebb4dfad64c15bbdf90689701ba35105ea24692086e81fbe17d691761f1305b938d4256a7dd5857e6ccb13feb8 SHA512 d5e5ee39c102ec951b437611186577b2f2ea25a529d26c01b97dd2452f38a52a2a0649944494246255451efd65af6cdea2fd724aa27d8b295570eb4658c01e3b
 EBUILD libreoffice-bin-debug-5.4.4.2.ebuild 2678 BLAKE2B 5edbd7665312997ff123d2f29b654a007f3c23f780fc79b259ae29c95d1073fd39a8a14d71f60959f92f8a931feb17f0c6fde217fda135a90e9a721afc49e627 SHA512 f65b7b9109b221fc5769c3b13edd5057cf3f2ca4c0a9b41b16a04e2bf262c0d36f4fd2e06b21fe79191c69b9ba42123145c1f2a4080886bfb8448f6e70fe51f9
+EBUILD libreoffice-bin-debug-5.4.5.1.ebuild 2679 BLAKE2B a312f9286441c3868303f94806ef8ab85eb14e30fb47973ce5bdf3150b9fbb9f85aa1db31a7decea5fd5402717eebc712df1922474db9248c9cab3c03808c3de SHA512 be667472fe792323f833a07bb0405a6d59b2468b3a4fb3252f486cb6f1fa8fa7edd847eb6eb6374ed929722f3ac301cd12b67b04f3e32cbd760f8a6aa5a18447
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
deleted file mode 100644
index 4ba962662f42..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2.ebuild
deleted file mode 100644
index 4ba962662f42..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild
new file mode 100644
index 000000000000..f8723d429dac
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 83109d8e6059..eb822aea0c12 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,41 +1,28 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-5.4.2.2-r1.tar.xz 75362012 BLAKE2B d217824ed319df6b3e9b7b772f9f131141674e0cfb6c2e0d860ab2b62e30438f7b7a1a5f987affd5fed9cdd5009fcdf7638ecc268775d9ca0f48dff73a7061df SHA512 a28f64b8e1c5e2b7ddc204227bf7e49b929199b818fa8ee830f0b95d23b5fe2d088ad820696b23a45202e600f7be9c3edda901f475c106df4634f8cd47a159d1
-DIST amd64-bin-libreoffice-5.4.2.2.tar.xz 76103708 BLAKE2B 289b0fa454effdf4ad9a8bbeec633d2592f547f6907eb9c814e32c1ec25a45aff72ade4b84294d8c0960b3385a945e030ebd15306f6c261c414a8eb42a50d83f SHA512 ac577138f065ad8699b26743b905c7b94b4875eb45fa3c9a580410d2e587519df01de7669c0f6c1baff879b879f41140be4fe844174037dd89bdfa10eb0c4812
 DIST amd64-bin-libreoffice-5.4.4.2.tar.xz 75454500 BLAKE2B 0708d66535d15efd044837a3dc978bd564fb8716cbd212a95f70f63185f8dee1c56ac1d01a6fcb4d188762ac16dbb0353dc64f08bdcd75edbd93b83df5c885d2 SHA512 5e4c2c36c16419def7385d1bffd712e437c55217e645c2ffee69a385a57ab3f4704df58449b8b793a5567c3c3313aadd6fa8b3a5671efb2ce03ea5b16eb0c677
-DIST amd64-bin-libreoffice-gnome-5.4.2.2-r1.xd3 16337443 BLAKE2B a784e90e24987c09122ea44e59aa44f9d3730c4aae6498da934518ddc0ad708fb3fbe7c64c32041616b4d04dd45281e7c618769cbbaf1ae7385f5a7055a5d464 SHA512 8a35544616ea145b2862e9b9fefc54f55a9f2aedeb98cab691f37d3a308dff0b7a92a46068956c7e3b26ce455bdc7744720d24db990615bb19c1a0377015dd04
-DIST amd64-bin-libreoffice-gnome-5.4.2.2.xd3 17096769 BLAKE2B 7d91c62ef0f10b10758de63a463ac52350ea8cf2f426c6d52b4c7fc9edca4ca615be7d9ce8481d78031b3a40f38653ca3e5bb9267097d921055c2a18e78f2eff SHA512 079141e1ac63a228682b3b3f204fca288285fa2064841d66a0eab4cbf36e743a402e7d85129ab5b4f3b60f023ca1f04217529ca78ac6f40ebeb08933f59d75aa
+DIST amd64-bin-libreoffice-5.4.5.1.tar.xz 75480304 BLAKE2B 6a7b018e5cfd66b97e7f16e40dff7b6154ce622a2a992deae0b49114ce8bb2077553e2be7ce9b1a702495ba996b80bff39647cb864b688593dbb0edd026d8f35 SHA512 739a80cab6b508244e3bcc8b282bb728271b65d8f48b347ca4eb9e15239b1f35252f322efff85e3c47ddf420cd4f36a9d522fa675c1774f17868c2a69dd82164
 DIST amd64-bin-libreoffice-gnome-5.4.4.2.xd3 16217377 BLAKE2B a3f59c2ccf7559ebe6854a3db529e6d3dd3b9328690291bfa110120d7139f5ba219f0b79724d634515b8e057c21af1f34a94854aa992a2d42d0088f04d076a55 SHA512 214b2d6fdd90767ba0cef83f089f63841de78d661fee8c979cd7278745f7ea7d831e5ae58605b3066467ae9e2c045829fb68c69083cdedae21a6c863cdad93ad
-DIST amd64-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 26558117 BLAKE2B 2ee08980b53314b0570a96f4bb76f8d61dd7c752348a0ab626ce5fb732f1c44319c64af9a595183ed13df832958266b4c958995d9253a1ac172b6e90f42d626c SHA512 dd8004642025a958a213dc767e4f73a282710fcc2ed3c2b8e0622ce8aa7833d466962d45016e81fff71896a7148ec8cb1447b3df77c4e6547279c109e1f4241e
-DIST amd64-bin-libreoffice-gnome-java-5.4.2.2.xd3 27455524 BLAKE2B a2271382f4c8e533467f4cc8158a2fcb4996c387012f016f1ffe1a82d5b1e7fd9b81a3ce078cb470de1a38094b8e64a0f8fda6b1ca349bbb3c97d14fe16043f4 SHA512 06a03f256ab45087706bf51999dab4e4185ee55c9d28bbf60c438ae71789b84fdded9614713afdd3b83c7bbbc72cc80747a7d41a633bd606a00715079c85f97c
+DIST amd64-bin-libreoffice-gnome-5.4.5.1.xd3 16216047 BLAKE2B 0ea40233b41c637069174532c509fd36efecb03df10c35b23bb315379212ae08e41318a4cb28e2ae55680e410474a5b1b1fb40c6f533d2f1fdfa98d3f18c58cd SHA512 239cc60220719b1a46b25c6bd5482973b302b3c2b126e87091911355a837eaf653bd2cc5de81ee882ce839522ceda9bd19d47222e1933a3b6c847628d9dd32c3
 DIST amd64-bin-libreoffice-gnome-java-5.4.4.2.xd3 26624490 BLAKE2B bb3a9534f57e036a2463a8eaa39b659c29d2cc38c43cab64d2a30dcbbca52507fc25d266a2e673827125252276087f5479300957a669a3dba4cf6e0a06865fcf SHA512 9f44171a3516b1fbfb8bf00f12d4e8d3c2ddd5dbb2bbf01df88db582dc155df35304974219e74df09052a3ed6b89638b845fdf79977bc910c9ede082c08d560e
-DIST amd64-bin-libreoffice-java-5.4.2.2-r1.xd3 25596784 BLAKE2B 493066f074077baeeb991935362291599db567e4ec4114ba78a733e89fdadc810cee607f77529f2543cba767000cc26c03ea9238ba892f4dea50374b6af98a04 SHA512 f25ddc420a63a8cb3fa89104dc875898b73c3be48936b0c59c34a4bec4ce574ab36e0ea5f4c06fe824b50dd15bd9c301ac181ead095d6bebb676e1255880254e
-DIST amd64-bin-libreoffice-java-5.4.2.2.xd3 26415061 BLAKE2B d7583a90bbec71436f9a66f6effe09131c9f89193eb1d1618cc890646f436b956e0e5952da9f6be6629dea02a35ff08caf7563318d14a3331e35c47f3edb5928 SHA512 e73c8710035337a5aaa07c3751deec9cd842dda61c5fefb9f3f63cb5b79b47f643f87e2559605855f5970daedf78ea2f5788d82351e623b86c909d90576cbb50
+DIST amd64-bin-libreoffice-gnome-java-5.4.5.1.xd3 26624424 BLAKE2B a79e5e50dfee66e628e217f702c3bd838c582aff3a0501c3423ab275e03122515ea30edbab709179ecbce973604a6b6222b7d2904001f22896efed8c6610eff9 SHA512 9a01c47a996e26de4508383451a4be669512b89f2a0a6cc96cd7f363f05610cf9d244fd30a801303d8db7e866935c4fce622a472f5991d26adfacae9db700bc4
 DIST amd64-bin-libreoffice-java-5.4.4.2.xd3 25742615 BLAKE2B 4391bb0190badd18be15f1d48549484bfa77bdf93e04a988aece08b13f8eced2ebe568128b7baaaf01e23918db3f35c14ca03225dc690e3f4b76e00a51b88ea4 SHA512 131707e35b2a899904595c8d76c9d12f9d38f08c6d0209b5c4d4513f9892189a337d660f4816548b5d9ea69b93dc61cff4de67f220f801f8f59f95dd00f9d13b
-DIST amd64-bin-libreoffice-kde-5.4.2.2-r1.xd3 10234903 BLAKE2B 633e27bf7992ea7735680e33f22a2a1f6af84fd538999cf4cd98362ebfeac214c897862d5eab5f3644cb3e23ab640d6ace23a5d63f1c4db1452113808a66724c SHA512 07010c1e1370a6d3a375fafbdcd44496f34abb06c8bfa949eddbafbd85dc0d548ce43668b1c73e4cad2735564607454bdbfb893f48e76619b33f61f24439aa25
-DIST amd64-bin-libreoffice-kde-5.4.2.2.xd3 9501055 BLAKE2B 3f98ee516ecdd506fb6a03506ce2dca9e9b93438f4287aec84bf29c729aba76294b6721f84fcc38f0ddad373a2a0780697fb3ee000362a4ce8aed9e7ad150a1e SHA512 f9f144971f7b1619b7124f68f0c5591ff440d891233662985c659dcf98c8ba93738f28a9c70c11f83e216f3488503e9b49b359eee44989e85c754b061147c575
+DIST amd64-bin-libreoffice-java-5.4.5.1.xd3 25747222 BLAKE2B 28a189cab3e748056d3b32f7f36037e517aab966ccaa42211e8a4e7f2c1db763b9ff2c84a9dab076c367da7143a6b0c8782f9898e075ff9769f1c4d3e8a5669c SHA512 54d0de9b7f32d9e65e32a8ad0cab5ff212b2751a41c1297fd7c38728f7ff2bb3fcaa9b1bad55714097d1ed726449783b0ed17e43d8032e0e35cc8696b5ed9907
 DIST amd64-bin-libreoffice-kde-5.4.4.2.xd3 9224240 BLAKE2B 594c2a77d8bea9657b90bbe4e44ccccbf9830f548fd16b67092e08c8403128b9ca430979033400b56349e303e5db414b5b761fbbec14e5f9619e7553b16efe5d SHA512 43e5c876e19b1d3e292048dfdc866c5449253b2f178f0c9838b95e5cd07cfccba6220276a4c5127191d4d503a4ee1f292e14c8d027102ec9d77053016f7cd9dd
-DIST amd64-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 25826013 BLAKE2B ad18ba2ae78f6973d98816680804da8d838cf22567759fcf9536d42ec526e252e5ae47423f37ee5a68eebbd3471263417865f51b0b0c0dcff70e3e0abf7fe5fa SHA512 c80fd243aa8150ac69d8f9ce1ec76f32a7873aeb3d93e73841d34ea7c87c3afff07a414029806419b5fd99345a94769de40d4cf0d89b56960f14fe6d247c5c6a
-DIST amd64-bin-libreoffice-kde-java-5.4.2.2.xd3 26621192 BLAKE2B 5d9d6ceac4bb7772bc236ee44f0d602cc555626bab8cd89f4bc9221d16beb3d44469ac47e9a4a20dcb670ad87cf4bae895bcbae19f0c9161736045f9d05ff381 SHA512 883a897357cffef3f37961dae7be10d1d47093762a842cbd775c6a14b202fe5c9a2cf8878ed2d9587c511c1d427ce20da71ec3b21da6f7bf4f22fd5169ebbff2
+DIST amd64-bin-libreoffice-kde-5.4.5.1.xd3 9238961 BLAKE2B ca7f2853f8fa53eba373ef8f48f32d2f457b9a65d99b94baccc14dfb3e96b2a00f4e4cb164bdef1823c846b71906cbb932a59f4189113d62035c27de64dcf357 SHA512 14ef861c7166b939667fa9e759e3114aaa958bacec0924f98c0562e63c4c5c42986f5c5fc9cfb223b8a7848ddfe653a4f1871581fa4d776a8c64f30a3a577e7b
 DIST amd64-bin-libreoffice-kde-java-5.4.4.2.xd3 25847518 BLAKE2B c11bbdf6bd2c24c6f1a7133147f573439e7ecd902f876a31f8c29c0a45a4f27127e2c16336bfcaab763e749d3bb646723b8799d67fb01680a758f0faf83aa0e1 SHA512 859533f4c44f569652beb477c0bbeb44a52fd77a3c6b8d7b1b63c655b611a06c2fa1870ab77cd8a853cdd190d8562270598dfad4c236529af62fd4d796c94d30
-DIST x86-bin-libreoffice-5.4.2.2-r1.tar.xz 77497504 BLAKE2B f4258171c91144f7a96fc4c3f885337ca2f8614d2f1619c56db9f18bfb3e0d9f932c151bbf508b34755a390e5f61c62f5b564e441d4d328b1a2699fe1d60d717 SHA512 f670737962b667782542aafe5956dccec5bcc82e0a080311dade7565b8c702ae020c4ceaa917ac22135d5c57bc021681521e6d5863abf1adbc9789d25c36a186
-DIST x86-bin-libreoffice-5.4.2.2.tar.xz 76197244 BLAKE2B d14cd52d70649a7d96348734ddf34796ae4e1612eb8965c1c294fa6c5dabd6b39d3d3c34345d4d8300f71917cb74ea5f079ed258c09f6f7198453488e3539967 SHA512 3e6a04ed0febacbdf78d0514df1d863196463cf777a646a5f33afb6ab3cdfb9f27245d4e362974f2112b484c29c810c2d563d5b57894feb603d9a4ac8ea19b5d
+DIST amd64-bin-libreoffice-kde-java-5.4.5.1.xd3 25851121 BLAKE2B a81d6a0588b54c8fe2cadf3ac5afed6791f1d752a9fd1da59845e54fee51247fbfe76dd0ed8ef4238e8a3043f24c88e437ace3bc9b07dca040035e9609d92e83 SHA512 120dcce55692e7b3cd681492b96202166a3155db104e8f984c2ff746a747594cf41cb91c400fa9015134e60aafacf77f8f8b7ed3d31ce8c1797b8b2820680560
 DIST x86-bin-libreoffice-5.4.4.2.tar.xz 77651884 BLAKE2B eea6e1546fb53411aacbe43878ab5194855dc46371ab94c8e634b70d1ee5a2c9b1efbfe06168b02064efeec80916f3c5e53adb5b71557dcf5c8b5288b1db1951 SHA512 4ba93a809288fbc33e7551a1f746191787efae9be3beb41fd4d0285da8de7aa0cfe509b20aa1699f10c211a0ac796d49c8bceb0459ecf9fbea9c67cc0caa74a9
-DIST x86-bin-libreoffice-gnome-5.4.2.2-r1.xd3 14217445 BLAKE2B e952d53d749bbc78c67c1f987ea6ad48e1c0d345d36d092106798dded817f3625b60bcdc23998eea01bacdfc812a9175c18d4980ae47fde907cee595702e91b8 SHA512 568a176241b4d52d3872a3ed6e5004ebac5fbbc0561d1768b7990cf98c0172126e41e0f66febf6860262d9ab060952d62d40ad3d6b72e23b848e0d68d76ac907
-DIST x86-bin-libreoffice-gnome-5.4.2.2.xd3 14720380 BLAKE2B 4790acfe2bc37c41597300e7283b1157e2047e5fb4c6e865f23e5494b9e7f35dc337d806702f8fbfc5a5c20ae63834e0c12ba2992a6471d3c105ee32417a593c SHA512 b73e6da0979a78049f1563a0fe61764d7b97197d27a307579b76639d881952a4dd656a49249351c172ef45a488291ce3a4f60879f9bff473df6db22ae598abd5
+DIST x86-bin-libreoffice-5.4.5.1.tar.xz 77649164 BLAKE2B a7b5188dfa3c321a69a0328bf70e3637677350efbb399619937a255cf9d7d91fc16ac27c9acad3627f65e958009930270dbd3512e08021bd45743b380acff565 SHA512 7b7964fc84a1aa6f8300df5be166a76629848ea123f1dd582fe0ce93b4a85dfe5cda7dc5080adca5bd14cf85614172b8530b738a96b3ff40720c4ba41c0e692a
 DIST x86-bin-libreoffice-gnome-5.4.4.2.xd3 14270348 BLAKE2B f2e4bf463dc53e0919ae561369b90a675d11cd65ca06500917b611f7e6e4fa4b21d0f03e22800124598a3b8322990a31572ef41605b81657446e40c606f9bc60 SHA512 6a30c9efde0e37dad2858e4239c53fa592b8d8f4925f8548e07044d65907aadb0b7a4b4a116e8da1f030ea677287aab96481b968cbe0e37e6a1b81c28061b98e
-DIST x86-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 23765116 BLAKE2B d01b9c2f9eb2631a60d57c28de5911140a410bb96088bceb0a1c23d79ffa1565f87ba17f000c0111594551d3fb65c32dbdf5909f85c2edb661ac362664612da0 SHA512 c11f03628b9886d40ca8e4564c2d758ad71a7fcc5058cfdb794c3280b0f86d247e59adac0d8865678553f58b216cf6d12cd13de778d8b9e564f25d057a0e07d1
-DIST x86-bin-libreoffice-gnome-java-5.4.2.2.xd3 25943139 BLAKE2B c1a76a8b1c10d8fdef90599c55fc566708877e245007959d5baec5b408bfbd74652acb61528bc13d795c8fc7ac1cb47c7ee99a8b0d127fc575e3d49fcf26cb2a SHA512 38de8628272f7633c9e1c32dc08161ecb40ca824bac433122f45d696b1d89376fb6a5843c125295f66e00f61c354da223b2cebb2683f0a03d38b6017b002f7a8
+DIST x86-bin-libreoffice-gnome-5.4.5.1.xd3 14266862 BLAKE2B aee448047f2d975de0b3420e125cb337bf9f5131bf89a9fc10294b81751ed107a6de282ea6a27a2e1be91e705c5a34613a1d38a0f169139f48aebbad56266fe7 SHA512 2321c78301c25d37cc06dac987105863faded7ea9128ee0a5a32645837ead75e3c85f78d0f017be6e5c21a9fe4b41ea1775ef3d5ce6544cc4d7931bbc4bf9c60
 DIST x86-bin-libreoffice-gnome-java-5.4.4.2.xd3 27065101 BLAKE2B a3c58647c6d2d0f8dd3d32fac9e1ba7967c41fb425b1a2104c92a223f4c7f301a9f9fed842a5a9ca31801f882d8fc0b702ff7b6c7cdcc742aa4ec9c716b5798b SHA512 ebc2775a379843daca4c9e273e2152f84a7b04ab542cf39394c6f2b4650a758f570baaebf3f49003a45cd06c60e6bce65782217836e8132488c49eef7c9205d0
-DIST x86-bin-libreoffice-java-5.4.2.2-r1.xd3 22549416 BLAKE2B f1f1dfd68af16cfc3be1727bf223c8bcf3945045519cac1515a22dcff7d8304831917d610be4f269195238ca903d9150abe04df7e71b9f5149cb0dd78dc47b53 SHA512 2d8e4324bc588d6d9950daaa1d85f02580ced2c743326c656a1ef04aace957b2999828d607126bb4195fbce1f6dcd2dcd70da48bf6c5e6f889b641905e9faedf
-DIST x86-bin-libreoffice-java-5.4.2.2.xd3 24836939 BLAKE2B ccc413ba0900e7cc6605b0a17102cfcbc0410158580ecce759a149bde3614838d9d4f7fbed279b09331b388357467ba97e75892897e7095b26820f97cdbba69a SHA512 1b9a4ecb1f2304b60a19079d19405bd3d88da4123d80b14915a7494e0f8bb78b11fb9cbbba026691072cceeb74c4f7736a18167bfa67eb74b7a25dfafb69fa4d
+DIST x86-bin-libreoffice-gnome-java-5.4.5.1.xd3 25919818 BLAKE2B 4ef28d9c32a0caa39e034f14abf9f513c308734fdb1b1c1016ab431da3893b130c04c21110aad464b4f5aa1ff5955023eee5fb722e6734a76da78579d8d02360 SHA512 df2eb1b920899cc26d54780ba3b2d8673ce8c93d72bb2f5d7472abe1b8024d0f2426f935e8e9b9d83f2fc7d2c76c65acb804ca0d41332063637991bfa2857d0c
 DIST x86-bin-libreoffice-java-5.4.4.2.xd3 23531668 BLAKE2B e29b255a2eb5a235c436582d38e020a4dfcc17cf750cf8be7536cea18d9483bc6624b9d933dd04465c8aa0f482cbcfe79ec8939aa7f7faa0c33650a54f8b747d SHA512 9aeed28bf31a90d6647b11cb8f06f00da7b8d8686c6247202e9c1efc982d264032f58ffb7fd1fbd36dd70d3bc83dff77b3e583217365b1ec4ee33db4ac9e73bb
-DIST x86-bin-libreoffice-kde-5.4.2.2-r1.xd3 6268866 BLAKE2B 0870aaafe5d5d205d1abcf45504030190066fa7a2d0dcb27ef6486baf2f70b2277a6dbf931ef19a10e354e9bd285e0bb55cdd3dcbac19c416240c2d6456128ef SHA512 581916d02c36df1b27057acd21ff98b74ec574ef78441992598cb4aa9fa4795cb5c8767040d08711c2b3f3b471a1fbb6fc4b6139e4eda1b7b6de21fb76d0ed35
-DIST x86-bin-libreoffice-kde-5.4.2.2.xd3 7039660 BLAKE2B 9c6bc3cac15ab322c206292c7e9cf560ef675737ad82bddf58d411069e5c657542bc7d8bbea365caf6f16960b70a4e092400783dfa1d7b50ac1b301a39b654ea SHA512 6e289355170bb7fdb9273902647332a8dff4f4b02e420416eabfcf40b1aca6986adcb7f682ad9d8a89907d90a1090ad8eff3c283f025ae688a1547b653149cdc
+DIST x86-bin-libreoffice-java-5.4.5.1.xd3 22349280 BLAKE2B b53fbafa5ca66800152af5e548f3600e69d8368b769dcb5553e13a1f657e57a1961438667a3745d1d0e8f46e69caaf31ad7450ef18f2e684a271233584422441 SHA512 8be523caf6b726c3844c7115d5ce922168eed27493c611028e528a98f64650413dcaeac0e589b8f78b52698f17e86fb3b55e712afe6a388dae32cdcf0b5f3d3e
 DIST x86-bin-libreoffice-kde-5.4.4.2.xd3 5822545 BLAKE2B 554e2f68d4c79908a118998405d628fcaa7dea34238a74d6d6822eb8f8f41d626eaaab40d02f36b6418c63827f3f3596317bea595da396aeb51dc58ec21ebfa6 SHA512 dbd9a8677bc248408505214c97748e5353937d425d6a1f34cec4d3e4595f4382f0e7e83295cf671da4b10a51c411d1bce4fdf51ac5c323c2c6fe23c52cb89f44
-DIST x86-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 22630525 BLAKE2B 744267ac7c1fcc12c818a2a77bae7c2dc07009518712627103952a9e74355cbbb7c99b925340d211ae74e50df267fe8b135cfc88c66e41cbe9ca366acc09d5fe SHA512 580a19d8ac55dcd179daf3a04692d1eed397912202fd11de5003d6a9b445b8e3e2a8a93ed9406b40ef287f8b98b685b0418f72ce5c9874d3a7fba0befa34b807
-DIST x86-bin-libreoffice-kde-java-5.4.2.2.xd3 24919539 BLAKE2B 7da2fcad2eee3d35ad876d988bce486f11721cbe4506069bb782e760ef7b02372f529f4329eb290c603f0c7146a04c711f3facc431028b42b2c8ec655e25de8d SHA512 5c982b7bdd2071c57556e821e46ab58d2ceb3c34a8e45a4e9abc3719917991c5c69d3bb242639fc51654163849f3dc0668620939d082228e048d1236d6ce96fd
+DIST x86-bin-libreoffice-kde-5.4.5.1.xd3 5234235 BLAKE2B f1c4f2db89cd4f6f013af9a5b9e89b88c1d5a8710ef7f03c136cd99c57d690a358741697f260a4220b74ee2c03280d80669c28112d7f53ca4d1f20d0fb63428c SHA512 993be8a8e65680f4e82040ac0232193c81b600f467d61cf2d8f009d3be3f22a2f24cc3479104c4e64c6cc0a5ddfef3cecd7a51b5d44abf3630d3a93d467a0159
 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
+DIST x86-bin-libreoffice-kde-java-5.4.5.1.xd3 22411985 BLAKE2B 6517ef3900e53d9b96ee41d68760de67a4b9f97d404eea0718efaba6e03771e1428002f1d2a2dd9d63712b9d0cf2c967a530f9579fee32bfe20622a2c5db7d94 SHA512 67eab09e4b46b52a587709244aba99ffa6414d6188340405d24d69abc6da194ccee8164b89a76be8a88c639dc4628322aaf18d2061e491681946201e4d0bca37
 EBUILD libreoffice-bin-5.4.4.2.ebuild 6514 BLAKE2B 435a3058beb92c7d8218a8432c2576a0ccdeb055475737891d9b4468f1fd3375f057d33857776ed782e2661347a791721daa3dd47ecfc3059e5618770b7e007b SHA512 599098552bd26aacb859731121a3bc1099abbb5be78b309a06d1d75580c956cf07c0bf6583797d41f6bd6afbaf14a9586ce0425a207501f6c6b9aecb091d7e6b
+EBUILD libreoffice-bin-5.4.5.1.ebuild 6515 BLAKE2B 6a803099a76d431fc35eb8991ac4f4de415c6d64a0dfe8c7acd08d7ac2d0a8a16a275cbe43f31410a000341ac72b83176a45f372498b2896766ba33fe0043973 SHA512 9d012cd35378ce9c53ef9d077e0781965fbcdd670b31d047365b4fcad02cfeef8886c2658d63fa6ed9d691ae1a500dac08e33c74a30fe23911b69d5a50e94df4
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
deleted file mode 100644
index ebe843be0224..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-CMAKE_REQUIRED="never"
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.6
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.63.0
-	dev-libs/icu:0/58.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 )
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-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-extra/evolution-data-server
-	)
-	gnome? ( gnome-base/dconf )
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.24:2
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		x11-libs/gtk+:3
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!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 )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-${PV}*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2.ebuild
deleted file mode 100644
index d65d567f07db..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-CMAKE_REQUIRED="never"
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.6
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.63.0
-	dev-libs/icu:0/58.2
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-5.4.0-r3
-	>=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 )
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-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-extra/evolution-data-server
-	)
-	gnome? ( gnome-base/dconf )
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.24:2
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		x11-libs/gtk+:3
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!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 )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-${PV}*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
new file mode 100644
index 000000000000..83d8a7c62454
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.6
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.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 )
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-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
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!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:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 4ce84f5f7b95..92244e80649d 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -1,172 +1,4 @@
 AUX lo_gen_langs.sh 1469 BLAKE2B ff7a1744a71711025812d5fb40e803f5d111069099ca9d94ab408c0307df6c8fd0bc0b645d67127bb0d1666787ea3e0c546349b26373e5067446f929d5985003 SHA512 d683506baad2ddab1375a006f237661736e78e2f81a93cbe2c168f6bc4f67125ca1fef152fa4f8adbd59fdaf2b00eb13c8697863b0ae601eacc97f7395ab2eb2
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_am.tar.gz 7942649 BLAKE2B f9da44acf82da2de61613f98654b713e7e25fc3ba3160b99a1f55717b73a9b355a724340f8eb95e45920b0c67719d23172b4eed50f876e51ec892ff1cc582e99 SHA512 87551cea3db60ee86773f981ded8abebefbf9cc950fcf778171b7901d42c15c8663b70ef9559bcd99beca525ca19eae52b6be26436a62134d9f0303223c22ab4
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ast.tar.gz 7872466 BLAKE2B 67c5c598cc02718ffd55f1bc40e59746d5c4b3e3cfd31b19d69a9d294156499eff10221de4c3519edd268fc63557690968d1a83f7af74b201bedfc27b502b570 SHA512 c460b96ff7d776101c135b9fbcf984c193144b16287da684b123c897edbd5e7537227aed7e0b1a5d11170efbb6a7fe3677048da5b2ab3494e99bafa9053e8ed5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bg.tar.gz 8443504 BLAKE2B f0414b5e07b2b334c96204aed47b65538e8dc9bd603b35dbc4fcf2075901ed2acaf7a6b28b110330ef5a5c81e650d23238dbbb92048d3086af9c911db39104d0 SHA512 14b2835b61e732a6afd0914633397bac48cc0ff6654f8fad5501425b5d2b399d00acdcbbc19f42b71457cb55ef2164afca2087f6e3989cee02f7ca9818048e4d
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 9126865 BLAKE2B 8ec0364f3f9211991461ba092b7f37b896390c1f3d8d443bdbba15a3043d408c51b3c49f006f59f6f62faff446b8c8d7e23326bf2056fe69a8ffc42069272dbb SHA512 5b5119d37ecf351e447ab2df38e3bc536050c8a1a9fa92eac3dceaada0731716bbcdc6dc48ad325cb4938a612b80529f6e5b4f22a937154da8e78dcd85ea35d8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn.tar.gz 9126870 BLAKE2B e85f3a3890761ccabd78b4d01cfed13afcd419b24fb6ce75fda3026f95f300ac1ca4cbe2c4f5510aaa586ae70b2efa986559a6c3da6eaa1032b07f70df3497ea SHA512 f6dedbfe029a406c88f462b55bd30df10a65514705c3f80c4e0cc792da1d67583354245d83f40726c0b8f7f14c5bd4f7eb827eb9abf3ebe1dfd57116b29c9951
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bo.tar.gz 8872890 BLAKE2B ce69d39d615a447430136f471f40496eb5f60924557d72d429f8125263fd95a7c19a49a2d9d223b4c05bb4a4f61d9f3b86906f595835e56fcefb85ac08dcdf7b SHA512 12dc197b374dc994f0e3d1559826ce8d1366ced383203d5750ec754370d41a6723af9505cf960c60b232d6700c64233443b9326315e9aa6b9bd90fb5cd4365a0
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bs.tar.gz 7174821 BLAKE2B 5155bca50828ba2e7bd22ec0dea9177561381c02cb56af6a579ad47799c4166d20237001f7c26b6f84e9d7a6eb298c35cfc671eafb753966aaab16b71b0ff73e SHA512 966ed4800135ceffb082c96d7f0777bfc2417b5557b88de5c0dc4c6901af700a707d6b24dac454d9aed35c74358930c53d49630fb53dde744534e329c179aaf2
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8010395 BLAKE2B 8e4b12d73ab2683eeba7bb052e5d93bb614f035d49f89a0adf434f7965cb1428d53efec75ba8a7d055990bd799df25935680f0fa9537580bc3946851a724250f SHA512 77357d44627eb8c47a9404a7b7ed07a04313ba85cef729ed170d1956f1547e366b0e12217961aae3bd5b172f0750ca6ca4522904cc4a929d1a21ba5b4533d419
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca.tar.gz 8046380 BLAKE2B 0b864325dd62a18c912064648234fd85362e6274ee32f7cbf4884ec80aa85bf5124f02f9ba1e32538578c4eccef6d8611a025a131535c2bfb705d015e3f70801 SHA512 72e6cddc02c94b5513b9511f035a80268a721e23fa3ab06bb81d12cf49d21e0bd3fec0501e24c1c89410a697c3e93adce49906c69f3d49183e9793e8027a54ba
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_cs.tar.gz 7734641 BLAKE2B 8b6dc27d46963ba2a298f94f43697ae89d0e4dcd938ed6fd4b1a67131f009b3870ab231aa0c4e9dd592d2979c9ce75591d00e622b9490ac3c1749b794f5f1322 SHA512 bc5e212e20384c7a1dd7816200db5226a5e48113697d1fb85d95997a10520eb1ffc7bb0201c51e781d1947be3ec016a6ba2066451cc5d3c4e707f63cec1efc8b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_da.tar.gz 7678952 BLAKE2B 7cde65621486f441a39cd0bac2784597a007dd5701b0fbc56c02adf50d2d09bbc67347deacbc7b7ee895ae1cd9dd181393e6e35112153a2c33a59c656ad61204 SHA512 7899bc4ed2f7071a3582190c134cec4ef716dfaf33e58eceb1995f5a68cfe3900d230b1f03a2eacc86992fb1e08401232ee4014824ddd9b8579988571242d7b0
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_de.tar.gz 8191345 BLAKE2B 621eb522ab864dd3f8aea086ae79388341df2c84fceee9f0ff6c8f6df61dc8dfcea7220ef28a20d3847544da19453f9f621ef5445db7e5958e3f22f57c862529 SHA512 fcd8ee2dba06b288e8d3f361dee3c9cd5271d343498188d81407f03cf994520ef8b093adc26369022a60e3dfaac00fe1522da8d5a17356e1646715f4eee8c2be
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_dz.tar.gz 10257801 BLAKE2B 033b49ef42ca5106659119cdd62b23628d54247bd2a91be326d97d4bef22209512d05ecca0f0bbc8a3bb9974bb1e344c4b86bfcf550c63bc00a41adb51326042 SHA512 1e458436f469fdc04bc7f60a669c2a98fe7ff1fc728077b1cedae36285ef1aa095622fe57d8a78aeb2fd619614569031cb00c969287ddbd773feab27c49b514c
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_el.tar.gz 9061964 BLAKE2B cd7d2b71ad186cab50773403fea384a509b256f04d5534765adeb8ab8718b9ae7e161a12ebb0f3d68bfbaa873f51a3afcff30dd35e339334e546a0d626160fb1 SHA512 bb2af259b38b64fe8f95c047eb5e0bac41fedeb5ca761cef025aae5e7f90f203500996c94d14ae77daedb1448679292016a777b2af7bf1eb272bc0fd6978a674
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-GB.tar.gz 6513279 BLAKE2B 004105806cba94ef008400c6e9e84779d09e908535e84b1532fd82d4abf3ddfac079bb0bb49c76d9eb1f38f0c51f4ac20beb4f1e9004a78e93de2b90d9c587b7 SHA512 2f91d97ff1cbe116360e7dca44224fa209c07007d725c81706b4901b02b5a1a6591f6ab93e4e587bb02a95a3b65cfeb7dd2e80cf092beb5b7b54c6a58dcd1529
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-US.tar.gz 6550535 BLAKE2B eb57e0a33947cbb47ce8553e097adf68cbf0e7afe7a0e61d4e001641b4dd1df44e12cc0f090317f43486adfa8e344526f1395b67158f7f6e942b2ca57f1c1891 SHA512 ad0d3a50be99ced2d76e1044b141458c05eae7b0bc6aab2a7e00d35980654d1ddc85aa7d0be68c6db9bd37b1e4acee7724e6fc8da3059bfca4dc51b036428fbd
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 6495057 BLAKE2B e5ab3fa89b1d80882f53f305871bcaf9ce370b6fac8f2ae7da2fb850184ab4d4d5b8ed91580548bf0af71631af9f6eee15e9560e07fb4509676d0977a2be537b SHA512 059f2c23a935c2714a709d929485d3d46ed4439cee8a7f2a71a7f8074a5a285a9e57fdfe487174f737050191050c3ffd432a69b1c01f3cbf858bfded36fae21b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eo.tar.gz 7077037 BLAKE2B 4734f3bf2c3444af912f36e81b4096de1a194f5ee239969f550b4387fc415cd14400ef06c64ad0a31238e97859cbe11d878af8c04e6b7dc40fd5d7bd166b8259 SHA512 fd732d3710a5b99de3072fca8b0ad8f9616cfc290f7cc3d034544d097cefc215651876a72c33a8df0da6dd373061cc8094f7789dd14afb11d36cf016f05fc280
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_es.tar.gz 8102028 BLAKE2B 257ae5e4ef8dc854ebf866b2e4f4bc85cb651c5dd60fbde760f16df3e22d98335cc9544f501b663c2f0a033195eb5a3d22b9d261b790468b169d52d5f9d84776 SHA512 df049e61b29980e7da6300de50bf28bf6d3207d498448cb15023c456d6ac0cdedf9642f5f5a5c2107ef5695fa2a6c4d10d54d58ca11ce18baaea4663f0ef1461
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_et.tar.gz 7604662 BLAKE2B e236c59b210c027eb620c2dfb472152d53e7d8886b08b217474bc16e287f332eda560705d085b296b10de559f626996316474484662263f29478284d3726bf11 SHA512 da388eeed361299dc51afc4c1215cd39ca007aca9cd710886e72ecc4b801ba77bdf9acaca8bc5445d842b961ac9c67f43269159659766422725e022b6b52fff6
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eu.tar.gz 7673136 BLAKE2B 7173c4e222f24eacfbf1a8b9df7c52e546d1dce032c1b39aaed2c7adf00fd63c4639f973fc3e9c36ccb54827144fdead0f8adfee7a57b96f5ecfbe6541c8f86b SHA512 ca9a11351029186531359c6f002c92513d4acc734ca0d32a623e4962234387848ebb7faea90a47a224a0fa1c64d22f870b35537af338eefe49a36ced8d034a88
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fi.tar.gz 7839421 BLAKE2B 99e2f99a7ac0e5dec4b96abd982e186e7e4d77ec19df081364b525a51e58d9d3dde2d46f9493fb67d8a0c2aff625d30c3ddd1a7ac2450b07a81f81a00446546c SHA512 14d436baa87a0cfc625177034c1ff0a3656421a52e6d1e9e62db89e919b76301ac9aab52d4be4af3ad3eee205a01c5639a5e249af9d61061fa538a87c4dd2a1b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fr.tar.gz 8274444 BLAKE2B a15eb2a405d701a37e38fd4d4ea73e71c3093340ecbbc8a08485517b6e065f3fa6511f73262e25df5e40de98775f5b5c7c89dd9c278cba0d09a4d5c7e0ce7e4e SHA512 de35c5ca79a4eb5933dfe1166b2e1970c4016a4441c8855be867c4fb0003d246ce7f146f8157352dfccc1168f5aa97c725e554b2a6f31506e4177dd575c72dac
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gl.tar.gz 7762588 BLAKE2B e06ac39e0516a48bd78177ac98c3fa43aeb0147a15c22ddfb2d2df40e73c3d79f5931a4243fe2a6f634237e4efda1b20bd0b97248f5fb8553fea9062acef6b05 SHA512 73148dc5a1b6a4ffc73529837759ac453002a1e602bc96ac708e579461dc28e2eae44cb2c2837d457572abe709657ee8bac68ce5dbb39e727c6de028ddb518ac
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gu.tar.gz 6709494 BLAKE2B 6327e57ea62f66f9ceea57a4896aff599bfd5ee5d7f99da1c1dbff2f3261bf8e40e3e51bb8c54ec89cc2c0f90424ae870542a5cd87a9ba1271b0b659e21d25d0 SHA512 7d84ab1a56215efc898bd13d18f264aff7c39af5f4c36cf5825e07e6a0db5e9cb444fcbfe4fae73e915235fe97a316bb803e426263d1e25fc73c0dddd911fda7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_he.tar.gz 6321026 BLAKE2B bb07ec0ab65986ae1217c635a7e57809fddfb071792eed8e5c0aec3dd2d097c943cb18b46573b07123c26880420f95be2326c99c71d64b30b5466d2f506c4292 SHA512 491b8f66cb9ac618df976da4de6c229fe32fb39e477ccf575f63f6f35ab2ff1475fa246ad9ee2f18951f7ae22517109289627423031f75e027acc9d06993935b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hi.tar.gz 7360311 BLAKE2B 933b50026afa06915bc6fd2b79eadf3afc4882755ace98ee12f7e2818f9c586677a74120fc6e15a1870410fb94fc0e4263209a471fa0e6151af193e8fa6eae6f SHA512 fc2acf6d4c5509ccd38cb1a9e1dbb78508946b5cabf28c226af9850438c85728a5ba0f85cbcb6f8fb9b86d53208eade08f68436e1cc7057774796a8cb0ef7784
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hr.tar.gz 6863817 BLAKE2B 0e9abe2d33a5cfba1594510fe0b68c9b47017595b7e88e4d9c3c13462dc8db2a256d350d69d6bce13e9de367e37c1b3ef9fc52007dcc1cf82710a83ed77aaebf SHA512 c0c5e9a8f151c4397308735b01b3f8429fd7b88d671dd2e849c0114f14962c7aae3c7eef6091f246cd5fcdb58ed68ce3645200740537c77a791befcf11810cab
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hu.tar.gz 8151594 BLAKE2B f9a36a431f90c44c83fbbc5c839ad73bec64309b484304a4322f2a6e7c95ed18ff7cedeef724659ee3f54cc806502fc4bffe354009f34bc1857e1e293fdadbce SHA512 f87b935b1d8ce4cd4075ed714d5f6cf598be84cfb08cfff77af24221b3a00150200ccc671f51c9d7c3270f9a02380b5028ff592734a541924e8323ddfc303811
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_id.tar.gz 6916650 BLAKE2B 617ea898b656fbd1e6bafa66766b88f1bda85296155d2632da9539d47ba3c3af18d09eaaf3f3a1bfe3521dbabcb420d0206d17bc51fa4f0352af41ceeae63902 SHA512 229d31b5ccf49c9a1360fbac27edbf308302901f12a8608612371aa545e659f9cffa043382ceacb86ac4c4f213c74a1f0b5d107fd0c87c565c6c93c2f9121f92
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_is.tar.gz 6994909 BLAKE2B 32ea3e87f666a6f8593d730ce4117a601ead17cb62771c1aac727c13c9eabd94127604dc82bd31617d05bee9b5c46699db08bdd20aa3b4a3c28697c076f8fc6a SHA512 ebc5af577d41cb9ebbd991739e7e586ae890ef7c4e9638de85184dd7d48829257fe0651dde778eecd157fa9bebbda935cd08fb8711aa722ad925e172d54ac635
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_it.tar.gz 8031847 BLAKE2B 8b486914512b40ab49971e094c9d17b65f6062d7a260791f391cc8c86b3aa413a872d9c76258883784612390937418cc2790e974e0349506ec8d08b699c89eb8 SHA512 c4ed707df5ada91de29ba03b5fed51d41a6dfc465aa3616a6284977d2a733c1f92573cf5d388dd129b3b5b48ac8024a957e5893ed4bb95f65e509fc19946337b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ja.tar.gz 13188024 BLAKE2B 22252229eb353278c14e1bc6379cd35bb3dd3100573ce9c64ae5b788bda5146f4a0de6e740a42cd37573806a529967589bb95a3b02f70fe81cdb27a6d9d9df8e SHA512 6c322afbf7205914f29845831324e06d5a66731e4d19e242128c69cb7c0a6808cc07beabaa4b1cc4777979a9c36bf6d27630b41fe7dbca9193debe38b1604d84
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ka.tar.gz 7158102 BLAKE2B 0ecc1e74db3555f25dd06547271798f269b1978f0020333a41fd3a34cc9fe43d638f3ed96bc220afa25e4441fcc265f2f085f91a49b40981e3e0da950b8f561c SHA512 3b68988175718fb35099133ed9e6728ea7119f24c949c4e6386a0e0b7e7eddeb51d3fb71e6a61dbee8eabcd7581f6c23a2ce278f36e663bff80aa761666353d3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_km.tar.gz 10320741 BLAKE2B 3fab949ae0d89ad74121609d5df3eebef64d8b46f34254b5bd8077fed1f85deb520457ad03330bc6874e3ec560cc78e3865db7231b1fd1916b7bbcdfb951e0d0 SHA512 09d3b5fb9fda540252d0cdd2f593162bbbfcb5e9422fc6e2e3bcb5eeca9a7a2383d3c480e8d552a0e33a0aa0bd9a046df234f396cafee6b74a6ed56f36a45486
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ko.tar.gz 9396473 BLAKE2B f36a4586e4dd64022e79c126f8834573a5a3bb19c1f5d5c08ed97e2797e617a6c5086f8bf321633dc7c720d20d2d8d9c73887ae4e93516f4c36c30b8de42f428 SHA512 a4989eb32c5554eea8ca72f575215285ecca7ad773f973b66f5dd38a4044b589710b24a06449694c2f63ffb7dc5fe486559be1ac82d089ba87e05c636a9b5f76
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_mk.tar.gz 7374318 BLAKE2B 6e02abf41accc5881efc622b9c6d69b16b2fccb2fc60745e14674734b617f90da933b889188e57759f4185efa58f99c14beb7d75861a087b577584ad25bf682d SHA512 a7c8d4e75335ea523d1228324bee87d3227792d2e3f1e55a09a9181211223044c81f8535043ffa1be97856ecb35632e8c0076fc4f9c31e1cd167c478b45282b1
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nb.tar.gz 7728295 BLAKE2B 8e68457f1f21ece07e25b281cb2c2b31da7c7214ed1403e4ed53dee9dab59e0646a481c1127da4c16e4a3c5e2b87ef89cddbcade50396737a2fc7c57a9f1e59d SHA512 c112a6c64152424de857115568a502a98b2fdf638b3b00e34c7345ac62fc3dddb62533398ad6b7ad7437b2d565347bd2260eefbf5388e5e05e4d8880e7dcf4fd
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ne.tar.gz 9750890 BLAKE2B 06255921126f17e8b106534126928d6f44adc81d07b01d7b57c54a51b30ac3eb12b76da3a54152f28e5089776f7d92a88ce32b4e468fd1fc4966dca13263e1a8 SHA512 ad8481bdb55676319a20cf50f357b9247eb81c84e6bcb2cf87576db1046440c3088007594e0851b188dab984e641ad6f60280dd255e4c6b98a950196edfabcb0
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nl.tar.gz 7834515 BLAKE2B 66b2d6a672655c8de2abcbcdfba7e64fb9c7bc7ceb0b7726db2dd8a1a05b7b5732a0acd7cbac4929adf6f6b49127c76b08a09e2773bcd8666481c1f19e6010f1 SHA512 ead5ea351bb79799d002828617050ceae226c988a065bd3148da06ccda0d8da6dc891443b285ff9fb1e5bffac1a7ba25aa166c002a2ceb6af1ad7ebff545422b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nn.tar.gz 7708758 BLAKE2B a6101cb97709c9423f0ce4577e5b090b7dd9bf3b65d1d5f2ab52abc8b153fc7191943a2d879db5177d05601f7e987b88e651817a36d146dcc829cf8ca7a77a18 SHA512 f7679321287dcfcb981a319d5ed37a7ecfa010b09568c79df335cf9823306c112f32130a83e4bc34e636dbb450e4acaede8386bbd936c5c272cc738b99e217a9
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_om.tar.gz 8028057 BLAKE2B 6d923dbddce41857b0e2cfabd4431d31f0a66809fbe578122e940f1d14b378c48ad6d19584e0f8f2907da42ae2ef13e49a11d11bcf44ea24069dcf9b279ff4bd SHA512 01064fda64cdf0d7edf4018c81e2e8b2f6f0541b971b6d33d57be4a78b01dbafaaa74b4e86daf55e84e9403a22fca4ef88bd124c5b60c6b64e679c301e1a47fd
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pl.tar.gz 8169245 BLAKE2B 82fade863093840fc3605bca0476be43f0e5007b0a86bac3df07d85fcb82401add5e4e1af8f12941cc89a8ec5af34e2c71ad26aa5f90065055e8a27a70bd139e SHA512 eebbe3f80b5a762bfb441c35b6b20575f79c175fd0cf70e737574b807e5283588028ab31fc44c157ff28f2039e67bd97579baa7a18236340cc2e95084b0d80ec
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 7842556 BLAKE2B e62e6b8eea1e42fef8322990aa38a3a47f3eefd02c27452f2cf273687299af23034f5907f338cf17238631fa0398eb8b7a28dd31ba513b7781f2c37c273a8842 SHA512 f2302a073a2260ee4ad97512f6a59c25380004242b77ca2118248fd1d6d16b74b5cf2fb47bd9d560cfd16bb1824c1acfcff562cfed81df04dd3bd991d9716511
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt.tar.gz 7811705 BLAKE2B e79430953953b02ac6a0b46940ca6d06e67a8e2d9af9580f9f3588840324e916d0494960341340d386c973b52e4f24f6ecc450c050a5ab449aec2bf6225f356d SHA512 73b54ffef3955fb7eafe458d60a0df5f533a5b7195fdabd262a227a542228c844156c29e74c87e964eb26d167951180791882fab222a981b2037e4c477c689dc
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ru.tar.gz 8460783 BLAKE2B e67b3e9c68318bab932bddb90b1d8eceb476cdc8f275a6c5a9b451386f35ad9e995e982cfcef7ec23adbb75c77a2c0f137c7e9bfae9068dc54a0a399e568fafd SHA512 884c3f052d531fb54ed843eac6c791a13cbc5fb60b1a7b949b57fea2b426f77c48d4380fabc3330641bcbfb62f85943ea3e47aef4d69a1ce56acad7d7528b805
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_si.tar.gz 7249228 BLAKE2B 3659c0add084de35bc7e3e71b51c1d7b942fdf19f1781d28406395033aba565e299f50b1095e304f993548965f286a5160a708aab09b792115154fa60cd3085e SHA512 8a8a3f118dc540ae241c01b7e1e558be6deeb3f0e5b7b0635a0269082826337bf5746936ce8355c5bed8bacddf0e510fe4deeb107337f66eb15cff4bd174ad7a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sk.tar.gz 7551387 BLAKE2B 9a7cc322355b50dc038661d7f0471d3656d8c95043f0e04efa8dd4a54fd601c057807d9ffa25621d132fac34a1351ee66ff407aff85ff0cde490334fc9575061 SHA512 40149cfa3a879991ec5b1b2c45e6ec7428cfdac6193806b1f9d792097d951e9b1a601870d1298c19ffd6a9ce8281d1df3f03f45119103c78902afc21ca75faa1
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sl.tar.gz 7852247 BLAKE2B 24a130f8ea0176616648c96212b081bee9af04b9c2cb8d45123b7ea774881a3cf24f09b2f8fd8e790865619b1d8c43f053b73daa12b8c30000b1b1b11ca4f2d8 SHA512 0c152bfbc0e4ffe40f10a881e450cbeb06616f9ba04599c3c305f0e284f2cfa703d5048b35ad24b4da7790e7fc9ca9d290f2db35659be84175317a647ef929a5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sq.tar.gz 6903675 BLAKE2B 9642bda435a8d7b541cc70b973bb53ba54baa9ecc15114a3ff4a0b0a6b0c0e397c995cb1176d6283cf967824b67139d2c443daac7572589927f88a655b1eaca0 SHA512 37c12e45972934002f754c1d07aff5bef49e72326e2934ad92d445716a41d36ef61b51ffecaa3cca47489c6891759292d7eda5c85ac317d549cd8efd1a0f9b08
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sv.tar.gz 7773824 BLAKE2B 04f4a045896a53201f7d3a679429a6ff91766b022014dc19a2c36717dbbb0a4f71a13a3ea374df0b974a90f2e1fd3b8bb9366aa57ecb22761d8a7c852db62387 SHA512 7571836f7c6cbf522bb7ce0f007255b680108ab60647acb2f6f67ba3d3e1e2f0270fd832f3524fc132f7e706560c3dcb43573f3053f2b6193ebffaa860fd594d
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tg.tar.gz 7209988 BLAKE2B c4931eb283eacaf6d3ddb772422f5a4868a683bb77bc8500f25719020e05fddbdeb026722488d6eeb7d7ca2cdeea02b6a515e537cdfa518d7acc409d9f63ff9e SHA512 da3faa3af32d9b7d07b88cde06c0c2991402220cc53c639af973ffea5f5d6e59f2733618c12f20ff0208d4a8f8ee9876c8ffbc31a502960bad8426db6c9a08f7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tr.tar.gz 7998336 BLAKE2B d9ee7cca38858d874c47961e24ef443e3f3afd2f5acc60c9b67cbe15b4870b75014de0ee7cbee1f27cfb112729eb44b907ebcf3a47b1a52966a994cea237850a SHA512 d408a60ee9e1c2d44199ca2027d7f10768ec8fbd3ae148595eaafa10b016b74004cb44f347a3f2963e926d7a972d5e9f8ab284ad4c6b6b755c472f04bc88535b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ug.tar.gz 6901186 BLAKE2B f6a26565e82636ab30c0d8bbfad946ceb169aaaa68c99af48726ac2b1d7064176a492cfa1ca02f1ba2922ea6cc0d5b8b28f6d8a55a1090150a09e1d7eaddb690 SHA512 90c002d7b1231387db0b5f1aa7f0ef65a249b5611b377440d7bf330b404bd1d42daef92d65f13964b5745cac35b4b4b75e41c35f476f7a78cd804f3bb1e1562a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_uk.tar.gz 7897224 BLAKE2B 9e72daa7338f8932919f1dc2506054980df1a1dc8d9a9f1de78bec3be9a670e05d78b176fa4bf399b8cfdcc7ab96aaf67289e80f7c418bb1209d8a96b9cbbd48 SHA512 63b99672d61be669b3f59dd6aa6a5740b112a27eaee6be0fab35f25627cb159c4a19c0b473de5989df7d2165ff8e4fcbf6d06a51d9d7aa53b458b793779394bc
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_vi.tar.gz 8157439 BLAKE2B b931a796979a93b342756181795517e959d4a7544425a9e35dcc533b8a5f1430e3a2e07727b7d935e50c53741022de9db402508483fc9cf3a7bcf36fa04bf068 SHA512 93bb29749930147471f7a074f8d55df8a6084fbbd37c1151089894c30949b7a406192cac93547c7dccd549dd6e4a31a45ba8c7b8a1270843ebcd21a4f10e4906
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 10730696 BLAKE2B d95465af69bd9a10a41d84bfa22a7dc8f374a455572024c0a8c426d5891095a69c3b3c1c83b38f1f242fbc5c7715bcd57915bd4b1cfb6d3a843946282099c917 SHA512 6cbe01556c6a0566e543ffa162ee487df272d4d5dd7aaf159dd2d8a81e066149ca4d8c9713fa94f9443ffc0a0e95f7c6b4e01a11b9dbde2901e5fe2c58b3360f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 10693860 BLAKE2B 61f680ea596b718cd1b4e7ba589ac08e58c2e1e7892bafaf0d417fb15af85bee3e32a99e40469242c0594f7067328f5b51c51eed1605cfab88eb9e7277136030 SHA512 02a30935988164361fea0bfe902c2dd5f0ca8516f5ba7dc34f54389114181d8883ef4ee8ab9ccfd71bdf2e71864e18f5849733bc092d89325ed7c42fac6f45c7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_af.tar.gz 1055811 BLAKE2B 00c7cf1b28e001c3f1b3e60391cd244f70e4878a7b685415f76955de3a9c226f55cfbc791f55d6fc3a2011ed5bae7f25bc22f72f211b8116b6609db020f7c4b6 SHA512 d3d36d8ca075258046c8a69aca76f78c06d8ca4a3986f746a5b86a0b918d43b1d0c0ed5a32e865280258fcb8c8da8f6c89c26201f99dede6eede8f4325a44c4b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_am.tar.gz 465828 BLAKE2B 0159d189288fc5b93a78cd6235869843a85b9f452d897b927ff6c24cf50a763fa35e8a5fe73bf54f931fa2eb8baebedb84ebb99bd4a7b31cc6eaac432e514b25 SHA512 4f129a570a48b1be900e5561db412ced19ac4c3fbb9e07f87fbeceae4352f0ab5a867501ffe076d9bc198251d6af4e391365f4acab6e7adb4753a35221b935a8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ar.tar.gz 2205766 BLAKE2B e640763b07a7d0d9bbff8505946aeeefffd1244a383ab56c46bad43c64ce9a545aa486c3171c7b2aaf7927d2c348d0df19339e1c9cfffc4bf613ca9a82c3fcbb SHA512 b06751bc8e3a27e96581791d0ca83c762b7e9828739b1643723617f65ab79be6a138da95945de86711969e4f58a02d669ab4023ef449a2f565ed5c876a0ca9d7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_as.tar.gz 482858 BLAKE2B 0130e7f1b655f4d3181d29cbd7ca2be418c8307dacb738b697f0c096f3698888f2ec0898b731030ff92a69010510149ef7f4c0988b6033f581eaa2ab832bd04e SHA512 3032a366661e63f26bfd806753ef94c87e138a3b8b0304183367b0c174659f60f6b23b4ef740b8db33fa0bfd292bce0f59af747639a10d0744c37122f5557efa
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ast.tar.gz 443398 BLAKE2B d4428edc5ad94921a1da4333ca91e18a812efdf7918b6805a67153b086492c327b8d0d6752151d07251fdf474f1470d275f90e692e29c80b8ed75212ca168037 SHA512 5f196eef5cf58cc44a69e4eea9e3c7d7c24d141f8900dfe92cfc0b90e5ee76f07166021ac0e9542b2942fe7511cad225a80a8c2a45e30dc2e502103b6171c89f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_be.tar.gz 840890 BLAKE2B 8b96744a4072cafe010ba9da08219319afa162bfdc0c4f94af447544eab8a8e3ad1e1ce7cde46888a0f7e3553c94fa0f5c696a1c5c67e5437beac1144c75d457 SHA512 fdc98a22830b2919ed231b07cb03099baadf28c6206b9d00e0d2e069823e023cc9d43a38408d99237971bc966ca9e1adcc6d706cc3ad8ff68f2aafe56eb7171f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bg.tar.gz 1903190 BLAKE2B 57014234395e28fb9b688ed558fd8b233b1f6625b59770b5a123a3fbf7523ac49c2fabb4262f65b5e893e9b86179bb64b2cca8528d90e1bbbd0150bc577b8784 SHA512 2eb06f0cc2271d2fde7be17a7085c0023849e6102e9e1a8462e65390408177fd6e9e63a005f075541c6103f57ca4e7fe62d11b21d64dee5de52ad7764aabcd7a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 490244 BLAKE2B 8b90a2ceb719b6127fe27d2e4ad9cdac0d0ae8bf8c7e971a3b4aeb7675deccd5e4408734f07cbd844a95be5c68fea41964a5feddf10cfda8d0542737ae919771 SHA512 e5f1f5374d9224fbf4089527fd69a5db4817fe1895a76574e1dc2b5dec6695e030259aa7c9e893bee043e2dc230a74c52b63f8a56bf97b5323f5f09da8d153f3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn.tar.gz 836402 BLAKE2B adf462622460d733e293609f7fd0644d3ada66774a8cbd7c8214cfde0e5d31d5d3f4fc209200dd4a365cdc7e64ca792d38aa6df025e1c9c577bf3d72fb1b91bd SHA512 8bc00a0c3922d4a946677fb0b99fa5b64a27019bad7173941110612b25f39cb441f3f172d0624d0308670f476b0942da83464184d51423f991ab15dac2f13c9a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bo.tar.gz 473547 BLAKE2B 1c3ef53877a11e465ad2d47de2e5246e3a051d1efc5a4828d4e41efbad9a0db159fedb2d4167901734cfdfe821e84cd3cf51e002f7e572e329d44e704d6fb333 SHA512 5ed5569fc94379d780e24216e2419460508985c169e3c4f448494d177885af57e2f1952988a7a1399e17a076b08c1ed0e85b56e51d3e42a7fbc088c9d7cb630b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_br.tar.gz 1662501 BLAKE2B 00d68068692ba51d5821b79592efaba21ddec537e7878eafaeee4f4661d4987af93e073fb6aa371f664455872c682fc699bee3b67812ce9d60f33eadd59bdf4f SHA512 281d94325d923bbc7a1ef0ab1e57d5d50f6469734fc6ced37201e3f9e14a3cd8a24d4c5aec773c59c5b6f9305fe1c5e950cb9f626d882a4e6c21a25d0d1098f5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_brx.tar.gz 450989 BLAKE2B b9254485cbe3a8964a01075dbff48a423fb38693602a46dd35b43f4f85281f9c7f2a05cac65fde6c211eb2b68d0ae0d04b25f5264da887084fa734de23fcdb92 SHA512 91184c70cbb53591583077730cf7c6f63377753315ddbbfbbaa49145081423e1d48a4cf7d9b68662c0c86c5d3e28b575c3058e0cb8dfd8dc83b4482bc90484e8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bs.tar.gz 557612 BLAKE2B cdd350a8f989b0263cdabc8ee68bc13d6ffb642588055f84a685e31b0adf7fa351109a42c039262fc5888971b792b5ebfe19ff9e18b5e58ba619260ebf3d2786 SHA512 11005fd44dfd211e5f16ab2ff6e3d118f16c646bbf6fd7330a9659b5f3d01b53e630af0929a8c7aa6b949537210239b88caa24ed9fe1a875057f8bfbd0e27abd
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1715018 BLAKE2B b4ddb2f902ea007e06ef0b2cb9c470bf77fefd70ef7d572d289564eb4676abcb94657ddbf64993529c75784fe0ad6f21f6db2bcb028076f475475c376e008fc2 SHA512 4ca691fc66650d29993bbc8e4cb4c00b5dc535626717709f8002fc019afebf55bcc6af230fbf0c1bfdf767f9e6bc6551faf2f7bcb99d0058c3b0603d25002dad
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca.tar.gz 1716527 BLAKE2B 81af95828df4743d4cc87d69a795aec3bad1be36d5cc1e8a2ccb40a03b27689c02902a2525596ef4f9bdb393196f60c653b62c46e5041fd386fb9b605c43dc45 SHA512 d876c4597ce702b39606607c92e49cab66ceb03bc8afde663eda3c13db5d58512b9718a25446909beb115fa178bc1444aad8983a6d242ea183450ba438b42bc5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cs.tar.gz 2883658 BLAKE2B adcfce18b8b2d9ce6dc2cb4120bc0d6765aa452b083ef666e34724b1e9833ba7022b111f372e03e863a0f847a362d4f2a35561aad906f30a40fc3ffc0d1e6d18 SHA512 e8e552c3752c8f967ef26d03e958bada7d2230f3041b2cfe72f0b2cda0ba8e6813d76f30f74c34b9aa0f720121a90777976ff531b0352bc19f9df236b5d3bebf
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cy.tar.gz 426386 BLAKE2B 1bb3a68de073806a34acbfd7b7b4d05c928953786b96848b8f4abd796d15e1f2083c040263b1a10332a320aad1a24e4b78e6b33a3bc5c88ddaa64af55f60fee2 SHA512 a5a7869b5d45420a7afc55fa3e3c5a0ab704106102f381b26133a641a094fa35e56e56426560958b48c324e353e5428ee386ab97c5ae7dd416440f1176b1b89b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_da.tar.gz 2329646 BLAKE2B 2ba501eaaabece0b6cc1d1a5e6944075e85a3561b5b544f6385e85b1ecaeea29110728e1af5b5905f984556b0c5c5184af39eed7a88733a5419ae6948784d154 SHA512 de4514818c841712b22555474b37d9bcdf68e9368b2ada25b3e9635626ba43df2c3d14269a1d9a1f0ce0638696259f51ad5c99f03bfb23719b06e05055bb375e
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_de.tar.gz 21457044 BLAKE2B 3b82023bd5d6f0ccd3f8ce35398a39a3a6ef24e03b49f36f640b055bf0cd0ac32cf193f356870e25456fbb18511126f47cd6cebd8231c28dd60cb24bc2882db0 SHA512 496761842108ab88f96ee17e6fbd083468df9614d83b92adb5319d27b31ab308f052ed5c481318fb22ed5cd8e98a9520eb8e44fedb6e5df5310754d9d1d6805c
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dgo.tar.gz 479017 BLAKE2B 0b892efecdb23b3b275c2f1feb661ed48045a40e07662a4c71850a9f8597f4313fe759961af92caf0cdc3813e6a9de89a2898b193b328df4acad1becb7a6c06a SHA512 4ee62faba30a11e0246c378dcd767f46ee8d513b56ba7ea484a111767d3fa474a86eba7948fc1b6a36f7dcd9778045fbfa6952844159e6bb7db8d38fddac7d78
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dz.tar.gz 472173 BLAKE2B 0c175e44ec9e8f46e4724c3eacb9714189c291d6233b3774e8011a450ba4405431981021ac9773d97f9e24e64875d4e40abee6e51afdab14231f08582e33e1c2 SHA512 15031e1454e44aacfa12cdf158013633afbba5bc07eb56090ed7cbcfd4a0bd725564e46401fa791baad3a6e9744e241142ed7072537fd89ca1aeaab4d747341e
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_el.tar.gz 2520607 BLAKE2B f2f18f451cd7eccffb063490af98d4c08673f6fa26a8332d4aad3269e02c4f08ec40f9e71afede7b50340ed992db82bcee2e7d21765dfea4aa5a289455748310 SHA512 1c96f797c1e5553bbbbd24d776aaefe541dd4e5bd9dc52906ca5ee430b9d73ec6044e8023ed305862ef01b4f0a9e0c0128075437b7e4b9176e5e28d7fc707c1a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-GB.tar.gz 6962987 BLAKE2B 8ebb0f3b22f9b75d19103d1e02c4394cbc7c43894b23de790aa08909c9b6e9b76dc6ab677ce7c47525b1d196b3a4d8786e23f535abf1e8ee201e9e4d515cc449 SHA512 0d3eaf438e24dd4ade31f8a536e59edecdae90ae2dfb46379adef7a2cd6800575b61923b71ad003cd42273b4c7d4a814599e2105a67de0406587617359b77ae0
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6878065 BLAKE2B 39cba0ba8f7323c5870146e0cb359252723d5c610840c7b0192ba415eede0a4536e96929e2a6b443bb163f9015ae8dcf6dbd28ef1a58b5918787486b2a0a93e4 SHA512 488d83e5ace8fcde3cdb2b5de2e7bcc3d539140c3e69eb711e575e01d9041a581fa5f924f6f75ed15ecc1a22916fb2b3387c2d8068fdcdbbb418156b63ac92e4
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eo.tar.gz 422555 BLAKE2B c15af426b62c471cdaf31c4ebe85073867a5015f92e805c22583f55087767fcb69e21ed5ab93284d37d0934fa01c9df7e6a61a795e8bce4496755b40063b860d SHA512 7b4d4dad2b15e8fe056f14c236b973bec6ab683fbd8590734cb76f6c5bc610cca2213b70c037ff34edd568eba92a8501d1fad7867a063f6a5695ba4c6bfda830
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_es.tar.gz 1922492 BLAKE2B 92828af1a02f3c17fde89d885c4855f682a945cd7742b9f2938530c7dc245dd5c891cd736f9ddfa3149f52a8d7f92590a1e66cfcec744cfb0d8b159481a22125 SHA512 3614e7b1e952a8787edd058ecde1a7e9075b8899ef6956c288df7d6056a5a792b4b7dcfb8fa4e1083182eb048675a4bef234225d5496bdadb31b447f8e88bb97
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_et.tar.gz 1333866 BLAKE2B b9a56880bf108a344e0bbf049c164ead82e72f3908191e5fadc385aa1989c061596a7d4eb1152d1f04b12c73e0f5cba9ec7f3db55f22f7d0ad04b90a429e5bfa SHA512 962793f3a5e644b4dbad3ddf9f0b95721d89150a063c010463aad0666144c4d7a402050c7bcdc1b30b4d2284eaa089c4dd4dd1f5502663e473063f2086ff571f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eu.tar.gz 429687 BLAKE2B f451e7ec6b37534ad3503fd81dc99828db6bb1b5ed1399f3e297fa93f36394c09873c92eef9c7313a870ca8733c9e19521e026b7e4bb48b9b1cb678353c10ec0 SHA512 500764b5e28e37fbf843eac440502e567086723a343d87116685b16c7769e13406a760eb6ebf309aec5d128f40b552613976b2e40747ff349d07832f5ca10a95
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fa.tar.gz 448867 BLAKE2B db7885ef2d850acc92c996d150d30555df78084ec86b4bd5f1f58b9e1be9fa8613f75160b928663d08b47cfac56ed27c2d029d9bbf47b92b5b8457d944caa1cd SHA512 795793815bc76d3b53d8f1959ebd5507f4486bfa6028cad65d3f2e29b8b1c57afeb0e61cd5cf61be99b8ba3101f5bf3fc6a9f04ed0426526202447109bfff1ae
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fi.tar.gz 436649 BLAKE2B ffc7bb02c4cce92bcbea30e6dfded15664e222598f3ad92141314ac8ee837910ab2a958d8c86f17774bacd5c41c61a2c9721e117974df2c36d29f536dec70cf8 SHA512 6b7669040f4024ddfa24fcdd6acfa2faa09ea8b13cdc881f099d42b08d0264d2ead924ec5ab660c56035cd027c17d6c03639a1de4bbd797a3f7c6fc419aacd0d
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fr.tar.gz 2731907 BLAKE2B 762249192aae64864f3c431b54fc81574cc35ebfe707e63f71acc02bad34e88cc42b37ec8ba3e61229d62173017e045513b4dd26ffc84fea764feb342d7c8743 SHA512 b67b41d09a03c6402395539333ed30b2ab9d6da5754cb100138f1c165aad7ec9dd47af64dfd1046e747129d1ecf6f14105222210c49840fb22650c1a6151e917
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ga.tar.gz 446708 BLAKE2B 235c093b18be10087ee76914012a93862cd28dcb4bd35cf728bee36df57a7a15fde729b968d4e2e39cd7cc4a39a97b878cf9936b36dc138d4faf5e91ae6e7065 SHA512 b973c78c03f5d24b5b81300d81453ccc8ac82c38e225d3d19fd9f298e2c37af65c3f2a045080ffe817af3e60e71d80fddb9f159ef158db902bab0adecc19fee5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gd.tar.gz 1480768 BLAKE2B b63549b78edde2f20155bad5773381f5950025a2565b8ac64ec08d4bdda3e34e4f29e1c5ec0530298c446edb29c348b01ac0a0a1f0c59b90a0f49224d1a64af1 SHA512 2b26005675183fa995be394e97df7fa33bdabbfe432be679ef153720e7b7546c05151400d9170750099f37f524dabe2b221ecfa5655bc531b124b9185baf8bde
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gl.tar.gz 994690 BLAKE2B 1f453ca031187f9be9108cd0415bbe66e76dde221d7b20e360c43f1ef0966ce2d15516883bd0bee144feec9d6b815d9f8d13ae157e59f65152321d673b01f62c SHA512 deebecb39f7809f95439639b365bfc0c5d933154187036cd046f6a491d3dad4b84052b22cf710145a153b7a23c5e18cbe2afe7b2dcba0cd47f4f4cc15ce45ebc
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gu.tar.gz 1127629 BLAKE2B 9b99c6f46ac0eeda2ba4365801396f5ba53f33fe897c031f42703abfbb8e090c30a8c482215683428c0147a3a366d55543ddb254aec0f5b25efd2f91d9277e1c SHA512 dccbfdd06532266173088ea52899eb64aaa66e6f8f08bddd1d8ed0b862a29dc7905280b5fbde8ee11d5db97665b0ca8e3ba6f87f617c4e07a29be662be72b2d8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gug.tar.gz 445844 BLAKE2B 4d6a87d40d748edf3f2e5ab3cef4944ac604d781c0fc34e65f924dee93ae619faa39d1225c83839e111baeb5eaca63a3151bb75b31e5f131e5f765042c65ccf6 SHA512 33615bed856c3f8ff6f2f696c55e55da3fde7076d9d9eeb6bfef2ab56e48fac77a02f8c164295c7ce036515fe8da660460ac8b199447e1bcc851255bc6649dc7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_he.tar.gz 1536086 BLAKE2B c28c00b7ebc899c88e9faf80f078006f677bf67e25f4ee0995a6bf27553ae80668978696fed1532282efabecf1ddbc3a79718ca5ae9468ad7cb2cce7e12aa682 SHA512 dfb085f5ca74e8b4a9218b5439138300745bbbc27498d5b8aea5fa9ddd031dcc20c5ae1c1bf9c13f87fed38816f20232dd9e7f66b129b5605898c8f587704372
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hi.tar.gz 546905 BLAKE2B d4b8d9bc648d05a09a66134c9151129ed695816e1e3622174040669232e18fc630f4efcc893f92cdfee78714abd70f924de366f6a5c36f9f7ad41a8cafd45a29 SHA512 7a2fd86c15c29c31b2a255bab5e95948bc9fc4594a8b4bb8fa358537ab913aeeb78aa53840262ed5259b57c4ace7a8049296fdc4fd313fbf73bfeda33318fa31
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hr.tar.gz 678838 BLAKE2B 9e11e80693aa77949bbc6114332a145f35e1fefba0c1f4134decb483c03fa760c0d8e342752f112fd348fcfcf256ce4fe37bd0b054128c938f5962f4d08095e9 SHA512 533f26114d731de6c11da4327e86c9553bc7d7f6f44243a5e061649faae002fdf6b34865b9c68a687e0b400046f7c298ba6426c8b733f4185c6d7edd6faa3afa
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hu.tar.gz 2658579 BLAKE2B ba80324dd2e71d5a01e937ff2dadc8d0ed619ae6437434ed12a1e0d8a743c647eccde9b7ac26230a2338470260721ab79f331311fbdd5adb7d1929674360e11a SHA512 5eb12bf86a36ec08a522bff47a53ea88a266c108de7e11c4c1bbda419da557cd325a55b85c933ff2cc70dac439f916f38508d7f03a8a60c65a780242efc065e9
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_id.tar.gz 422793 BLAKE2B 433b79d74cc20b37307e6539dd5ebda024027d57a63a7e5af3dd9865de35687bbd4ebf49459832a6dd357a952b171cacb8805b0a81ecc351a9f3c5bdfb79dd9e SHA512 2f3615d3a77fbb5e71027881930c824b34d64eb8b523ef157b897ba71c3bf1390cb12b4a10e80716748fa49263fd1efd9503f14299587f699f62f7b444ce1296
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_is.tar.gz 1233403 BLAKE2B 4fb6874a684b155819cbe91fcaa6a82b58fecd74a664c6e69087def064e3d0adb5eafb399cd1eca00f8b206d1e2b2c6d348d572115e94318b68fb5177cc897a6 SHA512 a5178a450a97f7ffc4894ed40c5169b89435c35806d3df5d218bbc59f6fd67aa5c373186ff8b81a9f5870598da16d0d93c08489f3c00b030e05a56406553a83d
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_it.tar.gz 1768576 BLAKE2B ee3afa295ab490537974fecec63587a725e3d2b127b1cd07ea0f7b9e048ba9025e06bb67193ee739dbc864749da5d2ebf3945458f9468bee699ee68f39135bb7 SHA512 d5d447ef153401e8b802a20eb9422346b8670d1ea6c6f8ee89883d137f798481525ea92a86952a19291608be1274655c9743e6bbeff3cd3e03af26778a175ae4
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ja.tar.gz 531043 BLAKE2B 440b7ef84cf8e4226e8f48574ff716b34cf672c93b894e2c23ff4362cd9e09b50b0fb2c7a7ade3b18401ace20ae8269f8daec9e2c805de4c67cdb757b8ae64cf SHA512 4dea93d1d3f81b1cd4f95d8c1e38d2ed91eefdac746701032c5a47c8632c92a4788364f5d0592b63ccb28d77ab10d5f3b03a92789f56a5d8870fff03f7150328
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ka.tar.gz 456773 BLAKE2B 2cbf0bb4ded64987069f7a9c88d6f30a018d441014f7b6679b6483f1282ce79c8afadbc5aaa39329229463939d0e2d8573dc4b92255184b408944a646eb610d1 SHA512 87c8cad155f33c87b8fb1eaa1bbc8b53147d9c026be44f3cd42296d298e8bf1fdcaaef386a844e84fb4af41f2b11ca7070cb4089ad026b77fec5c8b61074c455
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kk.tar.gz 479299 BLAKE2B 9cfabee52123e3c475cb60516ab0ac1015964ec139b6678e360061c8d6e015862cedf5b4a7d61b9b76c22a9d3e207a1973ddad04fc8ab786f598606c6642a8be SHA512 b5d5a22a9a0b913e381851e2e3af93121e1e6333ad6b39449ca77b4263ba169092e5e5836fbeecd3e5eabe9f0f9f52f8becd666bde8a70bec34401ce669838c0
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_km.tar.gz 579499 BLAKE2B fb63589cd2edee2d4ea1a40dcb01324565f453b205ffcc39c8c9966fde823164fdcd469132fb838d0882c48addb494a09a4636b0a705a6e37f30b363ea0765db SHA512 6327cadef62a65e456ef3a34ae9b58228b770d8c101472f69a012a04948649d242af9aa86cce3ff7790a957889f08ee1905f99f3c816b34d31a108553f4bf2ed
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 434285 BLAKE2B 8d34a26010b10205d1bbc5472ff10279acc8c13d5a0538f9c92db997ff3abd2640b0da9b0050e2a4b8802d81b8b96581f76914b4ec179036bdeaab08286ed2a4 SHA512 f4464e9fae0db2a8c1784c22ad0337d3098b4047322b1a29771725874c33b07f808b9da794bfac8451b1790ea37af40c188addafcbbb7b76da20eb266bb7501f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kn.tar.gz 495453 BLAKE2B ecb2ed26cfa5e02a66853959cff2c6418a54ce2c1d9e04b4c207ba15c772fed9786686034ba455f266bbc7d3ad6cc10ab41f86f8ef6f3ccb5d7af99349aab6ba SHA512 a5598cd3a205552232eaadbde1238b369253f6a881a1d37f5ae4fda0ef12d5219dea0e7788cf2405d02ac00b04301225293c7a7603e9b76d35c9f8cc79ec474a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ko.tar.gz 528720 BLAKE2B 392b54d452dc617746f607d366162e6d7296185bd816cd2634f2d2a2633b61597661b967ea789762d26075170ac313b41577e811478b5d01c85050dbfb6470c6 SHA512 e27ed718741032980c59b54e2b0b8beeeffd0c4822122286f5564d2520457106c615afe1e5056c83406a22027156ed2017a27eba501032b44746585eeafdb85b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kok.tar.gz 473165 BLAKE2B 4f59cc86a55311eb8dfbe6d5bf218ce74df1dc89c36ccb27c4436a194d95099da761e3dc9014781a2e6cbcd384a0f93b55ec88e5c789260592faf0269e859a1e SHA512 c124c2f2de9a1894a7ce99c3ed65b22cad81026ce96d571d3924a8c7ad527635b479f6429b0d8771b1c0160a835edede0c8902dd626f075dd2fe169b7e2a1aff
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ks.tar.gz 451568 BLAKE2B 82ea102b65bad4c88615b8728ebb77c392c87650c5935ba7baf3989ec20e5d60f06243896daaaccacbf77167290498aea27ba488e879710ed57d93b23ac41fb5 SHA512 20ebc75c1c901b2c67d2861971ef8b308e813e22effd5394f97e78d9f30a6a93792e2cfa517a3e6d84ad579f940bfeab9c94ef903681984959dfec942da6e6fa
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lb.tar.gz 411974 BLAKE2B 41d57260a26dc5211cf4c7aa845dc2dde169e202213e7930171e5549f37e11c1e5a7623dfd3223b000be35e585785e9616099518803f255b01305582ce36cf1b SHA512 f0a1e3c7d11ceaa990d10ba26816791a1ef49c20d9ea71150d9e8019347bc93e47fc639180681399ae0cc48f1ae0e5a3ee79de230b8de39b66bb7ab36fb87fc3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lo.tar.gz 497062 BLAKE2B ac2be7477bc19b66b79f4337f8d39557f4256931c6e2bf60e626fdeb0f6ad14765329a90267b9cad8d044c4a58820193b48f33633d00b5df67ffcced6b2aeacf SHA512 408a6a0f6247cda55c9f47e5dcce19686af6fb815c71e42b753bde43c10cd735180bfe680eb26ffaad9135f9a77867aaf9bf87b717055920560e40e8833b69ed
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lt.tar.gz 777935 BLAKE2B 198bde648cccccdf7f85a7431ecd785dcd24426d09e699564976458d493c22be31084fd1567a809b9f97d2eae81cb4867ef12144c61d8ba07504524e5745036d SHA512 ae9d3ac2a0b664e488617779e16fb075c5ecc6bb19fa01b098e6767ee4931bae8e2ce1e800accdbb515c25823246f92ce4a05c76a69ae89dbd01f6f2c0ec72e8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lv.tar.gz 1194028 BLAKE2B 3a51bba0ad195afe574cc87ef3667cba4bd4d4a91916b9fac15296b22027773bfd97006300b8cedbd74afab310682f590cb6d2bf3eafbf246e2ee46b73e63b91 SHA512 216ff43f2f77d5f7c1e958a0e3ced4ad7e0757ba799fa3fcc5b3c66fcdd2cb875dd770fb61aff5571595979c9f914fd1c65951347e58b0967a663b9c57e0d5d3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mai.tar.gz 453562 BLAKE2B d28291cb19499925190254fa7c59a5cb4dd1592a9574d7fc97186a03687f02fa74365a8b0e9803e97dac42d961865361f822da973f52e535ae3e8678711af89f SHA512 5693fa9cdb3dfaaf43c01ba1f9bd1903fafadd9ef974b51cc35021c7d19e633f89b9dbd825546202f839ef3d9fd85263a21a3b96e4c8970f51b8eb9754b4931f
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mk.tar.gz 454191 BLAKE2B 8fff4a5215e003331ac3feb1e2059cf24ea18cb74e46c3a0e454829bcc9fe5510dad1aef83638b61f426bd2428d953824b75cbaf527f72d9585e7ca079e61d77 SHA512 ec4a4fdb32261093d41e1f2c7367cc7c518945be5fdf51adb74fbbd0581f5db01b78ae3a15f761336098fd5dd3041342af915f71090474193e62f067458d92be
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ml.tar.gz 494089 BLAKE2B 32081027360e10251d67795adcc8c72e820e03104341e1a1aec0fbd80cede88ce09423e66c975bdda2ef2b0bf10db04e2ae151aa0a3bd9211cb8148b6a02ceb5 SHA512 ce847588f1755bd90fe67df4d21673af5347a1d3ca8f1b9490f82663ccd193480017f2c12fa51d3df64b0d8f2fbc3f9e57d97cd584db652fe246ef2ecb430718
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mn.tar.gz 544456 BLAKE2B e4f478781807a99f7d0400398db0e1970198cb65c85f0975ce8531099d5cc76344ccbfd9745e417ed4ae06054d82c9b55bbede63c2011c9cac84669b43f732f9 SHA512 ec463ccc8a0db7a7a56ee4c9e5f132dba64a31c0aafd75fe8c76d3e6f3929dcbe4c808dc154ca46430f4df4d9d55343288ddbd8e3302e0376e95ac8f98e5a41c
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mni.tar.gz 466457 BLAKE2B 7d0497e85343719f4f6be0ed0966e92ed39fe2da4988c503b912c078e093f0dd2716378f791c62728645347105fa67b574a9553f915af5c9f78af4648079dfa6 SHA512 06efd4aed5ab087d00d345485cbc7dea02b0562f03bbbe7e602d1c212fcafb215a46646049a13436ebf27acdeab70ac4eee2924d3af0f57fca3096c1326a5637
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mr.tar.gz 489781 BLAKE2B a320db947547ee2714acf2508a43933901a8d638e5758111ee616f5095e78b51424265cfc2ba0ab37d8de5f5cf92608039da53bf45a0180ce582516ce403dfd5 SHA512 8d00cff21a1087a3565a6e0da3473b43cf77a69a58962dd4f8f4b6606e53d0c07462e2588fc34b846b636a706b6dfb6f30b15536948c3ffa2e89b975b9899f74
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_my.tar.gz 485477 BLAKE2B 0f464bdf6b26466ac94a52b745943d7456843afe6264cbd521147f1025560c69a3fdcb7fb5bd0014c8858c2061c3890a6cd7d3bbb95e9bd4d52bb0c7316f3163 SHA512 f54e8e0de78d114ab068998a56b16e259990d00c065233826bb1fbeec55b01b297e72ec58f5d56bfd268db686ae6959cc5322d05369851aa9ee8a49810d3be94
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nb.tar.gz 3426527 BLAKE2B 05d621dbf2949711649e81752a7c6a30d80d8036503c7187d81c94e5c0a3ec1d692b23c4282cccd0c26e9624fa0fd08be211802faa5045efc4cd73b029030a6e SHA512 6c5b5e4ff8102d7e898dffd7163a4b6fb973cae73b77ef82ac51f0e7c54905cbc2cf018d05d361c6e579a7d9d7d58b259b25aab1c2b3fb1e106ffd1d4e9342ce
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ne.tar.gz 858018 BLAKE2B 6d9ff6ffe7251c2146a81acd0a0e2697625b9a5f8f585b517cfad7e1212dfb515d7ed7444d60e99ee707c2b110c56548f85561b511e57939f4e4249227c93f47 SHA512 fb7467ffef645cd1a209d1cae815e85718156f2bb8644dee8c6f3d9a6c759d19159cff1dcd43bc18475ad6a1e1f7af14f072ac32773ae578b8e08f7da12e7844
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nl.tar.gz 1226455 BLAKE2B 2af0b98c5ba196ba11e629b6cf80a47bcac133064b63f06cec263e525aa6f90f1462d57a96c14b773e85505b560b4175f701ad1a9c2bc4dc599b0c5ecb436060 SHA512 01ab2439fb295931d6a22e615fa50e421f90044108deba346c3d9f6749dfd63e6321244ca320f46750a9d0c4ea61da2aad6514d2b303ecd41c6eddf8589aa3da
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nn.tar.gz 3426125 BLAKE2B a7eedfd82abcda53041422965fbae0b1601057ba4ed69fc9e25ccd8449c4be002c81091e09aabc180349fb8b7c813d7d0bbb99c6bc72e7a343847538dfd3fb67 SHA512 94131efee13d0cdaab554e40908ae01e66f03dd7a0df44036f6fb50c71e4ffc4f1b54e82094c15cb09868436547a90278d2effb4ea6540e4f636815a6fd712fe
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nr.tar.gz 432062 BLAKE2B abd0060ec69b6f52c067ca5daf950266225b4ea70e2b2130d4739e747f577048d2e438a5a232cef993fe912057ab24ec836b289e66064aa56b72a26758df771d SHA512 ce589131f3c183b3ee4730e2dda31f56c1efc9300842a1a699337c5aef8ec18f967132e6057e23e459a3cf231b728e9eadbef86163ecf4637ec03354899d7e59
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nso.tar.gz 431144 BLAKE2B 6242c5f91be6f7655c53d5e9cbe961221475ef7c21a09a8a4908c4ca49ee7c67b09326ea4369d74a459426642584db7d074623cca753a928f2429d531d3f3a4f SHA512 fbb3d7fed31e1b7a253ce6737552def7ee9b66bcc3cad2122ff1728846865a010f6999ee4f64f7871742bf2ea73f876f868f16a05c9d63386739298a5d972a7a
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_oc.tar.gz 637646 BLAKE2B 9005b67cc97adf8c248b5053683e2d7d6a6de2faa42ea827fd2cfa8675bcb72361249c5a8ad7fe15f37a6b19f469b9de1e4d4f5f80294bbc42e11e5eb35af028 SHA512 044412fff6ae0a3529e7dcf2bc203e1c7bf6612ed9a6446ad767b13fe86ae5bb5cd6bad55febae085dab593c8d3df404ac42d2c9cadda4ed7743c1f9f2c94fa4
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_om.tar.gz 426351 BLAKE2B 76fc8cdc744c0678d2087b3641739fd61ed2269bd3b5bee729def6c32a822ea4da2b1a6a3404b2bff53b2d043a0dd7ed810c1462729dddbb1e5eb9a238440972 SHA512 1ff9038bc0f5698fe543c51f6ad3f2b3bd1c955ff3dd69578a6787493e5a7e3fba3fc1a422c2ff87bd6c7bdff7f26ab42d2dae2d5f4ce4171ca6c754f954d0a1
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_or.tar.gz 491372 BLAKE2B b1d4bbbab092ad1b5f98b6e2b4ebef6fce416928d7c322d90e84409588aab052e4b7a5977bfbce3e591921762eb98415ba1104ba70e8b02029ce7684b1a856a8 SHA512 ce4fc1e1e16269d0a3f16b46e9af8444d40a42cc0fe1e4820ad3f20a77e804be064a94b40d000c846d11e85fe217a1d1e5ab0a1784261427271f6cfc91005ee2
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 463032 BLAKE2B b3427a1193b5d8c72feba4cabd48581d0c7c4a2277b3239ae47d5430390562476536b8ea804979a30d50707c57ba32e19ed240a8092a73a2a5edce461a384d1e SHA512 ad27e06cf20bc2d9398d60cb6c8a5fcc57126fae6b861bb4d5241c9b225d1bd7cb3cf0eea1ed577e412557b6a806812aa397a91e0c960675d3a64cab684de881
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pl.tar.gz 2794555 BLAKE2B fc6c4a1d6a887453a40a69c226376c64a26d018e85bf643f123d2e66b81d1e2fca865d5ff94a1552e875e9fa7597cf9bae9803e0fc832f9aa233c3c11b2ce62f SHA512 8bb839c45aba41187f82fea92d1ced595feee95b47b3b515520642bf75e90659d0c9a567febc531d6ef946eeee4bae957ab02e459181a11dd70df973cccd2460
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2517153 BLAKE2B 9d400bfcc79e271d15d2e0b47f82cdd0162495261a64e7c9ef14814c7a60d7ef250347ad7c7f545a250c1072cdc26e76a0ab68e52bd622ba5c7ad57bdacdb06f SHA512 078457369fe28f957d6661e479ba62df4d9fadd4a537c2081b9394583af0c5b0937d6fb8a8c9f5ac235fa4d5bd56bfd222c54dc3d901348e8d36b49239e3ba80
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt.tar.gz 2072032 BLAKE2B 937d353a21ae8827579b54b12e88285a3b8e5fef1a8f17eae105261d04a5ca6b71db64a33b1899d9100ac8df7ab1bd9dd3b020eb50a48f63a563852d1272d39b SHA512 ca45ca432257df982799489b9e08893c1188005245121257ba6c8ae74d1e146c4a4641097d9c674d579e4f4301ea3b1adf5e39162084225460cba6ab0b4fb473
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ro.tar.gz 2305008 BLAKE2B 8ebf98d6ee3a7a6d335b64bdd9f114d3051567c600a4d4cc9334dd398c0dd2a48a26abf4d3ee2385ef2ef99ff9fcbb0dd90af0b08702b46b0fc99d1c9d162821 SHA512 f73d1ce3d73a06b078f33315a64e6150022023ce898013656fc4636d6db8e4d6ae665f2eb6ba3cfafde47e6eb9cb4627fc8139f92582b0418e6d38c6ca30a495
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ru.tar.gz 1593518 BLAKE2B 03a4faaad58e71ee4f7507c56abc81a8796f0095a3a26056b3cec0eaf3d23fcb213be6b18933dc4b3b47f4ff0ee121d7c4ba7043a309e7f4879cdf83d437f6bd SHA512 3cf5e83adde0890bee75b67aa110a565773d0269288eb2d0a891e0887ae3fe495b3c87a63f51b8cc42e99a784814e248887cb6c157dc1d53900e9834903f13e5
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_rw.tar.gz 428376 BLAKE2B 1381117ceacf8b6958eccd373d1512bf90371ce15e35e14e25cce99ba1d547358ca6b65c2bd6f1dcf1d6a00ad127f3c946ceaa73688f3249900178fbe21e122d SHA512 04de307df77a57375f9eca8e60853d21dd80b9ebd8df3c1c06c469b8bed69a03698d3b3f1fde30f219501afb828352abc6ab62edc10a485386b90f8601f7c955
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 475574 BLAKE2B 593cbf322e120d9e86b567eabb254543e02d89ccc770af0721576cfe9edcc938191cbecc947f4cc275e11b1203ecb5a2d3ff6aa91c159b29e81cfb8a5cc5adc3 SHA512 d4b7a70b7472736450e8f826a686f020fcfaf8551d1a091d9ae918a0e0ef4103aa082f635bc94f01ac6cb2bc2a9fae2d97d9b8537bf449cca74af9cc38d555b8
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sat.tar.gz 504827 BLAKE2B 471a200c00c2905fc75e9b5913f7506069e7895ac5842748463807fd03323492cbed1fec52a563b26c96b0bb8d981dbdbc5d4ad81c78926039b750bd67a1795a SHA512 af4d18a5f4e2257bb0861ed1f398968b539f69702cc7fa769b6889c91288bfc2cb46a12cec95f65f118e952405a71d0c6124dc792f2225082dc2430c6573dcfb
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sd.tar.gz 468336 BLAKE2B 408fa37db24bab4c0a9586e753794684bd019a13e6a700dc4dde10a374d2984ec5fbd4e4c70da209797b80539c8a32d6d8877581772052f73610749b15e020b2 SHA512 fe9a268476af88fe34f3fe09d55611bc1a550d3e9086f4e765e8b865232bd3175ac7de88bcbde0a288dc01d241cb61229da19b52e1ce0adea76c08f1c653a6e3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_si.tar.gz 758448 BLAKE2B 9e5dd63239013574fed2aa3af19954e66f3e6761b1dde3b3d0e21d04a7c88585a1d5520f7fd20ef4f29ce3b5300e46b4eb5c82d50c6e9b274984cbea333a7a9b SHA512 67a7b5f2fee531cdcd8941364479b6d553217e8d0538c52e2e01e6bd3401a9a4481ffb566646cecc6c5541e0439f35787f6f62b2f12f7ec103bc25e55c728784
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sid.tar.gz 434533 BLAKE2B 471b216f8c1b20706a9521acad51dea594c45eb930b4807fa4e671b2d1eff8cd03609937d766ec5987b65d2ce7c301ee2f2e9b899286d8ffc591581ddaffea37 SHA512 0190ba7ea7c974bac42cde330adc9d7d7615e4ca02d7ee2449606013efe59c62b7fa9ebc2f9222675b5cc6941f5fd94c09946d48c5f45df1854f7ecb6d82f820
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sk.tar.gz 1725513 BLAKE2B 3cf63b761e8858a6f8ea1715dc18dbefa2265479506b3e84a416b4b48e78631f3e2167a271591ebf0e45f174335335e0201141e68050d7313486c81c6cdcf10c SHA512 07c253e3290de3049dc6a1e4b71c0b88c4c954b5fad44a0685a989aa4e8e1edc59d347e304828fffa577d750216d178d578b9a40d60ae3d2502a7ea51f0b68a4
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sl.tar.gz 2103787 BLAKE2B 1394f94a056eb56d88a3bd692908814f67fbaf75ebf8a31ac6896d455691d491f8988970582ce43a0e72061cf52eac2f15fb13b99d34b050b36b2c910c451db4 SHA512 dac8c492b63a15a9e632a6515875577dc8a5275571087582a47e38a5424b54137de3504b5b77e86d2185b3e0477b2b5dc0e195c9e2010a55df5b533ca7c86beb
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sq.tar.gz 446715 BLAKE2B f2282fc526fd3121f1d4b426cd3d442b81a3427a0b18e256d80ba0017a1c9c0ac0916fff7138005e594f742de9c48c42cbb7af45fe7efa9329e1da0abd37c355 SHA512 0541689363fcd985471aa4dcf8234cf3f86fe69aab4e2df81c0352597ecf69778c4dcbcf55541c7bfe971fadf262800d75a999f8ec5ffd1dd1738cc6d3f18826
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1598385 BLAKE2B ac7a04d708d5acabbc3693ef12598b0039ce9ab5026552f25adda3137c28cdf0154ae8c23ba6bf2f2f8378ddf648de1ca26b0c07ebd7fcdbc26f3bbb91afd7b1 SHA512 48dfe0f4c2d16abc699216d9d699f2092181be93bb429f917dbbaa75dad5f03b0668ce303d551bd08fdebd582d6688b281cb2c47b739783662067e99bd04b1c6
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr.tar.gz 1616915 BLAKE2B 85771e10f5b539590d07b40575a83a1ce9a3a4a90f4577d010649912d8fe09f50e838a35c7e5c5cca84cc38e674efa200ce237692ea7a9272d3ff483475e6972 SHA512 b8cdf803c8bfdb2fd38e022fe6bf2618fcd670c008b5cfc072ff8866f2320666f197ef3c9eb8ca62662310a8dae56facb910203fdd308eb0b89ecd7913b20b5e
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ss.tar.gz 432122 BLAKE2B a89f143d815b217ae8f222a58e43d58e1cf377458218ae5ad4648defb5d9a4d9d7bfa767d673e3de3254c8db9efe611d451892b3e987fd953620539a1f745aeb SHA512 4338b4301d0c2d63e39ca22f4be0ed6390aa3ab0b94f249f948fda4c08746f628de320f8a559ff0edafcfc7a2311f504dcce085719735ccdcfc109d69e83fc73
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_st.tar.gz 430680 BLAKE2B 8d5c93ec500613dd5f08e2ef44e969b53c39a8bbbc2e062e09d9c7424f8d026857b455a328eff0159890bf1d03c69ede5144436643c3205d1c283f241b4d3675 SHA512 b03c7f87a7e1c458f64fe65a19bab0563f74cc54296b5e3ed3166c4d264ad5294e68be38d02ce6c706c846e84024fe49bf4ad438d797ca2da42e376a55a33b02
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sv.tar.gz 2314282 BLAKE2B 41aab632dd386513f1ddcb3a5f8596c52c4eae71a8bf672f0a1316626912c6e88d495ec425dbc4286a01bc611f2b9655e05e01732dd733037222d7a0fd32cea1 SHA512 db3d374207fcef197406bdc644dcf166fbc73439046287c2f68a24bb6478c57fdb15d8a8f6c2be7c325f02ff887431c3a6a00fcc561d3a7b96487d79195e53ed
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 421302 BLAKE2B 6213deeb4f1883e2faf0903744ef626dc1541638d6014422e1d5e2f56414f91ed0d27a4a65317e9bf2e178deb9a784d339cc39cbf5e6b3ffe90b54851ccbbedf SHA512 b595685d9239b3845d1eb95b3f725738656f9e3046690d1c52864f1bd37e60bea861838429e12b6807e1d6c67f9ce9e385869295a03fb0d742df4e577c43d412
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ta.tar.gz 489841 BLAKE2B 1611a43cf61aca52dc951dc72f95ff7eb69abb9fbb361a5a27e34a349f25512e684c883cd439faef1b1f466318ba958127ad907e2131c1835aa5de66ad517894 SHA512 c47a8266294ac1dd1c10385269a8c9dfb72c234c5c9c5938a289b2cceb4604fe1e9a269c6e11b3808b1402ff8f1afb8bf54683317d56dc7df584590657d514fa
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_te.tar.gz 1040304 BLAKE2B b2853a4bbbb94beca1eb917909d35352125c2f641601478263e41b6de6c5be24488bdc8bbf08e91e33ac1f65c0eceeadece7de36a4dab0e5a98acbf120d80b4e SHA512 cc454408be3c84ba7c40ddab120143f6c911658f70e4803624188675a33f521050cf7175d85bf00916e58717760a5fce81e7856f6263139c7d4bdedf5fcaba51
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tg.tar.gz 446741 BLAKE2B 4974d09d4ab4b685736225031330ee64dddc9679e6d9b8f98170a12fc1a4e5966e145e246b979bb62f31fa7ca9283ce696109fe6a0c018942f1d55c823a263de SHA512 afaf19330b72a75aad32cec8f6d44409a9797bd4d80826bf5c0254d70577a7dd14338060a7dfd5ca739b33ec6358a420fa775e5a7e08b477919fbd8845cd8073
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_th.tar.gz 627062 BLAKE2B aa81e49fbb0a2c9c442132119890daaca5d5e835b50fb0656c29eb4cd2d0e93b1668ad550c496ec4e02b9f02eb376af13753469d5c97d68a2131a4d5527e304b SHA512 edcce79318bc4e3243381b69cb673e76c355dc22007eb7155e8430e832b14828b003b2d080139f04fc59711380d54318a7584de2e23a28ccb941c1cfe7040bc2
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tn.tar.gz 423151 BLAKE2B f95b299c899013cabbb12cce7b976c2fce4b5260049bdf541972bb1309515d0c5ff9bbe287cd4fb6e2d12447a0070941b052b5b98f85a298d60cdf4902227c0d SHA512 45d097f1b8880de5def523145646a5549f2f263a7b36db767c129c3aff5437d30c633a317a42150e93671f1840f97d3c27b8aee641e36cd62af0a5a32b5d31eb
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tr.tar.gz 476639 BLAKE2B 9ec5f4538fcc4503955405659829b37cb1cc1f0d400f7e086014ce09f2a3d7931915fe66815d0fd8f0d72b322aacf97a59eebd57b22b5fced4cf88ebfb94e103 SHA512 ffd1bab2494afe96d8500256e18a9af9f7e001fce5672061e70046be02db4db3af438e52adc43be9db66ca8dc474b7e5443733fc8f66e940312141e240ec4674
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ts.tar.gz 431520 BLAKE2B 49ad30099d507dce46bc70e821860ca22641b1c710c85a193d122af4473d0de92e79d0ec5dbec4b212706c85cd9b9c545621b37116ff9f8123c525740e655e4f SHA512 7b312f255b444db1a5f200080d8c0ada8a359cc0f767be0b021dd8db48761e20eb11f4ed879cd13b6eb738bdea6306c2a9d6933f97b56e6422a2c1849c217403
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tt.tar.gz 427985 BLAKE2B 18d07ad40f1897483636ed5ba4793093fb6a40d87606ef06502ed8138a069a21ed376ef141cb65781b152992ef36b2ea236cbfc92057d5fc4e7cebb47d31ea71 SHA512 fbf8246424088c412bbc363016e5e6c3566be18a53b84b1e7038ba675efbd2f79521d3716e06431703c0fb0a3732806fb3c562edb1bf31af436d5d03ec05f83b
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ug.tar.gz 465902 BLAKE2B 7db2052c0fc487861a2ee0604a2c1d9b5a2b92c7b1a07b6fd137a56edd36baebb7b3410f46dffbaadd2691f896bcf2d6be18ccc4f67c5431e2a387be85b66466 SHA512 096bcfa6b00fff9f41aa4d2a7910730d529b36631a4439fa82bc08ad4f76b40a72feaed993d38a77add5a42568e52e2c3387cf087bff4f2dc1ae698155e5a051
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uk.tar.gz 1314841 BLAKE2B b73e6044347d85df2d5de06a3c906cb73d4bd70c0b49ad0af37e3fc8f8f27151304ad27cbe031a4162bcddcf250a389cb64b1b92c4009fc878e38a96f489aa15 SHA512 cae3a67bb6404380657e1c0229d12e90c3d8dae24cab5a5830df87768e70b7c1a02c0da0113143958217beb5e357439444b2a8ae6a0ca028809b56f0e514e9c7
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uz.tar.gz 425805 BLAKE2B 177a102fbaf8a481ed2e3e507793af0b16dcb889cd6da04fad0241b4bacae5f3d83262d750738a15f3f33503d52cd6e6eaeb70640f18b23cdb7f2fa4384d8859 SHA512 00e625191b9a7e97966f6851ab7620419bc6cec0b4f318090eff2f56a9ad90e1e78766c56e54c22ef7520656a36ce35e9a2879560ff71124591ac7cacaa086f2
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ve.tar.gz 432841 BLAKE2B b3dc5fabb4087fb382dcba6f44e0cb9add0a9752baf96d742d0ecc0b9590fdd25d6d3809ab2432a1483386662602f724aa52d118b15c1f3525ce2aa3529533ee SHA512 69b29eccf0cb67763d9b26351c633d1cfb638af4fb40d89c347b242924a36f790a74282c0a369330f5e4e824f4de94d149e7098c4d901fda4d82c4d4537e4b33
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_vi.tar.gz 466351 BLAKE2B b25c2db966f9ac6e195d16bb6c045fb7834f2bc698d653f89d7cded9a3750da59a251d0d05a63ef689c4eb6b0a2a8ce00ad6e931c7afe48e0f52f48003a18638 SHA512 d2a42cb19c0fe84c279b36e9d5ce1e1b46ad045d5130fc35b34caf096954864f926f19619b618671a1ee23032889803c3628f508765023ea41d88f1f978e5f8c
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_xh.tar.gz 437890 BLAKE2B 9a9d6dd372ff8b7cc284e95bbcc8ca38192762c149891270701b554933e6198103127a17342cf97ce1a04ca8da72269b56763e5ec53a700990070f035c0200ff SHA512 2049b75572b3167362c7431100db080922102fe1fb7109c1e9093346b760034e2778a29b2291833e17d75a5eeb25982215f0d7c95a40c9e725e1ef03b08715db
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 516245 BLAKE2B e0959dd1545c456334737d10cd3bb26a75f4c5b273ac7b28c1d2afdfe397f5caaf1fb0a947e4ba263dc5d4e96c38a975255a3e334cd2e6a51b0239a0755c4203 SHA512 70d37847c3e328e4e812a4ff60e343e627d370dd203fb6eda2f3c318a79418cad25829957a53b0587fe9ea4f051727de2ff7a9550efcd68789cc3cffc2327dc3
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 513435 BLAKE2B 48dc365a6012bea82e37e0f4924aa531065386db6fefee31d1c1efbd228d793d49ca841cc2300ef86e94361133dcaadcae323f8266a65cb2c98fa5c568d4cfe9 SHA512 e841d8ffaf6d64657eb4edd92efd560f2f1e61778b494b38adb0f1fb3de59565cc54faa9be6854c51332d28a6fd55a65f30cc1bac2b1263683359e1eae6b9797
-DIST LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zu.tar.gz 439453 BLAKE2B 9425da96f92fe9d3f5337e8ec6fa3c12b5a4f418f6122edb0f9ce30d2093357ea584e31be2e33b181b516aedf39b4fdc37d01d3f8f9a6685fa4a02924581a338 SHA512 e206a8c04f43de70b141cde5287b290a50dbb190db499a626c9b73f70f3b8a9cc06542b8ab1c41e0bd3b2fff0565409a6ad3ad44780bf966b5310a133ce52af9
 DIST LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_am.tar.gz 7942341 BLAKE2B d618852a884d3c91ab78ead5363e31b612869949830f2caba370a3fdd56d1e5d5bdaedd79398f013f7602b78a869102f78680a2e3a7ec97028747b0803777b05 SHA512 784accc27a62cbff77935f3baea9560caf1648aec5396f19fd593137aeba3e6f52b058e20cd12ab1b3edc5226a774db8f3fdef8d1175e17c614f8024dde243bc
 DIST LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_ast.tar.gz 7872020 BLAKE2B 8a66078310e73f144709dbc7f0e3e24d422f82764e0fb17058a86f3de2c0069f2e9ca62aae53ee298a647be8a7da38889b41c9a5bb09e85e79331c474a311b14 SHA512 923644eed8116cfdfca3ea815cdfe64a956c14b2b7dfc8a2475764ed979af2b6c23a12b58a6c84a8d7bdf73a99b5ac30cd790bdce8bdabcf0f57d8efe48e1036
 DIST LibreOffice_5.4.4.2_Linux_x86_rpm_helppack_bg.tar.gz 8415265 BLAKE2B 5e58bf031f813ca52ac38e7e0675a5fe84782d31a2cef3388a862a52181595fba4f780177e9b6abdd0654fe99259b44084d2701e16534f6301f0dee4428c0de4 SHA512 ba13786a6cb14976411b4ba8fc93c0e16295c192709b0ce9b7a00d5de2ff2520f570c0672be1be21c7232c887194360d68fdeddbf7d38db6d8617454f07a829b
@@ -671,8 +503,7 @@ DIST LibreOffice_6.0.1.1_Linux_x86_rpm_langpack_xh.tar.gz 294859 BLAKE2B 26dbf50
 DIST LibreOffice_6.0.1.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 798257 BLAKE2B 8f09c26c85ea157a34796abdd9cf642daefa5f2343435b8278203d16517715339831fa7c4afd04e81319b2131fde4659bafa62b479c9173c649ce0f10adb4a0a SHA512 a637cf30e14a9e2bd7bedf7f3db390ae8d1f68f99794805678388b8f9b82312208ed6b7f49d4014b1ce8bf440256e3f2d05f79666516b38d355b33feaf07d48f
 DIST LibreOffice_6.0.1.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 796227 BLAKE2B 40daf199d8b7815800df4af3bcd6cd806d2a2906aac40bf7831ae28c48380de2f882565790101f6587f7795fcc2fe2680432448fc034935e700fb74345c07a90 SHA512 c9905316d1b8433cd9ac5200d01a9541c0118f3d12e2828b1dc65cb966f171ba5b9f2dca4008f7149c7b378f81a84367ec931c1b234119bc70b4f5d3f0d4b68f
 DIST LibreOffice_6.0.1.1_Linux_x86_rpm_langpack_zu.tar.gz 326168 BLAKE2B 63c139545514adfaf1d4c250226d8e2809b72a8ade84b90bdec816bd3084a610e0a6c3eca13d8de1f5fc483e29a1371fb31b757cd26d807e29d35af58ba8ac1f SHA512 b22a435b50467d362a90a97504ff1d05c160c4f61aa902ba6fe9beff02907fd5aaa24fe75a70842cab992d154f753764a9a8efa1b537339995ac6223a135aa95
-EBUILD libreoffice-l10n-5.4.2.2.ebuild 3378 BLAKE2B ed62a2f4db3d43fdc21d98d572bec6e96dc3730de60dbc20d29b6f8d34120790d87f064d9285173793f948f9e2ca1dd20f0bb8bd8833d2c073671358dc98d1bb SHA512 90bc19cfab3bce49c5b32dfb046ca1f260237def3981de67b49efce47da0943b4f9ea5cd690dde0c4f819198210ae6efc5f98cfbf893e369a40a6364f2abe14c
 EBUILD libreoffice-l10n-5.4.4.2.ebuild 3365 BLAKE2B ac42e9f05e88133d0adb56e0c8e7288ea1d79c19a2359c8afa51620615f49d0921337242903ca134a8760030ed5a3c7a2171561dbcd6e7b3f04e58951825c165 SHA512 e7c0f037d6e9ffaa42d286fbebefdffe0f21d3f6937bb7d2b55cef9ef7e4c2557dc4b6f30bf9411740f3fabf4063b7b1dd5714148c5f2698419247448f2d95ea
-EBUILD libreoffice-l10n-5.4.5.1.ebuild 3367 BLAKE2B 6182f0d27145926bbac711586b7fe3eb6dfa41b4d4b9b0176ae983643db76f35911b43e286e7ec23fee5cfc20a9e6d93297b8dc3fd9789386074d579c19e6082 SHA512 99f77f3898305c0c9526bc983c1321093d9ca81aa261fbf9b8ae703eba2d625f367aad8987d2d5cc077da7468c1e77b15e8fd8b71b5b8e398b985cbd13821b78
+EBUILD libreoffice-l10n-5.4.5.1.ebuild 3366 BLAKE2B 0ed31a22ec4998d1b2eae8a7ca9cf8aa8c3c9e4d532c50323b34ecaa809facb8ea78c2e9a672b9839251842fff8e73dbe6fc165f2f961bcc40e4b2a7660ca836 SHA512 472083f47a61d640a0067fe0f780fe860d0b8c067b30c6d5a7c9ea7a1ab073c20bef4c6c6d72a5f581cc6fde6e91b8d959a859f68b79b772b69f54900df8bda7
 EBUILD libreoffice-l10n-6.0.1.1.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.2.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.2.2.ebuild
deleted file mode 100644
index bdc3e6a1eafc..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.2.2.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
-
-inherit rpm eutils multilib versionator
-
-MY_PV=$(get_version_component_range 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="http://www.libreoffice.org"
-BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
-BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
-	# Condition required for people that do not install anything eg no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild
index 969f07348c91..faf035fa0b83 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.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/Manifest b/app-office/libreoffice/Manifest
index 17e29b7ac29d..2b33f48dfe09 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,7 @@ DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84b
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
 DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
 EBUILD libreoffice-5.4.4.2.ebuild 17359 BLAKE2B 98eba91fb6a2cec8b592808b7c4d2e77df4fe4f858b3ff37f7b89f93faa0a81edcf68e89fae3b8a6acba803cc5cb4571bddc25df63b6131c42ae5059469daffe SHA512 11d73295add5952d7e70d920ee21ddd8c21b09b0eef8e110d28a760a863d227d5f45ad4ab7ea1a36a511c1ded51046c944a6d27453b18c35711e8747f823d8d2
-EBUILD libreoffice-5.4.5.1.ebuild 17388 BLAKE2B 968131a367d496d58fac515e8f1499f7a7d42594b74c0187696aa60fa49c085e4721c71259e18fc6264d4957f813edbb40a42d1b423dbbc8f9a9ea0e7dccaec8 SHA512 d38284df128f5bdeeb046e10fa6d6910eb415ad33c4babf82e81e55b135b07131a304e283907b2453c2c178c47a417f43efae02f877a5a9c8c0e016913ada31a
+EBUILD libreoffice-5.4.5.1.ebuild 17387 BLAKE2B 6c1ed208d07029bbe77c61006e75fe3ee648f416b7ffa30d09300be59267aeef8a7bcea731365a37ec8f71e91a4b68ef7c1ac1dd19b315afbda54f1f3d3f43f9 SHA512 501549c7d309365f8caba178a7af82942211afae545b4274ea2ba6d8e0c495c738a7a49bc5a7e44cd465856fb612ac812c995a7811856d9289af210baaeeabb8
 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
 EBUILD libreoffice-6.0.1.1.ebuild 16494 BLAKE2B f2e4e28c9edd29f92cfd190c0a09106ecbaa3a25e7a4fc37740f418184bb2c36712219b23f016e58c65b5bb91b5af14e08649cb8c5724a98ba6e0e15c914f094 SHA512 31b9d824c78f9fa635ee2727c45c54be57170787ba28013a86694caf50996eca8d184a1eae17b3fb311315a06125f4022e1d54dda367e3f414f868e199db3016
 EBUILD libreoffice-6.0.9999.ebuild 16494 BLAKE2B f2e4e28c9edd29f92cfd190c0a09106ecbaa3a25e7a4fc37740f418184bb2c36712219b23f016e58c65b5bb91b5af14e08649cb8c5724a98ba6e0e15c914f094 SHA512 31b9d824c78f9fa635ee2727c45c54be57170787ba28013a86694caf50996eca8d184a1eae17b3fb311315a06125f4022e1d54dda367e3f414f868e199db3016
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 9ebcfd8ed956..23319cb4713c 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.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/lyx/Manifest b/app-office/lyx/Manifest
index 6d2c688c8f2d..c09b2524c246 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,13 +1,7 @@
-AUX 2.0.8-python.patch 1019 BLAKE2B 1ca2692b77850998f49e93f43dc371d05e33438f867c352bdbf085a86a280e11fa5d00d738661875ede0041907683ced98407ce75676d638f35ae0a92cfd0f54 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8
 AUX 2.1-python.patch 1019 BLAKE2B 1ca2692b77850998f49e93f43dc371d05e33438f867c352bdbf085a86a280e11fa5d00d738661875ede0041907683ced98407ce75676d638f35ae0a92cfd0f54 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8
-DIST lyx-2.0.8.1.tar.xz 10481988 BLAKE2B 121a2f5a86f9b2f92fc211c052a26dfeb0c89c3f3ebb6d9e9eab397af7aec1f696806f79d7fc75c03649bbefa06295ad03d7207135308cb14560596b0c0f4790 SHA512 17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901
 DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B ddc6e10974f495bb465fced0bfe95e0530831e924c12323267feec59e49900efefda154abac927f3129ab0820706a870fb463e749cff2b5c4b47368d954c9d20 SHA512 6f8c62ff96458d0c8c8057ae1e587be4c63bd3bdf2d4f095c24d447017034eda8c6b645efbd258f0956a9bbfe5fde2f90df36515be7b8a94cb63674bc3a58672
-DIST lyx-2.2.2.tar.xz 15490148 BLAKE2B 16d9b1448da76dd0b02ee4cdec38831a0c3aa7a0798b4f99bb6c93717223dfd3c62145afa76324177ed162d4c45ab341a963831855c9607d8544574ae88766da SHA512 5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
-EBUILD lyx-2.0.8.1-r1.ebuild 4194 BLAKE2B ccf3ba79b10a2e4ff8a7617e2383b6b306aa54b8bfe1ccb7be8e372043f6db5dde54f94e0ed8c6daed24319f7bda01b63d7deadedef8ff3c55f26075f4b78527 SHA512 a87a0a8e36eba81fba7f854c24da04b4403ba711aeeece27dd73d56e2db4e72219e2be50994c1c70bfc6f0c4cb7b3b9eb8913cb22cac3b900498c84b526329f0
 EBUILD lyx-2.1.5-r1.ebuild 4110 BLAKE2B b2e1a28dc3a86d58e44e8b6a2ed00123c2047c21eb7703a3b35d476b6fa40dc10d28f98240ba4a4943cab15c57a66327d93cf613ddff381156f47b32fc5684ea SHA512 e75260bbde4c3de28071e3d1fd15c49435cc9edc2fd0e48cf4ecee09b783fb698dae23e5489ee0dbc8de53501e1fb4624e7359a948b110342855a6c5c48fa8b2
-EBUILD lyx-2.2.2-r1.ebuild 4498 BLAKE2B 950059aebdda269d057fcbd40f502d9651d651e65699146af5ac451c0488ff62d3c422af7480aeb25518ea5895d8dff25698d6a33ead5e1a81a81cd319d0adef SHA512 fb0d4b84ad1ad1b82b0f84ae6ca8480e2dc8a2e3b6e47cc4b901ab14d797ffa38b849fc40e471038c12519c42dd40862a208ef8347769a09b3228c9d37f4ef42
 EBUILD lyx-2.2.3-r1.ebuild 4399 BLAKE2B 754fed823766e2927b7dabec8f8488974a17a2b7141e9b3d15f05128ede7f32a720ff35f09741607833d5bfe48bb5a10647c2150edab8c4f21d9e2d3b8d93592 SHA512 8ab5677b4759e000dc913e869234abcb3c3de155f069f007c19be932722c5a9a23cf8d646a921b82d2e063518de312d30adcd564d73f13a81dd3e04ade9f82d2
 EBUILD lyx-2.2.3-r2.ebuild 4369 BLAKE2B a1d9af492e94b1471f8755756cebfb057eebf98f4cfe4c1b16d8b3e520aaee384fe8175cd44ee7e58ecf25b0ce566a1713250e340287d673c2b8fe4c6ba35d01 SHA512 23f0ff39ee3efc573663e6769ecad71b215d2893428170abf346c606e9506667ad0657a4673300da736abefa920cc21b31a8868729d0d9dbf67ddeea7eb13093
-EBUILD lyx-2.2.3.ebuild 4498 BLAKE2B 950059aebdda269d057fcbd40f502d9651d651e65699146af5ac451c0488ff62d3c422af7480aeb25518ea5895d8dff25698d6a33ead5e1a81a81cd319d0adef SHA512 fb0d4b84ad1ad1b82b0f84ae6ca8480e2dc8a2e3b6e47cc4b901ab14d797ffa38b849fc40e471038c12519c42dd40862a208ef8347769a09b3228c9d37f4ef42
 MISC metadata.xml 1760 BLAKE2B 8a223f94b48a92104942b9ae94c2746da8628c260fc597a836ae3b468bbe277b6383af960883fcd731f2ad288cc34d2ed6a58c118e1bfbdd3c2b766e99514328 SHA512 416c99a6d19a9e736a546c4f939cc5238de5027f1151d49d1bed800a5b2a026868d4197198e86c250b77be568f45f94ace125d83700316a5b001e21ed48b91b4
diff --git a/app-office/lyx/files/2.0.8-python.patch b/app-office/lyx/files/2.0.8-python.patch
deleted file mode 100644
index 5fb21655a695..000000000000
--- a/app-office/lyx/files/2.0.8-python.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
-index 97c4f68..8f05e62 100644
---- a/src/graphics/GraphicsConverter.cpp
-+++ b/src/graphics/GraphicsConverter.cpp
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
- 	LYXERR(Debug::GRAPHICS, "build_script ... ");
- 	typedef Graph::EdgePath EdgePath;
- 
--	script << "#!/usr/bin/env python\n"
-+	script << "#!/usr/bin/env python2\n"
- 		  "# -*- coding: utf-8 -*-\n"
- 		  "import os, shutil, sys\n\n"
- 		  "def unlinkNoThrow(file):\n"
-diff --git a/src/support/os.cpp b/src/support/os.cpp
-index 8f60c68..2f1cb91 100644
---- a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -63,9 +63,9 @@ int timeout_min()
- string const python(bool reset)
- {
- 	// Check whether the first python in PATH is the right one.
--	static string command = python2("python -tt");
-+	static string command = python2("python2 -tt");
- 	if (reset) {
--		command = python2("python -tt");
-+		command = python2("python2 -tt");
- 	}
- 
- 	if (command.empty()) {
diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
deleted file mode 100644
index 3e87c826bd1c..000000000000
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34
-	${PYTHON_DEPS}"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( <dev-vcs/subversion-1.7.0 )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.0.8-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/lyx/lyx-2.2.2-r1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
deleted file mode 100644
index 8463d9662259..000000000000
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qt4? ( !qt5 )
-	qt5? ( !qt4 )"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND=">=dev-libs/boost-1.34:=
-	${PYTHON_DEPS}
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 )
-	qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 )"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( dev-vcs/subversion )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.1-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-	local qt_flag=""
-	if use qt4; then
-		qt_flag=""
-	elif use qt5; then
-		qt_flag="--enable-qt5"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		${qt_flag} \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/lyx/lyx-2.2.3.ebuild b/app-office/lyx/lyx-2.2.3.ebuild
deleted file mode 100644
index 8463d9662259..000000000000
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qt4? ( !qt5 )
-	qt5? ( !qt4 )"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND=">=dev-libs/boost-1.34:=
-	${PYTHON_DEPS}
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 )
-	qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 )"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( dev-vcs/subversion )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.1-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-	local qt_flag=""
-	if use qt4; then
-		qt_flag=""
-	elif use qt5; then
-		qt_flag="--enable-qt5"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		${qt_flag} \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/odeskteam/Manifest b/app-office/odeskteam/Manifest
deleted file mode 100644
index 71b2a57c5c7b..000000000000
--- a/app-office/odeskteam/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX odeskteam-3.6.1_desktop_file.patch 427 BLAKE2B 0b72e7d5770ae0aa4e98ee7f9c92f8fa0d71058a1ea9a6a883af0ee640680cf27acb08b6229b9c510e3842dd021b9cfdf64c058b18cc1a1380f6a5679bd4ac3a SHA512 1193306c3a18bfd45fc95d4a49192cfcd4ce34e0a6190afbf9266dcdeb312743d9b9e568c99462e825914a7990e37e64c9483ca4b3ed4a4ebfacb6122bf91d79
-DIST odeskteam-3.12.19.i386.rpm 1594574 BLAKE2B 93bee1624c15693ad5315bb97b976761b454e70f38c343e43cba840f92c4b4e067aafd47fbf4041e7fc0bdebf8555a48b9c709aae4bc45f1c890edd944f870ad SHA512 a35ce24958b77de339d635e4fda1a0b073c7cb6692db942a7e93dba191448d902856e1d87a34020497515f4d2b4b9e484070df3ac61622f5963ba36afee8ae0c
-DIST odeskteam-3.12.19.x86_64.rpm 1657527 BLAKE2B 22cb3d61ad8001e27aced10817c935b4d22beefff3f2bca7c08bccb0e52854f07add6d6b327d22b1296795350284b3276625a23a55ec40389a63b813ab0dfdcc SHA512 5fdf7615cbfbe55e3422c6a637c701db623eee18854fcc86923e7eed9de2399cd4a727811f7104229e9b676a5159c733ea0b78542a65c8c30f5cc0321e033738
-DIST odeskteam-3.12.9.i386.rpm 1586118 BLAKE2B b673af3a2d7d60443287bde6138feb1ce47771a80ac2640667dd981f909772cac73710d44d348351f3b7a6b7ecc0e219bf8ef0ecbabe789743566d757ca3e24c SHA512 50fed1333501374d40d5f04acb50141b5123566b47ee0fd4574f7c0501b4e029a67bf08e9d3ee9f24eb5a75b5fab6410dd48fdda6617113057297fa24591ccb4
-DIST odeskteam-3.12.9.x86_64.rpm 1649196 BLAKE2B defe13210449e58f03a253d0438415212218228ac0a821cc9dfac13ac2af7ff0e65b1b0601e4306aceee960b9d43fa0b0714f6a40ab1142741da428e87dcc3fc SHA512 fb0e12dc82741a7fea1574b3c8e54a7ec7f7ac87dd96996eab3d6647adb4c4780e5313b4c2279d040848e63d5b91f60a2a055773e17638fac73cda173c734a95
-DIST odeskteam-3.6.1-1fc17.i386.rpm 1495558 BLAKE2B 28e00cafdf8821a751d0afda130f749d35c0d6c9e7e27dda469545071edffb2dfab0ce8606d349c21e5e213211318ac496e4e4395158bcdd0d2d2a5b69b4b6f4 SHA512 2fd2d5906a1ede4f1e014ad8c67b696e265f38765d5ec3d870aca797ab4471a5b6868adf8730dbdd14254421ca3b579f6d63b4688174e2d9f098f9e6b865be67
-DIST odeskteam-3.6.1-1fc17.x86_64.rpm 1545261 BLAKE2B dcea7a81f691f28e02917b22335d941ba0f2cf657c8a75b594913bd953d65afadb756f75ef4f4e79512133d5b0c8a726dcc784e6c848bb6e54d895ed1bab9177 SHA512 1dda4998597739977fc607e5da12fcbb1d6843235c911d9b7ea1b4696d293bcb6b4865a605256e13d512741ee46e5dbfc194363261facf3af90105a2656367a2
-EBUILD odeskteam-3.12.19.ebuild 1088 BLAKE2B 7944607742538328b9b2670ec074cb34c3804e58a30015e613f18a2585985e93f3aaee796f5c02ded7053ad17485b9ad633369fa09738e8dd38dd731334efb60 SHA512 7641b86f6ac0335cc3a86eb33348c53ac2f8f8ad411c0dd1ddf8f439336fea4e0c37da617df142ff170c074e3f81c8d1d3860021d25a1d36fce2355332e5a27d
-EBUILD odeskteam-3.12.9.ebuild 1086 BLAKE2B 156e0ac21d467f7780da5c5c446772348ffe54854ca5692977067a6d7d83ee285b57396b4d09e8528ad7b9b1f29847731a29e2b9ce5c18427682e7f3689727ce SHA512 905df7a066b30a63cd13ed450505b6cfd0d9cc97602c277b90709a4cf3a3c6cf38271fe01ff50eb7add97b96303fb667da46681b8948ee035f66584ca7a0849d
-EBUILD odeskteam-3.6.1.ebuild 1373 BLAKE2B a4324fc07e2e64228bfe9e6b54478fb200e2c18ffb570e147072a36bbac713c4eee7dac6fe29d45656de606d108c998a7fce8f5ca8742e0f10dad3b026e1a1cd SHA512 6c29e61417e2d5030e3b05041c4b7a9a0c1a23805dd4cf7e124ccc9511ccd27941489df8b8add32799b31ee3c46100a7a432d0c101bc1c77e4c4bb1f3398be38
-MISC metadata.xml 463 BLAKE2B c3a59e09d88fe08e6a8b43a87fea1c9017b6bd99d62933bc97734a10882f9481d51ebc3946db2db801f5a9df740e4b560d772a6d669ca4d608ea72788752c869 SHA512 d062c450c94b887e307eebfa6da530caac78396b19aad69817387f433f8aa22b1fa1af2e8b99cb2295417ad0540802a0fb247a68e5860e0e872f7f0563aa587c
diff --git a/app-office/odeskteam/files/odeskteam-3.6.1_desktop_file.patch b/app-office/odeskteam/files/odeskteam-3.6.1_desktop_file.patch
deleted file mode 100644
index f5dcfe6b47a2..000000000000
--- a/app-office/odeskteam/files/odeskteam-3.6.1_desktop_file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/share/applications/odeskteam.desktop	2013-04-06 12:27:53.729344392 +0000
-+++ b/usr/share/applications/odeskteam.desktop	2013-04-06 12:29:02.013266552 +0000
-@@ -9,8 +9,8 @@
- Comment[en_GB]=oDesk Team for Linux
- Comment[ru]=oDesk Team для Линукс
- Exec=odeskteam-qt4
--Icon=odeskteam.png
-+Icon=odeskteam
- Terminal=false
- Type=Application
--Categories=Application;Utility;
-+Categories=Utility;
- StartupNotify=true
diff --git a/app-office/odeskteam/metadata.xml b/app-office/odeskteam/metadata.xml
deleted file mode 100644
index 96e6268e5be8..000000000000
--- a/app-office/odeskteam/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="person">
-        <email>titanofold@gentoo.org</email>
-        <name>Aaron W. Swenson</name>
-    </maintainer>
-    <longdescription lang="en">
-        oDesk's desktop application enabling visibility, connectivity,
-        collaboration and guaranteed payment for guaranteed work.
-    </longdescription>
-</pkgmetadata>
diff --git a/app-office/odeskteam/odeskteam-3.12.19.ebuild b/app-office/odeskteam/odeskteam-3.12.19.ebuild
deleted file mode 100644
index 4a6ee5d10e75..000000000000
--- a/app-office/odeskteam/odeskteam-3.12.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm eutils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for oDesk.com"
-HOMEPAGE="https://www.odesk.com/"
-SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}.x86_64.rpm )
-		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}.i386.rpm )
-"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-RDEPEND="
-media-libs/phonon[qt4]
->=dev-libs/glib-2
-app-arch/bzip2
-dev-libs/libxml2
-dev-qt/qtcore:4[ssl]
-dev-qt/qtdbus:4
-dev-qt/qtdeclarative:4
-dev-qt/qtgui:4
-dev-qt/qtopengl:4
-dev-qt/qtscript:4
-dev-qt/qtsql:4
-dev-qt/qtsvg:4
-dev-qt/qtxmlpatterns:4
-media-libs/glu
-media-libs/mesa
-sys-libs/glibc
-x11-libs/libX11
-x11-libs/libXScrnSaver
-x11-libs/libXext
-x11-libs/libXi
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.1_desktop_file.patch"
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/odeskteam-qt4
-
-	domenu usr/share/applications/odeskteam.desktop
-
-	doicon usr/share/pixmaps/odeskteam.png
-}
diff --git a/app-office/odeskteam/odeskteam-3.12.9.ebuild b/app-office/odeskteam/odeskteam-3.12.9.ebuild
deleted file mode 100644
index 4b9ab7fd50b6..000000000000
--- a/app-office/odeskteam/odeskteam-3.12.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm eutils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for oDesk.com"
-HOMEPAGE="https://www.odesk.com/"
-SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}.x86_64.rpm )
-		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}.i386.rpm )
-"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S=${WORKDIR}
-
-RDEPEND="
-media-libs/phonon[qt4]
->=dev-libs/glib-2
-app-arch/bzip2
-dev-libs/libxml2
-dev-qt/qtcore:4[ssl]
-dev-qt/qtdbus:4
-dev-qt/qtdeclarative:4
-dev-qt/qtgui:4
-dev-qt/qtopengl:4
-dev-qt/qtscript:4
-dev-qt/qtsql:4
-dev-qt/qtsvg:4
-dev-qt/qtxmlpatterns:4
-media-libs/glu
-media-libs/mesa
-sys-libs/glibc
-x11-libs/libX11
-x11-libs/libXScrnSaver
-x11-libs/libXext
-x11-libs/libXi
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.1_desktop_file.patch"
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/odeskteam-qt4
-
-	domenu usr/share/applications/odeskteam.desktop
-
-	doicon usr/share/pixmaps/odeskteam.png
-}
diff --git a/app-office/odeskteam/odeskteam-3.6.1.ebuild b/app-office/odeskteam/odeskteam-3.6.1.ebuild
deleted file mode 100644
index 7c65871d7f89..000000000000
--- a/app-office/odeskteam/odeskteam-3.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit rpm eutils
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for oDesk.com"
-HOMEPAGE="https://www.odesk.com/"
-SRC_URI="amd64? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc17.x86_64.rpm )
-		 x86? ( https://www.odesk.com/downloads/linux/beta/${P}-1fc17.i386.rpm )
-"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S=${WORKDIR}
-
-RDEPEND=">=dev-libs/glib-2
-		 media-video/ffmpeg
-		 media-libs/alsa-lib
-		 media-libs/fontconfig
-		 media-libs/freetype
-		 media-libs/libpng
-		 media-libs/openjpeg:0
-		 app-arch/bzip2
-		 dev-libs/expat
-		 dev-libs/libxml2
-		 dev-libs/openssl:0
-		 dev-libs/icu
-		 sys-apps/util-linux
-		 sys-apps/dbus
-		 sys-libs/zlib
-		 virtual/libffi
-		 x11-libs/libX11
-		 x11-libs/libXScrnSaver
-		 x11-libs/libXau
-		 x11-libs/libXdmcp
-		 x11-libs/libXext
-		 x11-libs/libxcb
-		 x11-libs/libICE
-		 x11-libs/libSM
-		 x11-libs/libXcursor
-		 x11-libs/libXfixes
-		 x11-libs/libXi
-		 x11-libs/libXrandr
-		 x11-libs/libXrender
-		 dev-qt/qtcore:4[ssl]
-		 dev-qt/qtgui:4
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_desktop_file.patch"
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/odeskteam-qt4
-
-	domenu usr/share/applications/odeskteam.desktop
-
-	doicon usr/share/pixmaps/odeskteam.png
-}
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index 36ee650bdd03..a0de8f799cb4 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1540 BLAKE2B 7d10aa0e098ce3d8f800049e490a2f9a15d73ee4201e1844f6fa53452117017bf185c47b18e1cfd064f6f7d3515f87343fc6b398aa2f59f557794d1355224e2e SHA512 be7ac3995bb3a979bcd483b793e4cf74f49bce20a010983bc056cd711061e8d0016183729bc0d2f15f1940078e91bcf2df224021153d6936c10bb65bbcdd791d
-EBUILD orage-4.12.1.ebuild 1605 BLAKE2B 9a1afcbf79c3f71a2f825f5688f8f719623294416edb18cee1cdb37dc0aa12e412189d82c2885e272237e316f52e42612692f3849baea43e810c1940c46d908a SHA512 25d2a0f1aa8e63c3b8246efe5ac49ac86c861bef8dc4ee3287dc502a2b09bd6e908684d1ec788d7667ae25ed4e48f84da0b8c3ba53ff8fc65dc44eed6d400128
+EBUILD orage-4.12.1-r1.ebuild 1541 BLAKE2B 29ff9a8d437fbb43f9816036b45506205e1c04b1677602b72881673fd5d60c61add9880efc0daef6427e1a78cf832e77812653b9959fc5e28af7df3b99fecb8e SHA512 4ed93290450f17cf222c2935a3a1e711d3c134013f62b9253378d84bdb28a8c51b6c55697e83b03f3db2dd9c9a68917b3216cd275aff064c55e217b3b60f471e
+EBUILD orage-4.12.1.ebuild 1606 BLAKE2B 9615f3a1c20a94c697ef5ee6225deedcd5089e40a1fb7d7257ad46b8a3bc69e0f32d51e1c4407424d9124534e78bb3e942e7ea4e78fc896cc3453dcb7546ad3f SHA512 465baef549d375d3a9105f10f8b638e16e6a7aa681aec26da41895e09ada76fab153f127c3266eba7d177a5a8f95bb1b214effb5895499cdda76d65ad7ea3cd1
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index 4769eb974182..d0928c5adc34 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb +clock-panel-plugin dbus libnotify"
 
 RDEPEND=">=dev-libs/libical-0.48:=
diff --git a/app-office/orage/orage-4.12.1.ebuild b/app-office/orage/orage-4.12.1.ebuild
index 291da02e3737..b8aee6929704 100644
--- a/app-office/orage/orage-4.12.1.ebuild
+++ b/app-office/orage/orage-4.12.1.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
 
 RDEPEND=">=dev-libs/libical-0.48:=
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index de9773122186..dbc278c5b319 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,4 @@
 DIST wps-office_10.1.0.5707~a21_amd64.deb 88085156 BLAKE2B 2288080715f0130b70bfcdb2886cfdf9c4648a1373367dde1f9d12b179a2816b75f5e342f73edeedf8305af9e65ecb290a297fb85d6a468087360537f0ef7ae9 SHA512 3812237ef2662a9b7e3777dc253c8c410fca73627eb42e33c177b7a2c52b27324fd3ff75b24e1309ecf77279086ab639e3b7fe3e42a4a420036e2989e1941ebd
 DIST wps-office_10.1.0.5707~a21_i386.deb 87863566 BLAKE2B 617b9f874b063ddbe2040f0a5bf30ec07149dae3f90f84fcba86b2bd2950a233190db72a9ba9d8563413c422a1da0d1b41767a864de6f13974467296f2dcb32e SHA512 0fb3eb873f0017d9dbe7a3dc7d849086cdbbd5eaaf5fbfb9bdbe737c40029799df83d98e4e0bf04f6737a0033c76fccba206a3342624b045e309b6d2c35fffe7
-EBUILD wps-office-10.1.0.5707_alpha21.ebuild 3070 BLAKE2B 804e1b24c2edda2ddf3852974b1ae9549b911b9f9e7d7472796526fcf94c2eb8dca28a6f84919e767486e1d880a9a96430bc66c430dd22f27ba04aed29a12521 SHA512 7cc98570d739126a8f32ee5c8ab86ef004257cd790d72012de8673c4389b053245cb85abf714bd6b227342e675e36d4ae9dc9e78eadddf8e866f8e0a9e258bee
+EBUILD wps-office-10.1.0.5707_alpha21-r1.ebuild 2629 BLAKE2B 0f8590d1e61368cb3153c2dc6ae04ddba1fb7ecc42a8e658d3de1ba0e290f6beba54084215a5858b9393d9279cdd6a0d2238bed5adf14c4899b8c4527aeafe8a SHA512 7d147ca953112aa9d1e121ee5b53ab7f841e5744706dd7a29509c2c798c5489f821430de74b08782808e619bc10ddd48404fbca3e7e711e1c0e95ffacf5e5319
 MISC metadata.xml 325 BLAKE2B e69a86660b1803578e847d64001b10f79bf3bb1fde9a226bcfe4b972183c947dfaaa292c8256cf635db263dae17ca34e796a89142fc6bce87f2efc8514821eb7 SHA512 f0dc46dcbbf409c15db60a6dc1b0e002300d0813385ff5bc006c333bea01be8c037edab4808b67256cd90a31790ad70f432eaedd41f8da8e4fa78e3f7440ac84
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
new file mode 100644
index 000000000000..d892d28e7b2d
--- /dev/null
+++ b/app-office/wps-office/wps-office-10.1.0.5707_alpha21-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font gnome2-utils unpacker versionator xdg
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_V="$(get_version_component_range 5)"
+
+if [ -z "$(get_version_component_range 6)" ]; then
+	MY_SP=""
+else
+	MY_SP="$(get_version_component_range 6)"
+fi
+
+case ${PV} in
+	*_alpha*)
+		MY_BRANCH=${MY_V/alpha/a}
+		;;
+	*_beta*)
+		MY_BRANCH=${MY_V/beta/b}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
+
+KEYWORDS="~amd64 ~x86"
+
+SRC_URI="
+	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
+	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
+"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+LICENSE="WPS-EULA"
+IUSE="+sharedfonts"
+
+# Deps got from this (listed in order):
+# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
+# ldd /opt/kingsoft/wps-office/office6/wps
+# ldd /opt/kingsoft/wps-office/office6/wpp
+RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+	sys-devel/gcc
+	sys-libs/glibc
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	dev-libs/glib:2
+	sys-libs/zlib:0
+	net-print/cups
+	media-libs/libpng:1.2
+	virtual/glu
+
+	dev-libs/libpcre:3
+	dev-libs/libffi
+	media-sound/pulseaudio
+	app-arch/bzip2:0
+	media-libs/libpng:0
+	dev-libs/expat
+	sys-apps/util-linux
+	dev-libs/libbsd
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	sys-apps/dbus
+	x11-libs/libXtst
+	sys-apps/systemd
+	sys-apps/tcp-wrappers
+	media-libs/libsndfile
+	net-libs/libasyncns
+	dev-libs/libgcrypt:0
+	app-arch/xz-utils
+	app-arch/lz4
+	sys-libs/libcap
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	dev-libs/libgpg-error
+	sys-apps/attr
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/wps
+	doexe "${S}"/usr/bin/wpp
+	doexe "${S}"/usr/bin/et
+
+	if ! use sharedfonts; then
+		insinto /opt/kingsoft/wps-office/office6/fonts
+		doins -r "${S}"/usr/share/fonts/wps-office/*
+		rm -rf "${S}"/usr/share/fonts || die
+	fi
+
+	insinto /usr
+	doins -r "${S}"/usr/share
+
+	insinto /
+	doins -r "${S}"/opt
+	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use sharedfonts && font_pkg_postinst
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-office/wps-office/wps-office-10.1.0.5707_alpha21.ebuild b/app-office/wps-office/wps-office-10.1.0.5707_alpha21.ebuild
deleted file mode 100644
index e480a1469eb2..000000000000
--- a/app-office/wps-office/wps-office-10.1.0.5707_alpha21.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fdo-mime font gnome2-utils unpacker versionator
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="+sharedfonts"
-
-UNBUNDLED_LIBS="
-	media-libs/phonon
-"
-# Not fully unbundled: media-libs/phonon , libkso.so needs system copy, but
-# wpp fails to run if bundled one is not present due to invalid symbols
-#	media-libs/phonon
-#	media-libs/tiff:3
-#	dev-qt/qtwebkit:4
-#	dev-qt/qtcore:4
-#	dev-qt/qtdbus:4
-
-NATIVE_DEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi
-	dev-libs/libxml2:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/libpng:1.2
-	virtual/opengl
-	media-libs/tiff:3
-	sys-apps/util-linux
-	sys-libs/zlib
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	media-libs/libmng
-	net-print/cups
-"
-RDEPEND="
-	${UNBUNDLED_LIBS}
-	${NATIVE_DEPEND}
-	net-nds/openldap
-	dev-db/sqlite:3
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-#src_prepare() {
-#	default
-
-	# Remove bundled libs and rely on system versions if possible
-	# Commented lines are about the libs that cannot be unbundled yet.
-#	cd "${S}"/opt/kingsoft/wps-office/office6/
-#	rm -f libQtCore.so* || die
-#	rm -f libQtDBus.so* || die
-#	rm -f libQtNetwork.so || die
-#	rm -f libQtWebKit.so* || die
-#	rm -f libphonon.so*
-#	rm -f libtiff.so.4* || die
-#}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 237f10357999..de59665169a7 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 4a1a3ef5afed..6b81f953e57f 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,8 +1,10 @@
 DIST gemato-10.3.tar.gz 63279 BLAKE2B 317c98c3989399e3a87cd5452edc509da86b17ecb41d295feca4071141d3ff1ba95a86544d64c786726f2148a899c1597020dde3513a913b1bc1811e2117337e SHA512 dd2b47238ac0707984358bd763ce0dfb23d8b09561939d22aae2e60386de388af9c5e67faa89a6ab9da4f0b334ee8486eeda66e5eb83bd2a26241b8a2b88128d
 DIST gemato-11.0.tar.gz 64123 BLAKE2B c1020368eca1f8914c2377e23b27e953e06268e70754e2265af6d31defb2960263371aa6cbfb22b046d1bbdf549c948b62858d09055e8813fc9148a28c264a81 SHA512 c9ba297950a96fc7c07f88b8dcda33c3f351043ca062c354425be43ce4915b5ee37d6a28122797cfc01152546e72eda647e27f764b53345bfef87b292dd893e7
 DIST gemato-11.1.tar.gz 64338 BLAKE2B 672816956115bcf9a8f4832d8ca6af290d5ea2db213fbf485e969ec6f1c79e1f9a42590a8b88e7c204608ee8a1e2d2e7935b02a046fc08730dac667e5e371d09 SHA512 518f2728564a70e1758c3ee1290b01a27815fb51a64e632ad08fc6481becc0bf03756270aa2eed3fc3403557226c00a3f6099e73cd110532455ead515b37e109
+DIST gemato-11.2.tar.gz 66260 BLAKE2B 94b7f4a6718314e767676589b10addb05d52133e7e860b257cb558f31ffea27c88bc06bfd2fed7268bfd34179aaee77a9a6e7ffd3bd3fc4e43987e719d809f1e SHA512 61c5a8dccbb99c5ff7880a4e3d26a3f468a70e9622b7aebf53d312cc7105ec7c9abb04d00acdfa9cac29c4779b267abc35074272b7c921f8221d18383b0d445c
 EBUILD gemato-10.3-r1.ebuild 1173 BLAKE2B 403d19258abbe00d21b215f8355a0dc3283e2d077af9402a4c7f72f75073e9d88eabc9dbe704f43c09f3564c0553f984727de43737baa1c8409ec0dc9d43c044 SHA512 ad9023211e6a389464c9d0e92b14dca197eaef8bad9b64e618f666cda79d258e3b52aa2a9e9b789a1f0d8406cc8dc48c32ba0d35757ac23f5aed8212f556c242
 EBUILD gemato-11.0.ebuild 1173 BLAKE2B 403d19258abbe00d21b215f8355a0dc3283e2d077af9402a4c7f72f75073e9d88eabc9dbe704f43c09f3564c0553f984727de43737baa1c8409ec0dc9d43c044 SHA512 ad9023211e6a389464c9d0e92b14dca197eaef8bad9b64e618f666cda79d258e3b52aa2a9e9b789a1f0d8406cc8dc48c32ba0d35757ac23f5aed8212f556c242
 EBUILD gemato-11.1.ebuild 1173 BLAKE2B 403d19258abbe00d21b215f8355a0dc3283e2d077af9402a4c7f72f75073e9d88eabc9dbe704f43c09f3564c0553f984727de43737baa1c8409ec0dc9d43c044 SHA512 ad9023211e6a389464c9d0e92b14dca197eaef8bad9b64e618f666cda79d258e3b52aa2a9e9b789a1f0d8406cc8dc48c32ba0d35757ac23f5aed8212f556c242
+EBUILD gemato-11.2.ebuild 1173 BLAKE2B 403d19258abbe00d21b215f8355a0dc3283e2d077af9402a4c7f72f75073e9d88eabc9dbe704f43c09f3564c0553f984727de43737baa1c8409ec0dc9d43c044 SHA512 ad9023211e6a389464c9d0e92b14dca197eaef8bad9b64e618f666cda79d258e3b52aa2a9e9b789a1f0d8406cc8dc48c32ba0d35757ac23f5aed8212f556c242
 EBUILD gemato-9999.ebuild 1133 BLAKE2B 960eac21ef1b8a455d91fda988c2e7cff6ba13fdb802cb6c33ad78a9aa6b9a7443205aa68f425859a3d33ae58a92ff7baf15b30af4f42ccf8d579e78cf77c0c8 SHA512 562fa2610547711fc31915cc8e447dc1226afe3498353e341b547c8f6099d648092a1bb60d9b036ac069081ca533e6d761c945a47c14a03f0ab176cbaab84ee1
 MISC metadata.xml 670 BLAKE2B 8495c32b74bb84f14d4fdd19fefd5c852534547fff65656f76290f019ddb2412453da59195bf67bd596acdd4f24b9f4fbb1d357375fd9ab1d83466e8479f53c4 SHA512 fc2549228500c0829f6e53e011cf46bee9bd3e5b234ceb73e3ef9c4ca3b3755ec3dbdbd86ff9c16ae65bf40329c47e9d6c4b7d78c810e609a50ad508c2776851
diff --git a/app-portage/gemato/gemato-11.2.ebuild b/app-portage/gemato/gemato-11.2.ebuild
new file mode 100644
index 000000000000..6dd1dc95ea59
--- /dev/null
+++ b/app-portage/gemato/gemato-11.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+blake2 bzip2 +gpg lzma sha3 test"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index b5c4052b9a39..e36a84242a47 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,4 +1,4 @@
 DIST kuroo4-0.90.5.tar.gz 342698 BLAKE2B 4d9f41214fc50dafdd387835b3084617568bcfd3497f01eb15905d9d5dcf03b1072e3e8564ec3d7adfa3d6b3a617f459beb67426b924e0be51f29bf246f01dea SHA512 aed2ec984b77768f5325b41b01ea1c63e214e45699f9c29e1bf11cf7d6ff6ecc6660c2cc07948d0fc66f0469154fa00e1df9e78d330ad426db86a70db85f400f
 EBUILD kuroo-0.90.5.ebuild 549 BLAKE2B 6e1bc45b00763db1e77748027a46f0cc1430325db215facde70f621df3e77c630acf287645eac8810cd07fd77ae4603688db7d7bcba021b8e689115907631ca2 SHA512 b3db4a1b661e4d058f74e089a9df47922d8418b5439b262c0ecd684d6b5f939d2aef7a165f57a61203067e4de16f3bb750ef42aeb399c351bafaab3758989809
-EBUILD kuroo-9999.ebuild 1315 BLAKE2B 8366c296b57a963c73d298ed5396728dd28f4c1e2abd9e144ae9ce3f837503ac8cdf764f693ec168d6f48c04ac5e0016398ca42279e964bc88e39d77b720a5e3 SHA512 bd4dd71c29c416c9f06c7e2de85a5e50cdfedd82d570222ac71f15f3629fe4413cf773798e8a72d8d11bb1a6c8ba0c1d2ab834afe148a7b67d201710345ac18c
+EBUILD kuroo-9999.ebuild 1356 BLAKE2B 2cc6b0d26b06fa0c44ab15af2e5fc61717242bf191d2f2f25a8d6d9459b21847138517d13e7fb778bbcbc2a5cff2c8178ed8bf59fb70fe1e7c1b2d60d64c51c6 SHA512 f82bae1c8e0a8df20a8aa2ddb7ad78d75784c8a4e43705ba8ae29d4932a44d3988f545f2bc25e294796d2d0fa084ded44fd02f08c34e3c040e903bce7133d8f8
 MISC metadata.xml 848 BLAKE2B 206ea97ff1d664d67c7a7fa532702364ef8d32cf8169cb00133fe38be7170592142deffb6a85ca1ef1cc9e7afa48e8fe72a141cc690a4c9db46d8986336c7a49 SHA512 b474295993a6b05a885bc9873f18f3c880b953417471059d06cd3a367b0b8d482809091126caf5443f5f761776eb96f128138352dbeaa86219ba4554c924f3db
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index bb73238c0ec3..122f9cdb9cae 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -15,12 +15,11 @@ KEYWORDS=""
 SLOT="0"
 IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	kde-frameworks/extra-cmake-modules:5
 	kde-frameworks/kconfig:5
 	kde-frameworks/kconfigwidgets:5
 	kde-frameworks/kcoreaddons:5
@@ -34,11 +33,14 @@ DEPEND="
 	kde-frameworks/kxmlgui:5
 	kde-frameworks/threadweaver:5
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	app-portage/gentoolkit
 	kde-apps/kompare:5
 	kde-plasma/kde-cli-tools:5[kdesu]
 "
+DEPEND="${COMMON_DEPEND}
+	kde-frameworks/extra-cmake-modules:5
+"
 
 pkg_postinst() {
 	if ! has_version app-admin/logrotate ; then
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 308647154b22..4084ba511154 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,7 +1,9 @@
 DIST portpeek-2.1.21.tar.gz 12624 BLAKE2B fbf70d10799e4264832644a04b197816aa5824a7dd1063458bad1182441ebd70b6b05084f2577b097ba1bce5837728b2aeeb7f2e0c33dcd6d8779f2f3c946287 SHA512 7b430c85dcba4ac0d29e6fd680eaed2b59a60b5d21f0b93e90ff2e3ca7018f141e858accf10a035b75463c067444ef1be718be198bb6cc237827c9b7e67df76e
 DIST portpeek-2.1.24.tar.gz 12736 BLAKE2B 5d4d30e3c7d853e2a3be7e094ad7a40861300ee2f1582dd35d352f91354bcff504dcb8b53830a5b13dd31accf64095a0b2e3836147663d2505016acc381369f2 SHA512 fa702483c6182685242a26401ba1b058f276ff6fd18839fd7f566d48cb62c2cb78029789089267cbacc1b435f1aa815c0df51ace06afa71f242298511fa79d7a
 DIST portpeek-2.1.25.tar.gz 12864 BLAKE2B 1b0522b1d6beee25451f461c8601923666712470493f278378c8d314b48e3070d6a8853579d3636bee86cb59d3ed3a42cb1695a25d41a256b78220b8c99a4c79 SHA512 9d40ad387d252bb42a66e27de00c63f2f4725a794da7bb35fc5519ab5342e309c823090005336b22add81e4e043b0fa4f97ecdb86bb20bf595fd4188bda437f9
+DIST portpeek-2.1.26.tar.gz 13004 BLAKE2B 1de44e9cc3f097154c5374c2619367d20bba62c69acb7ef4b7efcab17a60d0918c98f6d1fd2ec149379f2408f4a932d3389ff19c720c9a63e4dc197021d4e2f8 SHA512 0bf139381629118cc216c1fb21e65d9a317eaa0f1a200f8032f6050dea12940ab6bfc440a0001e2f26d74a21698d8de14001309342c202ae9837923d703b7ad3
 EBUILD portpeek-2.1.21.ebuild 692 BLAKE2B 30e2e87dfe6088945b51c93d67a69798503266774b094517cd29d8a408f7bfb27716dad8026a01b10e88e15ff1e91b5ecc14034b87d24346f3e8dd8122f525fa SHA512 02c5df14a945e8703ae9f99ee7d61083dd6b125ff5bc7d12c9f09cb0c8006335696de9113a8d490ce6460bd59d5b91f71af50119efb943e62b5d6ad196149045
 EBUILD portpeek-2.1.24.ebuild 694 BLAKE2B 78f2e828f1f25bf4a430a050faaa9795a3328e35839bb57090c397a16966317a19f6e38df261f20ee5bad64e28b97efa574cd2147df993a69ec7190652337675 SHA512 2de0c56eade803cfde62c396d3347a4a3242ad36c10d5dcd4895d3c7fe2b20c62fb9c8272e6558c6b7a64b25301575a9416a5e1dc788002825f3f9a8c3c5ce6b
 EBUILD portpeek-2.1.25.ebuild 696 BLAKE2B 4bc8b63dab76b4d0459c9630ab4496dfc49fe96be9eafa6e9bd4ec2a0f7f66880027f55b06bf2a2eebe8b59719222d9560757e03c1465dfa4ab5b5570cb9cf2b SHA512 a6278a8bcc7fec749e01ac92a600c7bbee5f355c27bfb3b0a689df60f712f0bf9d73cb142df5d2fae757f91b238af3b6376e2f142511f18c851cede2a0398f06
+EBUILD portpeek-2.1.26.ebuild 702 BLAKE2B 96268ffe951345572fe4df7991c9cbef8871480b79b58d69063fde7e3893329de4f8542149dceb76de804f51cd59b14045591e8f6f6bb741087ee194ee461c18 SHA512 5b309404209ebc4b1eb4f09734cd09ca0331d64685e845bb5265d9dadd6712ceccf5523dbcc10091131de70b66d4278b434f48bb900d585c644ae62ba3bdfe91
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.26.ebuild b/app-portage/portpeek/portpeek-2.1.26.ebuild
new file mode 100644
index 000000000000..1fee1c28c074
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.26.ebuild
@@ -0,0 +1,29 @@
+# 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 python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
+SRC_URI="http://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.0
+	>=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 99d058fbf4d2..81cd09505a35 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index d019ad6f5b53..13544cdaf3ec 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -5,7 +5,9 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa2
 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737
 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688
 DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319
+DIST ksh-93.20180213.tar.gz 16055555 BLAKE2B e8a79af8c047f2913f7104a3600f17d61023f756ba6e6b4b1591c748875279d68ed7b00319826ea97acb9b783be3f07c7de1f9ce5e1fbf88ddddab6136285078 SHA512 a9f699e327e1d0446d39aafeda68c66c0b51d773a9e11dbab32471ae1a9db89b718b18bd4a4c2cdf87dcca6d33d8bd7f47f59c13055e7616a67c8b9e32a19b42
 EBUILD ksh-93.20140625.ebuild 1173 BLAKE2B 7e22ecae92c085791bacbb4ae8cad410a5abc18f6901a0e9667f9558cb3788e327acf73ebe10abb63723a7f6b97480c82873317a105aa120e99579271b6415d6 SHA512 9b93f2101fcc17470fdab5facd402143971edbcf06ffff74b6a969dbd7340d863bbd5a825e852bc661e3db52fc32542aa37a3507c9889ffd24a0f89da367b53c
 EBUILD ksh-93.20160110.ebuild 1115 BLAKE2B 12d12b1e67a4aa4b8d0157da5e3a1197d473e1c3339d928403019be1f5bb45348d6ca3522cc8aa5868e5ab4ef75647753e6a5eb98bee4e245fcb0eb2766986ba SHA512 09e6068ad0b4393a5b60ff40324045856b2ad8ed36fcb14d04412552ab601bad8305ddd1f9267a6382f06f64c6bf2058235391e850adbf2ffd39a9433b830f17
 EBUILD ksh-93.20180129.ebuild 722 BLAKE2B 0c7ad57c348ba9a9188b5561d811c9c9a0d4eb46eaf1ae9046da7a63775798d931d05df30bf046f666da6da974b6f02d3ca926e11a06b1dc29c79af71660c5b1 SHA512 5c65d377b3dc426dfe3195fbaae331cecb2ab0076a45db2f806a61db0954356720cd6af0ef33c6957ecd57d2f5acbfec5b839a6c1fa12578cf9b43cfe2c7dea1
+EBUILD ksh-93.20180213.ebuild 722 BLAKE2B 593684c33bdde8cf973cb6a50eda8783c22fb39fcc21ba53744ee831716d7bab7f9e792b432ad72738226b8aaf8b4044381fff4f5831600098c5a4f93c44d21b SHA512 9c720861b4072e0e9b6ffb72fc467325ab8dd57cf868d31dae0d218f6e11366cd75bca3b0d9a70ca4a2a9e98c45d9ad286e778dc7c50fb7ed99ce5159615fa73
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/ksh-93.20180213.ebuild b/app-shells/ksh/ksh-93.20180213.ebuild
new file mode 100644
index 000000000000..f1059a6fbb41
--- /dev/null
+++ b/app-shells/ksh/ksh-93.20180213.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson prefix
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="http://www.kornshell.com/"
+
+COMMIT="b6aaffac8880000a9f5343e9dfd78ff2a7964b51"
+SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!app-shells/pdksh"
+
+S="${WORKDIR}/ast-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/ksh-prefix-r1.patch
+)
+
+src_prepare() {
+	default
+	eprefixify src/cmd/ksh93/data/msg.c
+}
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED%/}"{/usr,}/bin/ksh || die
+}
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 1f29f25c95af..6ae1a562dc13 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,4 +1,4 @@
 DIST zsh-completions-0.27.0.tar.gz 218869 BLAKE2B 7214506be2100d596842988f946b0f25f9c434f31a6b1d66c40baa1ccf259f827be96011d790f41b85abecfcb0fc1e5d56a715ca80c9926a5fd6ccc779ab98b0 SHA512 1c25fce14117d6eb652e2d3bfb49e68baa9f7c5832031582ec8c3066b91f07491067ff887647177048b51146beda1bcac7080abf140ea5ef846fcdd8ac388b8c
-EBUILD zsh-completions-0.27.0.ebuild 789 BLAKE2B 36ac8eb9c99207b3f4854ea439a00468292cfe9641dbb9d5b395032da7446dcc2104e7ccd20254b3e6c68729ecb65a1de1d082b4c72cacb08d06fc08b8306b23 SHA512 177af148082b41ebaba62dac01b4d6c5bea533915048225f5201039c87c2e442a77e67d37150bce3cac35b03d64fafed735f787bcd193f7af3ba634db61e4449
+EBUILD zsh-completions-0.27.0.ebuild 796 BLAKE2B 5fb690109c0d4817be942e3484280d3a8ca9b90b6b643d1a80e4ac545ab4ada26decacc8beea9613641fce830f801909a5e23db904c45bedff2a084a27c3379a SHA512 8139a065b8eb26dccd1a07a72f5300f33a02355e5fea596fc5f2d1a7dd6301c82be6b9e99f9ee6bca9b3ec6094fbdb0904932d7793d34e40aa7461ea46326dde
 EBUILD zsh-completions-9999.ebuild 785 BLAKE2B 41e5cb4e18fc3947a5478e4927c1552ff20441d8e249f2589efbe2b1796d625381bb02d6180d8eae4c7e415b66aacdf386993089ba360ac4b039df8fee89f700 SHA512 6801846ac6ca49cded07839324e97ac8d32fbb46454b60e56dd0a5644d918bff08b316ebfd9e5cb4c5d96cd4d12d3f1644abfc3893062e9267964386b4f5a8e7
 MISC metadata.xml 345 BLAKE2B 6d43d457793d6548b98d393ec863c59a4f1fadf22cdc64b8366cc2f96f7b1899bb1924006e95d42db0609d72dd7664e743468c99eb2cecc9033a5a29867ac191 SHA512 e09a3412d8ea166270e3d6ce1d708cb989efa6889116d219ff76d96d0d92d533d7988504208ebc5e6a186327b6acc4e8b2c719c21c86bd84154292f6eac4a430
diff --git a/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
index 348182015e25..f59a24150fa9 100644
--- a/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~sparc ~x86"
 fi
 
 DESCRIPTION="Additional completion definitions for Zsh"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 214498ad25ff..6e4196e0bf7b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 8ec97fe3f86c..17aa9d8d4058 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -4,5 +4,5 @@ AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
 EBUILD convertlit-1.8-r1.ebuild 882 BLAKE2B a92251a0e9897e3d58adca13750dfe611411084c9c3e0a43357d9924ea79ca56b0b558129fa7409a756ebf92429b2442118bf41e5269765a2d69c63f0e9172d1 SHA512 6dc7d07e27d0ccb621aedc5c9f9c8f99a311645fcb6f1f3761ccbed34c8af4f7b0741bb08ecbb4e4a5994ab2ecc39c6f37772d0799b2c0f8842707dbb5ab7c39
-EBUILD convertlit-1.8-r3.ebuild 956 BLAKE2B ad58b331dfadbb2467b83d4ba626f603953db103b46da10b20e656ccfd1b4de01bb5026c7bbda1915ab9f09489e1fae74b77cf2bed4a6cb59c59af113e155f01 SHA512 e17043bfd5060376468a160f62b635ff3bbaa430cf6083d2d1a05bd9e8de5762efd912ebef0edda1ef551d7326d69d5898a462def1fb9095e60380474057aacb
+EBUILD convertlit-1.8-r3.ebuild 955 BLAKE2B fccf7ddece9ed368d81fb2f8047fa999c9ab2e84c739f650806833b540d45923d30dcefdd940470b4fdf32577b22212a24912614709ab40fa77a0c38e88e41b8 SHA512 851ba0a807e189a2fcfecf35e2f409b74c9b582dbec4eb5cef442f5ed95b8407ad464dd6c888612bb4221ab2177ee73cb7be6b077d12f52d116fbbcbb42f4a06
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index dcf0a65454ec..de6f5c636e36 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.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
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 643172f239e3..eb80f1b177aa 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,5 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1852 BLAKE2B 73578b17213d709948be2b0a519a76bc263fb1e78e1fc012fb50d302e4caf16e20eafbc4bb5d022c92f8dd465f3a968af4dcaf1388ec025594459cb3a07f6137 SHA512 1318b4293582d34a4c91c4e9bd067c40270179448b50f74997bffc86cb08074be24358179c15a5956d525299f2d092a94f348cf219a94e9da8c6ede384b150e0
-EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1858 BLAKE2B d83720dc59cfef605f3cb2e3224e96f6c40edbabed8a7593d85eaad3d800fc8d378f39c8ec2f306fecc3f03f42e67bea55b1c3ef66d78915d9d0c6c9ca7c64fa SHA512 948623d88731cfefec58bc6608942512ac9a8db9af8661ac85821915b11214bb0315d42df3d9fb4d4bb72e050ede38d4af32290c3a1c60bf7ca3e726feb32adc
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1921 BLAKE2B 1e9ac4e84ae21663fcdce0a544503afafcef7a95fbb507eb0652eecc7aeb1d7f6c622511fde28c7464c7cbd2c88030aca641358bb91e2feaf5ff9636b01faed9 SHA512 9412b0c1bcf4e92c680a1b7f20e9fabfef82dfd5cca127c6de2bba16ded5452d1334b76a501b65891a70dd5da0ebfd8668b8013748ef245650406274b1516104
 MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
index 99bca5152f30..b2adf5a6dac8 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
@@ -29,6 +29,8 @@ DEPEND=">=dev-lang/perl-5
 	~app-text/docbook-sgml-dtd-3.1
 	~app-text/docbook-sgml-dtd-4.0
 	~app-text/docbook-sgml-dtd-4.1
+	~app-text/docbook-sgml-dtd-4.2
+	~app-text/docbook-sgml-dtd-4.4
 	jadetex? ( app-text/jadetex )
 	userland_GNU? ( sys-apps/which )
 	|| (
diff --git a/app-text/tabler/Manifest b/app-text/tabler/Manifest
index bc32094a8076..bd273408a4f1 100644
--- a/app-text/tabler/Manifest
+++ b/app-text/tabler/Manifest
@@ -1,4 +1,4 @@
 DIST tabler-2.tar.gz 87706 BLAKE2B 32b259cd84a9cb8c1475ef6da6815f96e5eb947d392fdd5150570ce639a7fcbc251baa9204e1c25bf471be025ae920b203fc0f89cdef46360b0af4d9f52122af SHA512 6f01796b4cadae22f9ae0029ee8a7bb224d04faae1793b13c9d8473e6a902543a5bd6da86e806f9c50c8b39ad7f5d44525c2a701920cd6c62c27995409d0b1d8
-EBUILD tabler-2-r1.ebuild 431 BLAKE2B 0286f9fc778bef9c94e41e6986544539d7e3e42c260aac78e3ffcefcbc485273c3fe56933ef825cf42b72a5dfe565aedf7d73579d549904649455b44245f9c63 SHA512 821fea3041884d6ce0c6481f3ffd6e570cd585c0328f0f1d209fc34e72fec6f5716dccf13b970fd2aac7fee60bc18efd65d7316a7c5c4eef369969f179874c00
+EBUILD tabler-2-r1.ebuild 430 BLAKE2B d8e65d4f85de2588b3f5a3b35421a065d79f9c0cb6e96378c3faa55528e7e8eeb53b827e87501fea3bd5fc60bad6e6872622f577ffc97c2d9f99ba97182209eb SHA512 dbb2f1f0b35e2f1125de7ec7908ca0dcac198fea794fbaabc441e181805f7230f0194f4f02f120dce3f84646749d94c87a7b87c033c264b5de8e9b0f482bd8fb
 EBUILD tabler-2.ebuild 444 BLAKE2B 01a00d7ac3e2e237720e447d0057ccec48520839cf7a9921adcaa332f81808e25e646f9faa7e82689d41eca25e22b9a7f2cdcc8013cc0c900e7686b0575f0b0b SHA512 7c7a39eb2fce427f311d44394e16f78b10cb49b6fae469d278521f414f19f27569ed1b16a2ceb84ceec7e4045eeef1ebff8356d4c29c8091e79dc7560196aa74
 MISC metadata.xml 243 BLAKE2B d1a92b4f94bf011a4e2e185cc73d1ba11312a451e3d03437ca809bdd8df91be0f8280839eea56fb9dfb2cf711c1d2021f11ddec24833df077e2da061353df255 SHA512 c0d977a25c38fe6c32745c0b18520aa510c617922f267a468b2b788480104214bb5db37564d6ae52c45298e98da2764595734c827ab01abcce1270ed241e3bf7
diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild
index ed6a81d08f97..56eb34d0a522 100644
--- a/app-text/tabler/tabler-2-r1.ebuild
+++ b/app-text/tabler/tabler-2-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 src_install() {
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index d08188588879..a7b947ec7b54 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -788,5 +788,5 @@ EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
 EBUILD texlive-core-2016-r6.ebuild 11560 BLAKE2B eccee05d4a349985c5eafc0149d5e85ded7d7c865883b2fd668a3403313ed74d6ba2060ab730d80d8a6d47cb19e384e2e62329f8d6b923183ab7732441434276 SHA512 1e2796e4c9348d229066324ba9916b9635957b7a823836abdfa1a9b55e7062d2c175f38c3d1f67f64831c44fc3ebd6752decb2edf2411f6252a24d410502ca2a
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
-EBUILD texlive-core-2017-r3.ebuild 11606 BLAKE2B 7ee61edf50589f127357ac70116e0e822d4927add6c4730287e8acfedf4e4df306dd226f76fb1c0e3de2e56c71c8f75083520af375a08d041d862c8c235a286d SHA512 13a5e195179fb66f1825d55fe24ce593c3e84ee803cd3903b0ee622cc8ace03021fa41718a174d3fa55b5a5b8a8df1feba78af99d5d9223f5dff7630b8573bea
+EBUILD texlive-core-2017-r3.ebuild 11605 BLAKE2B 11bd1b193c265e46d17109374c84901abc65885a81f15929c303700858a22e8936ece1519c80bb9e06b27b46473726e22e470aa75ff790e1624885f8dbdf41b5 SHA512 9fddc7e9634eaf2a28374017922711e2b9343cf591b44e390bc792850fcc96d46f210856c7f47b5038070e8d90861674f17e99a4970f1130da09dd17068c5779
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index f4f4d5b50d8d..af54a567e4a0 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.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/app-text/texlive/Manifest b/app-text/texlive/Manifest
index ab7d40099e47..c640f78c45bf 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2016.ebuild 7545 BLAKE2B e6924aa445756dbd686f8f87cb717bcc444fbc39ecbebd4828efcae10f25a88fddcf8a9649a97b485996fb8df54fda0556de9cbe38d1a9e631f1bd07e0a5f4c1 SHA512 f5306d3c4031cd7095e27e41990f57dd8f8a5bc4045ab4ef4ed40f9ab7b3bfe656ab8d531c1aa527f316895eadc774dcb3ccc81724b176794e89dcce726b100b
-EBUILD texlive-2017.ebuild 7405 BLAKE2B 909108168060797e2866e6a58e01a885021ca71e34f8a59bf8ab7c44581444d7d6bcba2d251afdceba3c55333c8056abe0ef07024269aed680324452cba55baa SHA512 4f796d81b4196c972df52be0f302ee4e93f9f6a010002588a06da7275bcbecd1c1e99447a70e7a19b8720a71f1a600c78be6fb2a7850dacf7ffad801856f8f2c
+EBUILD texlive-2017.ebuild 7404 BLAKE2B 107755b960afe3a5aa23bcb2776e934ec389097ad3af1aa19f72ed019d8f39eac491a4a18f243e32cd4ae59d32f29a356e155ef8e9494fe3182f2c8e3e209b24 SHA512 7dc726d2cd96746b9b50081c968305c3cf78bdd1fa05372e9dcc405e3ac905114f2ab64b36b75d16754c71690a96bb17951c18dac9aacd135edbc9a633d566fb
 MISC metadata.xml 2501 BLAKE2B 973dc4c6f9f8bcd51246dc345a9462708c0272604f95e38789f2583c25fc1305fc38a602389bf41d821d5b9aafb7e5ca25cd0554741d0121c8c62446842ea39b SHA512 0a7fc544e4e52ce62503217fa1257813694701dfd4b4e170b19e3bcff698e87f97e586e7a6c4879fba8f27c8478efc211e538eefaf19a46488b4f1ddbd8312e0
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
index a1ebf85c16df..42a205ae4610 100644
--- a/app-text/texlive/texlive-2017.ebuild
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/tuxcards/Manifest b/app-text/tuxcards/Manifest
deleted file mode 100644
index 55734e7a5a5b..000000000000
--- a/app-text/tuxcards/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tuxcards-2.2.1.tar.gz 310015 BLAKE2B a43db7814b6fc222f3d79652fc208e405cec4f47b5b335d14196d7cc936c8823251f5eef73b225f84ba91f4b35d07c9d64e517e58e7098672115bdd73b6ff3ae SHA512 70d420f57e4d08341f4137fce0fd4d7afe59b9af5a4ef821d93b3aac912401772cdab2d240470ab96ba6c91a1548eecac87fcaa6c746e93d18d7b5be69d86052
-EBUILD tuxcards-2.2.1-r1.ebuild 596 BLAKE2B e3a438838433d12092b2ea798b5b88fe027285e60a71c65d3f58d7f00e42bdc42188d79ff2ca7eb436d7e8788f878fb32b8688fa4b762e24dbbda41138979931 SHA512 990a69fe5a983dedbc39dac6922c68e10f9b9a1004767187bb96469cd60807a2fd6529f0a5e9db35648b7dc1a50304bb83e2874d89923c25dcdcfc33bae220ff
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tuxcards/metadata.xml b/app-text/tuxcards/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/tuxcards/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild b/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
deleted file mode 100644
index a8d98af0094a..000000000000
--- a/app-text/tuxcards/tuxcards-2.2.1-r1.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 eutils qmake-utils
-
-DESCRIPTION="A hierarchical notebook"
-HOMEPAGE="http://www.tuxcards.de/"
-SRC_URI="http://www.tuxcards.de/src/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	eqmake4 tuxcards.pro
-}
-
-src_install() {
-	dobin ${PN}
-	newicon src/icons/lo32-app-tuxcards.png ${PN}.png
-	make_desktop_entry ${PN} TuxCards ${PN} "Qt;Utility"
-	dodoc AUTHORS README
-}
diff --git a/app-text/yagf/Manifest b/app-text/yagf/Manifest
deleted file mode 100644
index b3a6e13aff0d..000000000000
--- a/app-text/yagf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yagf-0.9.5.tar.gz 427018 BLAKE2B 4aace2cf06cafc22e08b1b670727e46234509bb40f15e537d3878ee41c0d0cf2aecc22b9a443f87182498180b1d1791a51b1870172267e4a24a1c4f9f7edfa03 SHA512 a0b77e49c11be0ed043d3f44b1c48122cdabf0ae4ae69d84bc01eee0a8b084dae8201234e08816065d449e4d47bd704f282b1cd3b31c3539d201e9f32dfef05c
-EBUILD yagf-0.9.5.ebuild 1544 BLAKE2B 2f9b3d9232d9465c8bae8263c83d683f38186281d5ff1d5456491c8a1ac2e9d5a75cddec4359438386fc23d5a6bed9f1d9f4b5bd7e7501140a5e2d83e302e0bd SHA512 5baceb14e795047d7a0cc9c9ef7c77bf3e8ab36055982d0f3b9268ea34caa3ad53373ebff3ae1fd7afaa3a6cb30125640fbbde1d8aa52433ae304284d485a004
-MISC metadata.xml 1017 BLAKE2B fbe0d05cd5cf1de7c5f9389589609117ffe6c829580c1e2fc2184909309fa1f467b91d50b77c43f88ada8f23034028821e5ddaad32b3c6290f34f749d7c3a2eb SHA512 f7a240694f0fa6dc6f26f042d5d332acc2a255819c0b5a0b99d46220b747da94d9f345e0fb87cd631f7b6fabdcddde3cbd42ffd8e738e119034e1608749c094a
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
deleted file mode 100644
index 76b22cdda21f..000000000000
--- a/app-text/yagf/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
-		With YAGF you can open already scanned image files or obtain new images
-		via XSane (scanning results are automatically passed to YAGF).
-		Once you have a scanned image you can prepare it for recognition, select
-		particular image areas for recognition, set the recognition language and
-		so no. Recognized text is displayed in a editor window where it can be
-		corrected, saved to disk or copied to clipboard.
-		YAGF also provides some facilities for a multi-page recognition (see
-		the online help for more details).
-	</longdescription>
-	<use>
-		<flag name="cuneiform">Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
-		<flag name="tesseract">Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-text/yagf/yagf-0.9.5.ebuild b/app-text/yagf/yagf-0.9.5.ebuild
deleted file mode 100644
index 3ebcae73386e..000000000000
--- a/app-text/yagf/yagf-0.9.5.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
-
-PLOCALES="fr ru"
-inherit cmake-utils l10n multilib
-
-DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
-HOMEPAGE="http://sourceforge.net/projects/yagf-ocr/"
-SRC_URI="mirror://sourceforge/project/yagf-ocr/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner cuneiform +tesseract pdf"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	app-text/aspell
-"
-RDEPEND="${DEPEND}
-	cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	scanner? ( media-gfx/xsane )
-	pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )
-"
-
-DOCS=( AUTHORS ChangeLog DESCRIPTION README )
-
-src_prepare() {
-	# uk translation generation is broken
-	rm src/translations/yagf_uk.ts || die
-	# respect CFLAGS and fix translations path
-	sed -i \
-		-e '/add_definitions(-Wall -g)/d' \
-		-e '/-DQML_INSTALL_PATH=/s:${QML_DESTINATION}:/${QML_DESTINATION}:' \
-		CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-
-	l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX=${libdir#lib}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	remove_translation() {
-		rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" || die "remove '${PN}_${1}.qm' file failed"
-	}
-	cmake-utils_src_install
-	l10n_for_each_disabled_locale_do remove_translation
-}
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 94ceb3a998af..ee0faaa9c4e9 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
 DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
-EBUILD zathura-pdf-poppler-0.2.7.ebuild 855 BLAKE2B 116cd83adcb94d10109e1f609903c94ec2a70378282df0b17cfa5f8a0ee5dac4739ceb8c8745fb408fb66d4a2658f15f0e4f7b8acee3009ced825ff4d4252567 SHA512 66c2d1cb42235ef5b010164b688bdf24f045c62bacf60d5eb67c0b556e92f983a0a7793352d0ed6ef3ca81d1ae2bc82de774d0fef1562f55807aefbee183acc2
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 862 BLAKE2B 0ced5469870949ff91fa220cbe01f5f444fa10ca9f28efead71d1f49ade1db32be72b4939948d9cbf8a645c9345f4e48e6c9ab5f03bc41fb4251f381929f5fe3 SHA512 97d68758e9411b613f46248e3f74b94667781f345e10fc7fa11dca1e646e50343e8051a82869505e1c407b0d8490642c4e95279a4f65c3435b760336edd462f0
-EBUILD zathura-pdf-poppler-9999.ebuild 862 BLAKE2B 0ced5469870949ff91fa220cbe01f5f444fa10ca9f28efead71d1f49ade1db32be72b4939948d9cbf8a645c9345f4e48e6c9ab5f03bc41fb4251f381929f5fe3 SHA512 97d68758e9411b613f46248e3f74b94667781f345e10fc7fa11dca1e646e50343e8051a82869505e1c407b0d8490642c4e95279a4f65c3435b760336edd462f0
+EBUILD zathura-pdf-poppler-0.2.7.ebuild 856 BLAKE2B 7119f650bdfbe7df414d18abf04e81fefd85fbf3eb88a228c600d5e12ee93af6d3ff55dc287f80542a48d200aa4153081799fecc803182de3e45d1776c6c5338 SHA512 018d50d54fb143b27c21bb8352f50ff1b7d908c2c749b0cd929ddcb1f8b4a3fb7f71ede84211218b3ab814b5fc7297e1a541816d3471615e82edc54826c584fd
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 863 BLAKE2B 2dab024a767fccf4ade1d5d42b12335547e2c545bfdeca270f9096f767c8ae46560467e4cbd03d537f2766dbf9821747d4e1a0e407875e6d69fcbba867948c45 SHA512 4888ffb610c38a0a0fed99b5871b7d841a30b965d47caca51d1aa8290a258d912bc2f1257388427b8cbb2494f112264c1260dcc701afaa80ba1697b0974251ea
+EBUILD zathura-pdf-poppler-9999.ebuild 863 BLAKE2B 2dab024a767fccf4ade1d5d42b12335547e2c545bfdeca270f9096f767c8ae46560467e4cbd03d537f2766dbf9821747d4e1a0e407875e6d69fcbba867948c45 SHA512 4888ffb610c38a0a0fed99b5871b7d841a30b965d47caca51d1aa8290a258d912bc2f1257388427b8cbb2494f112264c1260dcc701afaa80ba1697b0974251ea
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
index 1538318d9673..9d5af0ac9e48 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.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=5
@@ -32,7 +32,6 @@ src_configure() {
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${D}"
 	)
 }
 
@@ -41,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	emake "${myzathuraconf[@]}" install
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
 	dodoc AUTHORS
 }
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
index ce5b9b60840a..bf7a74bb4025 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -32,7 +32,6 @@ src_configure() {
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${D}"
 	)
 }
 
@@ -41,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	emake "${myzathuraconf[@]}" install
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
 	dodoc AUTHORS
 }
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index ce5b9b60840a..bf7a74bb4025 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -32,7 +32,6 @@ src_configure() {
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
-		DESTDIR="${D}"
 	)
 }
 
@@ -41,6 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	emake "${myzathuraconf[@]}" install
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
 	dodoc AUTHORS
 }
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index e5c0b01d2a52..d12d970da521 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index a2b671245646..99a3f0cabaa9 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,4 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-DIST aunit-gpl-2016-src.tar.gz 393489 BLAKE2B 188c42d20d287d00553a9c35828b2389a480ed1dbc2f4066de352ee3821fa3dc7db3a5600bca47a3b6b047ac43b0991c961dc4569b790adc2be2a62fec1097fc SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190
 DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
-EBUILD aunit-2016.ebuild 1065 BLAKE2B ef2548bb13d111928bd5c649c104ac30e47f87df1239c098b8a506f72d46068f2d2687e82114ff588a2a8859d343fe9fa51d5e6619adda5c45d812ad1b22a8bb SHA512 9f07e046e3f4e5a04f542cc49ffc719d968a80276fe6054d402e16e570034dd5a734ece83b949f79eb3d9386c6601bd8d6294a90eaf140fa7ec801ce355c09d6
-EBUILD aunit-2017.ebuild 1037 BLAKE2B eac0d1a8d072362a3a9f6ec32727133e78a1b599f984795dd8954a44f548bd1c04646a74aab0be18991e116de6fa9774a0db992cf87c6ad6740f191071b6d5cc SHA512 27efa10a7cf424c04e561e2591552f5996d0eee499e0ff349b0d7171b27c1939d58644114e6ece32c108833be96da038fb73b6572ec5d26635d629d2ce6ce4aa
+EBUILD aunit-2017.ebuild 1036 BLAKE2B a3bc7c793baeeca8a7aaaa85bc57161b57ebf52319078f8d659fdf2a0afe08e91a54ac2becda20fee714786c0d19f4254c4500f85667adad351c0feeab5def8b SHA512 59d78b143dc5dcccf8041caaa3c2b740590466920fac043367478f456d541c6b12488033927641e8e3b28bdf51b79c330c26885ed6c8036eacffb491fc9225e7
 MISC metadata.xml 935 BLAKE2B 5b05b2dd0e33d0d2d5b8876d3c0b0bfbc89678383b9a3c635decd8762340703a2f75a31e6408f901a9173f28469d8d32bbaf471de377abddc23c8a0c869c05f5 SHA512 e7afc9ef7b05532b2230943b0bec08045d3bb2c0ba875679de97ac4e7948bc4853054bf99e303e1a75da0ead1c592c45070175f62678329a4929ab49a3e6f72e
diff --git a/dev-ada/aunit/aunit-2016.ebuild b/dev-ada/aunit/aunit-2016.ebuild
deleted file mode 100644
index 452fa5ca584e..000000000000
--- a/dev-ada/aunit/aunit-2016.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
-
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs)"
-}
-
-src_install() {
-	emake INSTALL="${D}"usr install
-	einstalldocs
-	mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF}/ || die
-	rmdir "${D}"usr/share/doc/${PN} || die
-	mv "${D}"usr/share/examples/${PN} "${D}"usr/share/doc/${PF}/examples || die
-	rmdir "${D}"usr/share/examples || die
-	dodoc features-* known-problems-*
-}
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
index e5f793ed48af..104432300fd3 100644
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ b/dev-ada/aunit/aunit-2017.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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 42ad7cadeedd..218ee5890ecb 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,4 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
-EBUILD aws-2016.ebuild 1068 BLAKE2B 18daa6c3e03eec724aa91a9c915530db708651b975e803b37b65c3426b20389b81b33203bc8095de269861804185fbd22b8296a845ef9d2f971aa3b1149ea864 SHA512 0d3eb5c5879c3d4ecfd0a8529c59e2999ad6fc76a6604fb88f6e76bb6d42a20ce953af14717fb2da59ed4eeeded14c57cb09259d4d65bfb71eb1f5d9aff30fdf
-EBUILD aws-2017.ebuild 1075 BLAKE2B 88126d8f186c6363ffd00d4ed2cd020b767339bef3ade2913d6bc6e4b81363f207f5558f3a6ecd9826bcb209e28e9b8201ce67d3280436d9aa3c53ebeb167ad9 SHA512 0e4ff02f6aa2fdd6cc97b0e8473ddbb8e3caa61ca249683643db545d739041c9b901977fc97e5a8688487b9eb8ef2f427aea5e4fa7669282044a4953e2c0ff72
+EBUILD aws-2017.ebuild 1080 BLAKE2B c36441dcdbf96348a10173aa5443620836e7045060dd688e75c86715efcc367199360f21b227d54484aabe9968f7f603d198aa03277fb64dcc46e609d5d3a0ed SHA512 0411df9e10bfa931063fd63552bce0e0d593a8a7522723a0db5c0c48124dca251af0bfc45c891078cd6726bb6a40b27a4536e0cd5ee39a6e74c67992c4949ecd
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
deleted file mode 100644
index 61bfe3b8ff8c..000000000000
--- a/dev-ada/aws/aws-2016.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing
-
-MY_P=${PN}-gpl-${PV}-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
-	dev-ada/asis[gnat_2016=,gnat_2017=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake -j1 setup prefix=/usr
-}
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
-		PROCESSORS=$(makeopts_jobs) \
-		DEBUG=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_install() {
-	emake DESTDIR="${D}" DEBUG=true install
-	einstalldocs
-}
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index ddae3fbd89b2..6a12331a44e8 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -19,7 +19,7 @@ IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static]
+	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs]
 	dev-ada/asis[gnat_2016=,gnat_2017=]
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index caf604f6982a..aaf5604d73ba 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,6 +2,6 @@ AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c
 AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
 DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
-EBUILD gnat_util-2016.ebuild 1308 BLAKE2B 11b5bfc7afd2f9d9ddb6b72fddb5e89d83c61fb9a7220f0731365eca2769d904b91368425093b8f805c4bd499da46ee7787cf18084d1506672baa396427aaf1e SHA512 96dbb211227db1918ff6bc8cb5e91d360f804576f9f7a6eeaf31686e7161109b86474ff67baed28ef9baa13c4127b1f9f24a73d07beff2c7ec5a0ee8d5e2a7dc
-EBUILD gnat_util-2017.ebuild 1235 BLAKE2B 42d41ee344fae4aa675a356da98749d7a5877c2b4f40f6d97a74e5c24bdbe76fe12c24929050c8e30db7bc5b12fcc697916eee6a5b95a0cb31f2305147431e56 SHA512 9d39a0de6d9f60162d4144ec40161bc6f01b4cb5171cc7d0d5e774406d11411207346ba278dbb820558aa392110d93d5dc0120bc5e66eff6807eaebfe1be5d1e
-MISC metadata.xml 1149 BLAKE2B 4dbc973d0a669f2db9c2fee1aad40cd6eab81d453e1cf7805f98a220b8c2f8e91642b4a5e5474befed69357400a7ed70da703f4ce71ba5f3df706c248803fe31 SHA512 d433f228882662e5b896d0ade071d502cee9c260fad096fe2556a5e7c4eb9ce82287edfb0240f96716538160d5403db010712633248bd6c53097951bb899313c
+EBUILD gnat_util-2016.ebuild 1470 BLAKE2B 79cb3f9855a5c8f5434c743163541eb40bd32af299620e9395b87194d67b2903e37d0d0b8ed4df3e44b3ca01c2c847f74866d2842de5cac0feeaef1ed831b249 SHA512 3b5c5fe536f43f91e3ac783915f158502049f62686064f994743e71b2c918f3557211ab1d8a47c1636e991f1b0e02784e3488553d98f62d0679c2d3328c04f7b
+EBUILD gnat_util-2017.ebuild 1401 BLAKE2B 55ff6ce95d0f9779a4d7ca16b413ea9a9ce93e1a0ded0eb57f86714901addcc059c836aba0a00899ac23a46b7d511d70010340d52ec95b9a797853c997a88b83 SHA512 68beaab114ad8cb01850276c2a59f5824d2fbff6de48700482a0580c1afd6d9d92f7a27fc83baea10415e1a674c25d8de3b266066be54249f01fd1632bc0f5f8
+MISC metadata.xml 1089 BLAKE2B 7c47328868c0760d57201e434899bd832918e6bc68810dabedb061fd4ee2fb16c9908987fc5d90511ebf91f2901a7947ca626001ca242af0ff6f621cb9e03bf5 SHA512 ce4ba6a642deb1e60d84e01c32bba7478554afe4a9c71c32c7131034e82a0ba0c410891e2d1d7e31e33fe27125ba611dc20e716bb0f688658809f05769427ed7
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 2fc260b394ac..4cc279585ec7 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.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 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
+IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
@@ -37,7 +37,10 @@ src_compile() {
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	for kind in shared static static-pic; do
+	if use ${kind}; then
+		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
@@ -46,7 +49,10 @@ src_compile() {
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake prefix="${D}"/usr install-${kind}
 		fi
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 6116171b45ce..88db63ccf09d 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.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 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0"
 DEPEND="${RDEPEND}
@@ -36,7 +36,10 @@ src_compile() {
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
@@ -45,7 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake prefix="${D}"/usr install-${kind}
 		fi
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 22a3c1f31fe6..031651ccbbdc 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="shared">Build gnat_util shared library</flag>
-		<flag name="static">Build gnat_util static library</flag>
 		<flag name="static-pic">Build gnat_util static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index c697b939613d..abbcf70c0ed1 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 2997 BLAKE2B c5ede25bb739b20af41220f035d6d0eb577ef2e9bb5f113d177cf5d014ca73b94df7ab772371361183d4c4af832f2f19475a83965fe09d4749d2b93442e3ffd0 SHA512 ac033da158a745dfb037d1fc632adc082ae717f01efb3b28d3256ccaaf8a2aa6c1f1bcf291185b829925d653723cf2fb765360e0d8bdf1f247ce7cd2d9ae7b0e
-EBUILD gnatcoll-2017.ebuild 3125 BLAKE2B 1cec59b829326461c4b4baa93fb83eaff8d4d1ce999bad2d405f3fa94c1f7064983c7032214d279eb7c6b75611c6559b3a553d7f110cbc2ab45602310132bec2 SHA512 e5d0ffb4b41947e9f362124dced0cb873a19e4a7779b910f6331ae77343b9f04890fa532fd1668bfebd6a3f59ffeef8e4c106c1ad0b62b7b7d33b43ddcf0d1c0
-MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc
+EBUILD gnatcoll-2016.ebuild 2988 BLAKE2B e114c29a5a7e1ff023c52eb0d1897bee392ce0aab093e22f7b257500c9a6e04658aadfff52e4d125c66fdeed501d06804507b45c292adb501fc4142274472c04 SHA512 fd5f510872ca8c592d88df1981c6c2b383223c70cb5e6b80889631982c1e43a82eb05685d9446172ea365c7d7d2bb25f50fa707ed24d5c8f22fb230ebba16b2a
+EBUILD gnatcoll-2017.ebuild 3116 BLAKE2B bc148d0ba9b67c38599cac863ad30f68b947c131404174f6014df5d2141568fcdb60a610a9f4620bae4c6d94565cdb1480a59819b108b18237d520d6cc53f751 SHA512 515842789e8aeff6ca6d7d7c374156b724439b8fbdde898639a2e4b9e3cc6e13a43bc05942cf4fb5cc609da4376dba0dd093c16f180b86895c7bb8999acb9bee
+MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index dd595440c8b5..0ccb4224f75c 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -16,14 +16,14 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static syslog tools"
+	+shared sqlite static-libs syslog tools"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?]
+		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -35,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?]
-		static? ( dev-ada/libgpr[static-libs] )
+		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
@@ -98,7 +97,7 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
@@ -109,7 +108,7 @@ src_install() {
 	if use shared; then
 		emake prefix="${D}usr" install_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake prefix="${D}usr" install_library_type/static
 	fi
 	emake prefix="${D}usr" install_gps_plugin
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 52ac0776cb56..f67e1a2f877e 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -16,13 +16,13 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
-	+shared sqlite static syslog tools"
+	+shared sqlite static-libs syslog tools"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2017,shared?,static?]
+		dev-ada/gtkada[gnat_2017,shared?,static-libs?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -34,8 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/libgpr-2017[gnat_2017,shared?]
-		static? ( dev-ada/libgpr[static-libs] )
+		>=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2017]"
@@ -98,7 +97,7 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
@@ -113,7 +112,7 @@ src_install() {
 	if use shared; then
 		emake prefix="${D}usr" install_library_type/relocatable
 	fi
-	if use static; then
+	if use static-libs; then
 		emake prefix="${D}usr" install_library_type/static
 	fi
 	if use tools; then
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index 5bc4030a3e0e..df4d11fa0b3a 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="projects">Adds support for projects</flag>
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
-		<flag name="static">Build static library</flag>
 		<flag name="tools">Build associated tools</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 1cb0ab14f1b8..a2b755aa7367 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,6 +1,4 @@
 AUX gnatmem-2016-gentoo.patch 3139 BLAKE2B 240fdce83be5d6776d79138dad494ed3f8deafda92c4107a4554ac5a97afdf26102b8bcdd7c31ac09edde7e0b6b53b4d1bc8c2e89eeab591da93af94ee357d25 SHA512 6be363642a5b5244050b275c436eed25948a2b8eea936b0b41ecd9c312441281d325ae9b41b84affd30eae1172cb31ed719935e96b9adc21707b20b88dabc84e
-DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b
 DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897
-EBUILD gnatmem-2016.ebuild 842 BLAKE2B dd7e2a614fb95e1efd71c52b656add578e0f19d75ea5ee196583af2d5a52fa04c953719cfc2b4a6ce78ad0cfbd87e9d0cbe60760f0971480b10dea6255fdd0cf SHA512 4e664ce22d13588ff3df666eab80c33eeb11e02e9a8afe5133f7a09174e61e7b60ec35468fcfa74773473adb841b2df31d659e36adec12dce8b346a5ac85be91
-EBUILD gnatmem-2017.ebuild 848 BLAKE2B 3b84c0264ea45eceb521e601c0294c2d73f11f338e4b64177f9aa8224b97c76e93dba33764e720042743ce07de47b84584b395735ab6d36be17da428193b58dd SHA512 458273979293719d0332de7f911593f5cf8f14968cd53a3b20ed94b4ddd941d9190bc69dda2e97a121a41c7b9d937f9dae2bc7b9a42c5cce89a4833c32b1bbd8
+EBUILD gnatmem-2017.ebuild 849 BLAKE2B 2918a1a435f35b7bebc12b2bca2811a48405a6860b22d5917e4029eb6ceb7cfc4e7e965b662cb9daaaebe68059805dfcdf04cfe45735cdc4118602856a9d2600 SHA512 b1e222f730c279cbbed36a2afd8ae3d324f4b7fbe1be0eef094c1d3d8adcf07c9dae1d8c9b42b7d5a1be7d1cc1dff846767aed79de01e523e75aa35c050367c1
 MISC metadata.xml 1138 BLAKE2B 867c1ccc45c510480cc4e93b62534182248cfe2e7aad4e5e8e3c5fef153590c2a9832687a5614786b115145d477ddc74a38008566266fa44e9e5e0a4769332d1 SHA512 1b4794806992a99021a8c8c0d8c49374ca2ca676b5ac0dd60fd2e433d8f91225033255a59ab5e5adea2ed0fea20ce704ad7b7f2aa2c7538f8d504ba3df122b7b
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild
deleted file mode 100644
index 1b7bae00d069..000000000000
--- a/dev-ada/gnatmem/gnatmem-2016.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
-
-inherit multiprocessing autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017"
-
-RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild
index c9a384fa74dc..f5b63e51484f 100644
--- a/dev-ada/gnatmem/gnatmem-2017.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2017.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,8 @@ MYP=${PN}-gpl-${PV}-src
 
 DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 ->
+	${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2d0f8258eb22..68b8c2577112 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,4 @@
-AUX gtkada-2016-gentoo.patch 3728 BLAKE2B 8f05c4591d267e4e383f052e691876df915aad52a22b6305a7f338fbbf5063b0620c2bfb97a023570dbef0781d891299da65e165481d304e28e710eca8e93656 SHA512 8e8815173496f7ebc795e8b20e19f88f50a726cca3657b5798cd7cd613c0196aea4c63daa2874c36d5a039e5b6cc26c67d0003c47ddcf8ca6e9c28dd8a58bf4b
 AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
-DIST gtkada-gpl-2016-src.tgz 11944697 BLAKE2B 61760bad9417ef76a8d3779b1fd67cfaf8ec9c1427871ae8152226a5d3a75862a4b4a72480a1d5a1b60ceb06444e89d37440ca5368f954de6a9ba26ac17bef02 SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-EBUILD gtkada-2016.ebuild 1269 BLAKE2B 3c2772faa6a43f7f1ac0e19f1d50b0a840382f2b85280c9d4f446069d8625e71a1d863202cc6f246e327b0e07499800d11242b42c002d7407187a4c119d9620c SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689
-EBUILD gtkada-2017.ebuild 1269 BLAKE2B 0d9ff1fe178b4804a14cca0f373e938400fbd91004af7184b915ec12bd62e36ce1dbf11d783f349b78ab6f8d65a0d85a62a6ed4803d9a77721f5d1f6cb9369cc SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78
-MISC metadata.xml 764 BLAKE2B dfc39e0e4fa7b9919f02f67680bdd5c5afa200a45102184b8aa760291694a20431798b5de06b87bbc366590ff7b49dfc5114f466b219bff6c9a1e4abc01344a7 SHA512 96d85d1f4ddc06554fd4fb8572bf55b2bb880423c9813f00a69d7211bf9b441e84feac1e19c04cb99a54396ac220e9d79cdc441e4c10de5805487baebcee0e64
+EBUILD gtkada-2017.ebuild 1330 BLAKE2B 33c5f296517fe9ccca131534489449b53dc1eb4980904ccbc3e460bfd45c214456c8ca50c662ba98e123f52347bbab21241632de14505a0b617d5fa8d2df895a SHA512 c9eb4add40823dd56cfdea7bfb7388bd506f6802c211d610f14241491119ec5a461b5fe24dd75a948a8b9537414f5548ed581e8d594df58d9cf863310f28bfb5
+MISC metadata.xml 704 BLAKE2B 3dd587570234d4bca6f818611011ff14c2a009d1078dba153bbe9fb1071b3962201ddde374176d4492f7066e978366a1ca1dd030b36c000b7f71281c4b407cac SHA512 3139597952f51ad23e7bdc4dfb49aec1b040016e60d1cb83319388146a503b4ca59a16c800548b32ef41987e631d06103360925c598c8cee2805bd84623e9b52
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
deleted file mode 100644
index 808b07dfdfaf..000000000000
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old	2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in	2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
-              for Switches ("C") use ("-O2");
-       end case;
- 
-+      for Driver ("C") use External ("GCC", "gcc");
-+      for PIC_Option ("C") use ("-fPIC");
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
-       for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
-    end Compiler;
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
--	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+	$(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
--	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+	$(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -96,7 +96,7 @@
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
- 		--sources-subdir=include/gtkada/gtkada_gl.$(@F) \
--		--lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
-+		--lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
- 		-Psrc/opengl/gtkada_gl.gpr
- endif
- 
-@@ -106,12 +106,9 @@
- 		--project-subdir=lib/gnat gtkada
- endif
- 
--install: install-clean
-+install:
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
---- gtkada-gpl-2016-src/src/gtkada.gpr.old	2017-05-31 14:21:35.007965274 +0200
-+++ gtkada-gpl-2016-src/src/gtkada.gpr	2017-05-31 14:23:16.597315577 +0200
-@@ -41,7 +41,13 @@
-    for Library_Name use "gtkada";
-    for Library_Version use
-       "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
--   for Library_Options use Shared.Gtk_Libs;
-+
-+   case Shared.Library_Kind is
-+      when "relocatable" =>
-+         for Library_Options use Shared.Gtk_Libs;
-+      when others =>
-+         null;
-+   end case;
- 
-    package Builder  renames Shared.Builder;
-    package Naming   renames Shared.Naming;
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
deleted file mode 100644
index 6ca105eb3655..000000000000
--- a/dev-ada/gtkada/gtkada-2016.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 autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 659aacbe7b77..aed9663db246 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.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 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -30,6 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
@@ -49,7 +51,7 @@ src_configure() {
 	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
 }
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 1b27068850f3..e26ee639a2da 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="shared">Build gtkada as shared library</flag>
-		<flag name="static">Build gtkada as static library</flag>
 	</use>
 	<longdescription lang="en">
 		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d83dfd0c2c60..b80ff327bc82 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 0c43bf0c189f..a66bfa4beae2 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -7,7 +7,7 @@ AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd
 DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
-EBUILD gtest-1.8.0-r1.ebuild 1685 BLAKE2B 67e745fb854a8283d1d32f50f733e7bf1bfca9884d4a35e85b01a2901b6714a6dd39a040d60a85f914b56e0d551f679fbd991cb8bd928df68bd8073cb66aa118 SHA512 d61fc073692926111aa1369aada765af56b13dd88ccddaaef9957327706cbaf7fb90729eaa1168477661c2082bb11cde632c1c3bc4957d8533e12d445ddfa73c
+EBUILD gtest-1.8.0-r1.ebuild 1683 BLAKE2B d31f576d56d05cd44fd52c8b670c44434d0a956fff38cfce8b56ec4f979638635693c3fb257bde282ca59e8572b30628e94f8c3d973d70bf85b4261a41a883d3 SHA512 0a885354a9810642423594b3d531cfa6cbdf11db0e2f928268f14a33fa21817d50a35ef98a1bc2ba977d86eee9889aa607e12590d48fb740e35504cbb5bd0953
 EBUILD gtest-1.8.0.ebuild 1637 BLAKE2B 15153bf61b468799c48c25b300794eb3cf93d9751ead2d50d2dda59f09a4c5ea1c6a319083290cb3a93a983ee2552a3162a9c770e724907427533cfd8e7aafd9 SHA512 ac3680806d6e30e926ef29ab24042d419cd4c872b6a7d4d11b75bb50ccf64c6f029b8c59800dd92f3c5e2a8a72b4840277b4750eae8bc46021e44fc95845670b
 EBUILD gtest-9999.ebuild 1826 BLAKE2B 8751e8332d63e36f30d1bc10782c2103e7a40b0f9a454bf29cb92ec92502221cb74aee2158f54b2fb634aa119c6fd1d7faf496fac4569e7ce461205f805123b7 SHA512 9a31a176bba34993a6bbc56dd0cbc0a3b78b293c4d850a0471968c8759fd58a3ebaa1922b2eb293810a697b85894c1daee5d125a42013b6356b9a04596d21114
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index e824453822ea..089fb7a4ebbe 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 2b3dafd0e11a..53fc4b4b8a1b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/dbmodel/Manifest b/dev-db/dbmodel/Manifest
deleted file mode 100644
index 14dd81a4c093..000000000000
--- a/dev-db/dbmodel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dbmodel-0.3.tar.gz 71581 BLAKE2B 75513811d02a92e932f3eda4e9de60b7e9d8f60fd0ccd0318f3f6f4e3e2fd1cca1db53751386dab602088bdbe3e9860c490b914a479a94d613e2c718f2c33919 SHA512 61c7b39bd57c1d6ff49961b35073c7205862b2e1d6a93b3c8950a62ce6c0e1ce8f39a38ed729174714f719cd92d0e6deba51c68b20ba22888f7d7f7096c05f62
-EBUILD dbmodel-0.3.ebuild 511 BLAKE2B 0146948337b22054b30ec2f9d1d15b8826420de3ccbb2b00828bb67d8df553f8e807e4616e1358489334ed66b628706c4083f7181730fcf6df30f509e9bd7604 SHA512 03db25eb5f7ee48b8794e049862e78de444e8246d20c7e0f6ceb0d696737a064caa13d417ee7b4b8191acce71582706ea4a9c666443d1b28064ddc46f9ef6df8
-MISC metadata.xml 242 BLAKE2B caee4c5aa72c17dbdea922bf8adaa8c330bfdcea7d2aa242d25990c4d92aa153967a010bc1e1bb111e285ac60a3479a390cb157249725e312388005e2fc9f8be SHA512 9f1687695fe3c18ce5ebf4d226d5f017d86dcb88588a375667f0045cee403e935abe3b96dd0c5dc415656a750dab8624498eb04dbd86dbacaa81c68483085aa8
diff --git a/dev-db/dbmodel/dbmodel-0.3.ebuild b/dev-db/dbmodel/dbmodel-0.3.ebuild
deleted file mode 100644
index b6a2c307a9a7..000000000000
--- a/dev-db/dbmodel/dbmodel-0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit qt4-r2
-
-DESCRIPTION="Qt4 tool for drawing entity-relational diagrams"
-HOMEPAGE="http://oxygene.sk/lukas/dbmodel/"
-SRC_URI="https://launchpad.net/dbmodel/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsvg:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS CHANGES"
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX=/usr
-}
diff --git a/dev-db/dbmodel/metadata.xml b/dev-db/dbmodel/metadata.xml
deleted file mode 100644
index b90535458362..000000000000
--- a/dev-db/dbmodel/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-needed -->
-	<upstream>
-		<remote-id type="launchpad">dbmodel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 2b1d239e90df..c78c6f427bab 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -8,8 +8,10 @@ DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a8
 DIST etcd-3.2.14.tar.gz 3047100 BLAKE2B 5b956042542e7daeec3985f0dbd02b2766ca27287b55b0e1fd67c4296103ca9bf05b2ccc0e93640949c85e8099503b5a22d36c2f03d9904762ae1bbb59d35ac4 SHA512 f48cdb368906b36e7ce80c60933b0e9bc4415104c31f2da9346940f040febf27dbd9109e7f659a281c7038cadfb02b0dad614685a15ff46c87c600471c5de432
 DIST etcd-3.2.15.tar.gz 3047626 BLAKE2B 81f312fd5df6b64bf9e13994500387ab11ce145e296538492ccc71b94659f93e84e191cd2347d53d6d20e070cb1eb2760d4abd467655af53eaeb3c40cff7b500 SHA512 3ae11dfe918d409893e3168fbf31da0e910ce498a13f6bb31c3dd3a2027d72550f086d55b702803f2783de815dd349537bd581334146f8c4d05b9b3f4d3d56fb
 DIST etcd-3.3.0.tar.gz 3360558 BLAKE2B f6a535a55ba862857db9c055deb33846124b92badde6cbc8c2301a989c7dbe4f1d9aa2ec08b7a99c11e0e7ec87cd59cd08cf57e5ae97eeadfd4f5d3cb166992c SHA512 3044e06492f8cc7dd717406cf47fcff8f91f79cb05648464625d5d78f7b79c7d53f315485b830c046a7dadee34a9b39ac2ed11dfeb5d1b59509fce2da2253197
+DIST etcd-3.3.1.tar.gz 3381899 BLAKE2B 6ef667c635731f877557e7e8cf1d94514f788f5c485a230fe808242d2910d3551082a9fc62da1b35ce1b2dfba846c47109e5b9ef0d351860600c5e7947d0d11e SHA512 14af3bd4de63570da8bc27fa931982294c7037edf98a9512abc0e396baddbd05fff7525d17013bc1782a622e4850e216368e7c620863a22aec0739d7ffdb5bd6
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
 EBUILD etcd-3.2.14.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.2.15.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
 EBUILD etcd-3.3.0.ebuild 1505 BLAKE2B 389577b47be34dd34de648fdd0cf036973374685577a284ee09459b2b25adb5590f84d88cf5057d43508e0fd7f6925e1d65a86a2714ebb09fcc4991f21895f9c SHA512 c1212aa97afdaf6afe85524c515fdb545934ce52a84a599c55b8212f209a2433639dd5579e2edf06f0c1966a59707e7094146791e3ef9d3b8947dd0f01b2bfeb
+EBUILD etcd-3.3.1.ebuild 1505 BLAKE2B 389577b47be34dd34de648fdd0cf036973374685577a284ee09459b2b25adb5590f84d88cf5057d43508e0fd7f6925e1d65a86a2714ebb09fcc4991f21895f9c SHA512 c1212aa97afdaf6afe85524c515fdb545934ce52a84a599c55b8212f209a2433639dd5579e2edf06f0c1966a59707e7094146791e3ef9d3b8947dd0f01b2bfeb
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.3.1.ebuild b/dev-db/etcd/etcd-3.3.1.ebuild
new file mode 100644
index 000000000000..b1406dc1a18b
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.9:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 0700 /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 03658e728399..2e0c266f3223 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -28,6 +28,7 @@ DIST mongodb-src-r3.2.13.tar.gz 29273616 BLAKE2B 9fb9851953ef1561340bcb33cac6a2c
 DIST mongodb-src-r3.2.16.tar.gz 29293555 BLAKE2B e2863ed0210bc66fcf2c80e28668674c254e78ee750a0eb84c45569c2224157f1db65aca5296a0ed0c32ef83ab6269de25bd69dbf1f0ef54b021bb0aecd2e46a SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2
 DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
 DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
+DIST mongodb-src-r3.4.13.tar.gz 39992720 BLAKE2B 5620711c5ffddd9a96c29be1f2801a37f30536d1b7afe5a7b339a41cacf1f97caf8d03aafdf1d6b71cc488e48f5066ebc49a63a6bf318483d552863cd47a0c0e SHA512 295dbb38d44c99e0dce46c5e4aa5d73c64d813a3767e71a7187aff05e30f896d283ca7ef19c0a7bbd036eecf3d419e38ea3bc7d98ba93d12296c49e565df0f66
 DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a648fe52e69d8194998dc74453ad6766688929a80456f6cb4801f2806ac938a5dfc0407e5f46345b47a80ecce0ba03d7fde SHA512 7acfbcc68c1bd4e6e63eee09be1dfbb064be6f8b0144418105100a065f8162cafc9b776fe0429fd64c79b958561aa42d0bdef56588dda65acee27ccc98631f39
 EBUILD mongodb-3.0.14.ebuild 4559 BLAKE2B e72ff73baaa3b6a5bb4bbb33f3153d2aeaa9458b6e7f48419f5fd0f9b7fe43dfbcd93bf0824555e688faa461839a8c3cb5e4d1a24219a395f1a245828d639777 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19
 EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a96e1a030b5d84e0bb4c1524bacff7ed1a1576093b0336ed042f8bcbf01d37ba725392c077a400fdefc2705ec2ab SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294
@@ -35,6 +36,7 @@ EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc08
 EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
 EBUILD mongodb-3.2.17.ebuild 5338 BLAKE2B fd327b1c5bb85e833782839e07b3379a103f0545fb9852cb06d7f6f0b3548b921dfce227d1882a1e448a533c043718c778e9141ec5715805a24c9e2fbf199fa1 SHA512 a439c32b20a81d1c8e199c8a6928aa75479562e6b33c0d7b50797181226a093f571a1caaab102569a9a308db18a73c51558657ccd4bcb1d7e137eb22fb363c4e
-EBUILD mongodb-3.4.10.ebuild 5234 BLAKE2B 0aaaa22250665f8da7613bad4cc23158e3b4655fcb58caac5373c483b16b0d3fbd267b82b77c81d88479480758a2dcf56da251f0adc6d2c96074fe221bc526c5 SHA512 93a21fdbd2ffe2876c47039731c08245b092256a8c815bb3f24bff9a7b6f8ab50781a61cff1e1bcc32861f6cc71c133b3c501b60a550773840ec2433ef5efdae
-EBUILD mongodb-3.6.2.ebuild 4437 BLAKE2B 902d583db9ef2860c9c13b2fc30940f5a25c525989892f6e21f1992da1228dccd394d3d24d2de677eae4a0a7444084c422d938e11d0adacbe71242cd6c3238df SHA512 fe4f8d7e0b462ecffe33daeb641e680eefe43e1078fa02eacbfb2ec0fe7b49cfabd070a6f1253428362d645419eaa5440ee14cc26500b85ff8b55644dbb6a617
+EBUILD mongodb-3.4.10.ebuild 5133 BLAKE2B e6b3742a9bff53afd63eae4fe3b9574e43f7007dc1efc1687583b17820e812341f354e7dd7882762a871f1d5b1e2732a9cd20cff7981c05de4058c26c58f68d2 SHA512 737046d5ac14920014581840d3e53597e916cc4f1bbdfba850842718039c227c5cf3e5b62cd3f491e1221ff8fefd74fb3ea75ecafd6218c4036f4973316c56eb
+EBUILD mongodb-3.4.13.ebuild 4256 BLAKE2B e4caf3957d5bea1811879828abb9a1407afcb9646e4e91911369d8e43564412e0fa19ec84264d1ad5dbea758fb32c5dfe2fb4dca60636b7838f4c3d4ef3832d2 SHA512 dee3412d989c9d00e1097a2ebb8d05e7d77d14e8399d7bf570da37904ec90de86d62807383c95caa057b2c2cfe2057be0b208b262bf488687b201a2f38ea7bac
+EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B c951192aa4ad5ce66e5b7a076d7f4d7b7fc88b6b1342817334cc2cc17ddc87727da5fe801bb63cc4696d563fd8d18752621c79df705ada9d03d88683b5d08b8c SHA512 1c6f7e920ab4b43effe6b10d2b68acdbefd530830193a485b80efe595a2301bb213a582a248f3df9a0b931e30cce57ea498da4ba921b4eb5ebf58d2506057390
 MISC metadata.xml 1053 BLAKE2B f2104654da3600c3d10882bb600d9002c015c7fb5dcfc8bdb98ab1fcb06d384ead4af990d55d6596d4bd602e5c4e9978a11cc66382ee01bab006f817ba44bdc2 SHA512 9ab708e294e25487ceeeeac7500a64684c914e95aa593c3a1f06d845b6b629766a5b98d972bf0802f3713b89bd6c81e293fc45205604980164542442438b13a2
diff --git a/dev-db/mongodb/mongodb-3.4.10.ebuild b/dev-db/mongodb/mongodb-3.4.10.ebuild
index 590f439f5bf6..18ea5f820117 100644
--- a/dev-db/mongodb/mongodb-3.4.10.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.10.ebuild
@@ -88,9 +88,6 @@ pkg_setup() {
 		--use-system-zlib
 	)
 
-	# wiredtiger not supported on 32bit platforms #572166
-	use x86 && scons_opts+=( --wiredtiger=off )
-
 	if use debug; then
 		scons_opts+=( --dbg=on )
 	fi
diff --git a/dev-db/mongodb/mongodb-3.4.13.ebuild b/dev-db/mongodb/mongodb-3.4.13.ebuild
new file mode 100644
index 000000000000..3869755fe9f4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.4.13.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	<dev-util/scons-3
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.2-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.2-series. Then upgrade to 3.4 series."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	# this one test fails
+	rm jstests/core/jsHeapLimit.js || die
+
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+		fperms 0750 "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-3.6.2.ebuild b/dev-db/mongodb/mongodb-3.6.2.ebuild
index bd0a2bb880d7..5297f47b0f1a 100644
--- a/dev-db/mongodb/mongodb-3.6.2.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.2.ebuild
@@ -63,6 +63,8 @@ pkg_pretend() {
 		ewarn "To upgrade from a version earlier than the 3.4-series, you must"
 		ewarn "successively upgrade major releases until you have upgraded"
 		ewarn "to 3.4-series. Then upgrade to 3.6 series."
+	elif [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
 	fi
 }
 
@@ -84,9 +86,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
-	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
 	scons_opts=(
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
@@ -104,9 +106,6 @@ src_configure() {
 	use kerberos && scons_opts+=( --use-sasl-client )
 	use ssl && scons_opts+=( --ssl )
 
-	# wiredtiger not supported on 32bit platforms #572166
-	use x86 && scons_opts+=( --wiredtiger=off )
-
 	# respect mongoDB upstream's basic recommendations
 	# see bug #536688 and #526114
 	if ! use debug; then
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f1a819e56c38..337095fbbd58 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,6 @@
 AUX my.cnf-5.1 4658 BLAKE2B ef401df54d762a48ed46c3d67d60ada17b4126ff9cbf57acfa981fba286446f24cabe5ad39ffe3d2c4e95bff078e51b3948ab53b326ba02f39d5fc67b5289318 SHA512 6499e2cc1382e64be1f59d1e7855737067bfcf360f0acaede5dd357d97678eb55964de66ac0bece2bd0bfd2283997c7f335359242cfe396e21f0391de68c62ee
 AUX my.cnf-5.5 4733 BLAKE2B 89af4a9dbd4828a40aa91b294cef15ec8afbcb614ece424614d0bd2d047273906ccb8e4518a48d530f55e898b6c75403d61aa7a733d5bf50f0f0640c55471505 SHA512 6a5d183f1aeb30d9096838ac010c8f2dc004448924b3606bd03c1a5e0336a20fe5fcef1d2cd772977a167268fcff51a4b663f1f73a37d3066983621a8ca6c004
 AUX my.cnf-5.6 4504 BLAKE2B 5d904925d12ad4c3826426e7e7790800028c9adf9b42692adf3260cd8dae910338683fbcd3e5148f113c1ab27481e5ffe61871716a069c50f295cf756b3e685c SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae
-DIST mysql-5.5.58.tar.gz 21045852 BLAKE2B 220a614d5cbb420b290c37b2f721f865640b15cdb3009470b267957548c2cb6fa4a22e885953b1587b4eb2c4b9ef4c6eaf8e2fe9e19af7d73b30cf2fd62dcf3c SHA512 a57613034bb7456827d2dfa3e6d1fd006c3bd3f61e6ad4e882bb36a11beca4cf3d76b6b6d2bf0ccdb115d6896a08a7a20d0781a31e22abca2562b7b9a81614b0
 DIST mysql-5.5.59.tar.gz 21050313 BLAKE2B 2a17307caf1fe00f8be6662e85e55a1cf8a0f6d1a00e0d26970bdd04dd2f92bd7e7c5e1f7a19d311ce0b59cb5f40434d605b3c276ab60ef1e94a99c6148f6b36 SHA512 18abca4a607d7f7ad90e9adb989c665302ee85e264f298fdc3591c4d9cd85a2486f1b402aea1ac3672506d1433eb1f3a246da5e4abd04dc41344ed9fed5ef0ae
 DIST mysql-5.6.36.tar.gz 32192348 BLAKE2B 8ccb7d85ff7255832f8f304a173d6ad436362f36f59f58b5772e0623a4c250c19f0d67a65bee4cc8f6815088559c20e3b80f07443666e85753b164b82a9c0362 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18
 DIST mysql-5.6.37.tar.gz 32200158 BLAKE2B be64aca7e3a831fbdb737a6628e87dcea195bfee01228cc05858ef855a2eb41355456cf6e516fca77a5e4a96381248360a2e79e87fea5b649bd06dd3cad6976f SHA512 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597
@@ -9,12 +8,11 @@ DIST mysql-5.6.38.tar.gz 32197625 BLAKE2B 5edd6d05e562568d2418edd81c6822b3971030
 DIST mysql-5.6.39.tar.gz 32110958 BLAKE2B 2f279c6745bc995c860bb4f2868409136e112cc8b9fb0c04fa7673bb6d5612f3ef6d3462666de736d6e7fe5439275ab49908a6609175d1cb8c096d5db5ecb59c SHA512 e1e60854c82d71f9600bf611df964f441815d9d0f896134110a749b29fe340fa216d7c89f4da63d492929565f19a2502463549b8c8c038c658e0be8409a3ffb5
 DIST mysql-extras-20170302-1359Z.tar.bz2 306816 BLAKE2B 7ac3d79f265916306ba8dd0a8ac16f5c4673baf9f910e21aedcc460b028fee674faabad470984e4830256f6218a7c61f31f6155e808d8a2dd4772a1c8bb72d3d SHA512 2c096c68e0d545c98fb5520f92b9e85f6bbc910853793f60f0e67979ee927410bbecadece3400364fdc2b5682f9105664f6a2de8fa0ee1818fb266e063e82869
 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 BLAKE2B 4ee604de76d9da004c7cb9f84e7e4112c0cdab3b18a82923ad5bcb880377813f85e369697d84b37ed2fd9cd26b160d4616bfb7d1dba3bfe0b6bbc296e0edd5ea SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122
-DIST mysql-extras-20171018-1948Z.tar.bz2 313540 BLAKE2B fb39cd40af2a013f2e8c71094a14b72f0be6c24c440e17839b447afc01b6a8a3264dec4cfa6973a1e919c96e9cbf6e2bb7d4ed6b0c32502d02dd0d3af316ee1f SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
-EBUILD mysql-5.5.58.ebuild 4390 BLAKE2B 0a465cb0956aa4c392713232b878fd8c72be02d2df15bcb39c5ffe3ff81883ce79f03486fa0403d05ed02c6d37d6e9bc1bbb9f09dc21d2f6778ea19ef7c77390 SHA512 9b6882465934de33e8ecc3d903569661cd3119b37597f965002580935d0b1474a5ad625f7eed561f4f773c629abda5e744e7861d5d3278a3d37cafa038ee4d55
-EBUILD mysql-5.5.59.ebuild 4381 BLAKE2B fc3ac09a47073258035438d1c3754aaf83a73a855f071ae2a9e1575794c3ada4e18f8277b19d8f8042a26fcd551f815b52242d54b3e368a36f5109c1f2a12317 SHA512 356fc3a65ee7b12187130bfd61227e6e315034fa29495a56a481a8880577e45f2a14dabc463df5cbb4806e1aeb165010e56b57db514dd7ebdf7e5eb4fc98d5c6
+DIST mysql-extras-20180214-0024Z.tar.bz2 316686 BLAKE2B a893e2975a8062ab236f642d158a7833656942adb31d467b784a9224e7dd87872c3784bb29e93b620a58cd9a835d65248f1a817cdbafa574b5949e2b4262108a SHA512 ad0e81695a70954ad107fe104f9140be24e53d499aed6c123e68e1a062ec5cc90c70f6272fdc014e567794e331301e656ba01b22c2c7a1afaf11e14a9190fb0b
+EBUILD mysql-5.5.59.ebuild 4381 BLAKE2B c48db634322354aeb487df4df4eff2a27b2e69d9aa5785f349c45f8e947a7e3572e86f013d71e0063b69731fda9155811928336f270d0fee3230caf6eeeae6ed SHA512 f3e4946ede777c0bc39ae415f3f30bb33be145f15f452829683fcbd2e191cd65d6d0f3c6d372651468bb25ea7bfab3f5c8dbadcf4021ca3f0cebf1590eed6ce9
 EBUILD mysql-5.6.36-r1.ebuild 5938 BLAKE2B 60b72cfdb9030a77e611cfa5e7efa092e08f2fbf698615d75b1809b55c9c1eafeec3601ea792b96a92003002d41678e7e32a7a137608f3efb3076cca7c53dcc6 SHA512 b1affbc1dfa67a167c13403a63e05a3c56aab6957a852d8b6958e6c6bd51b4ec50f33f3c5234034fc554f091b49738b08cbb24aa15a8d7a38a63961f715d255b
 EBUILD mysql-5.6.37-r1.ebuild 6157 BLAKE2B e4dc21ce1095263789262ef65c5d70d53d20c23f9288d5a24f6530ca89808e7c2f5c043ad49f2bdb62af37c44cf35eb8136b244414b2a9c758902180e30f1fe6 SHA512 dc8b11488f07522ca014a2b2a4687d5aefc9d08493f58b4d918af7da35141d25f0320b5891469ec5a701d4a98a9c7dc4adb87ca0e4b9d5feaa65802a5f1a6b0a
 EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78
-EBUILD mysql-5.6.39.ebuild 6461 BLAKE2B ee9ec9fe05afd1b0392d6a05586994ba84b85956f8ec36a6a138392c9c1e9d8ba180a605bedb66c69cebc0c63c7b678a1192cac2859e5e3263ada3ff2ea85544 SHA512 7154bd7918c426b82c0b92ca81670f83d29ff1d4a0c4ab4a687de24103e0cea6b7aaf8dd6322c57b413aa558c50f71c69e5099245739d01aeeccb9a8e9a7cd14
+EBUILD mysql-5.6.39.ebuild 6522 BLAKE2B 8ee6fb180f8c674a279330b6d1daa133f8f86ac0ef79baa7399a412c341c56594d2e6e3f966ed5bbab8c1b0a34c96560019d488de11673327e7739dddd85dcee SHA512 67cef803bf47ad48fac796f81f280beab423ca9eb1b6a125e509a2278af21cba40ea29a03899fda97b14e45778b5c774119b97cd98f5a84add15fa99f41b1bfd
 MISC metadata.xml 1777 BLAKE2B c1b1e002ac9862e77fec4ac2b2ba27e4c17210c2a877e2463119336856a6431cd6f8143679edbe33b2b835523d4e126dbe9dce45f28bf805201c040280c4e5e5 SHA512 089e8752a6658ada634a019a4a77cdd70560ef001d9f7e83d38b0818253563f2819c3fd78186b6194b3dd3c34b2103ca75f7cd60d6a8a84f96041f338d771eb5
diff --git a/dev-db/mysql/mysql-5.5.58.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild
deleted file mode 100644
index aafa5a49293d..000000000000
--- a/dev-db/mysql/mysql-5.5.58.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_EXTRAS_VER="20171018-1948Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-#fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-SLOT="0/18"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-		# Enable parallel testing, auto will try to detect number of cores
-		# You may set this by hand.
-		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-		# fails due to bad cleanup of previous tests when run in parallel
-		# The tool is deprecated anyway
-		# Bug 532288
-
-		for t in main.mysql_client_test main.openssl_1 \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		for t in main.mysql main.mysql_upgrade ; do
-			mysql-v2_disable_test  "$t" "Test $t broken upstream - error return value not updated"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/mysql/mysql-5.5.59.ebuild b/dev-db/mysql/mysql-5.5.59.ebuild
index 9faba7f8febd..881a4ffb831a 100644
--- a/dev-db/mysql/mysql-5.5.59.ebuild
+++ b/dev-db/mysql/mysql-5.5.59.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-MY_EXTRAS_VER="20171018-1948Z"
+MY_EXTRAS_VER="20180214-0024Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
diff --git a/dev-db/mysql/mysql-5.6.39.ebuild b/dev-db/mysql/mysql-5.6.39.ebuild
index 70e25842d039..ca8aeb2e62a5 100644
--- a/dev-db/mysql/mysql-5.6.39.ebuild
+++ b/dev-db/mysql/mysql-5.6.39.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-MY_EXTRAS_VER="20171121-1518Z"
+MY_EXTRAS_VER="20180214-0024Z"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 HAS_TOOLS_PATCH="1"
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="numa? ( sys-process/numactl:= )"
 
@@ -37,6 +37,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
 	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
 	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
+	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
 )
 
 # Please do not add a naive src_unpack to this ebuild
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 4818ad354171..37a3ee0fd331 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,8 +1,5 @@
-AUX my.cnf-5.5 4795 BLAKE2B 0b8e6af4bcbefd600a85b7a12ca66af07d0a261a02da5067fbf162cc9ccb9e236dc5ca68474512307227666cfa2c5fe8f885f6318e44ba75efb6251cbef1cde5 SHA512 664b81a1621507104fa843fdda01c3bc60e1f39a6c397329ac8a9f00a63d9298b656d374b819b62ba0de5c1a380e9b16b75ebeaaa2d4614274ff2c168cdc5736
 AUX my.cnf-5.6 4568 BLAKE2B 633cc45bcc751046ef766dcabd1c8db2cd474f13cde436d41698a810787bc52cc8c11aee79c49ed884f4b01ea26fad11f9ffab08471eb10d6752007fd44d372b SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10
 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda
-DIST percona-server-5.6.37-82.2.tar.gz 56296960 BLAKE2B 70d0c40c96be3c3f674466d2406b5622a7a37cc59d9daee7f0315ce6dd2ce13751f48d440646a0f377ca86aecd6bc749d050ab4f58bfa7400bcd35167ab8d480 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e
-DIST percona-server-5.6.38-83.0.tar.gz 56390422 BLAKE2B 2c5ae8c021c95da210402b79314698b7286ca7791c35f059260537b19660e33bd6a06701f24f121b7b051faab38b41b037ea3d1305d281abaadd07c3c432a13d SHA512 25b3dbee188e0608f3783acdf70eb3ded276ff25dae3ee879a70e3eefc8df5ac15e3b5fbe310537f84ccde9434de51ac5927322de13f6b89e0530ebbd7d36f6d
-EBUILD percona-server-5.6.37.82.2-r2.ebuild 8847 BLAKE2B 1d95b631e89e779f98cbd2edfa32734e13e74fdfa7e59ad908a3ba63ddd7be35888320acd762468be5c61408acd0dc6b7996f4fc1340d63a120a9abfc2926887 SHA512 dd4343147420888c4bf2db5ceffe7f7e25a182456d6027027c8065877a474e1ac903a79ed34655b2321d5745730e220678ad705b148c8e778328442d401e3ad5
-EBUILD percona-server-5.6.38.83.0.ebuild 8506 BLAKE2B fe867adcb0963c377b7f06ccba8b4d49fa878390321c5dd77562e27527c9503182cdd853fbcd42c5558d3ff8cb4676ec0e251fc65331bd31419bf92907ba8b2b SHA512 fd146e3f0db22253af87e4c98c34285ff9fd39bb640ab968cd58ee181d8b573c970ec71e7f34aa0999a05e6d4537055f4f588a2434412881431747e5c79c31ea
+DIST percona-server-5.6.39-83.1.tar.gz 56307662 BLAKE2B 474e497a83e7a8f7bf628b2622a0bfeead0f5003ed87dd4228e85a8b1c75bfdfc40f75604e9ed621f6d143d69bcada29163bf140b765951cf0b23e5660623e52 SHA512 d014bc0ebf8d8f1842b4a79eb0a868e3c9e0e33d3eb3cbf301b5504dcb341e1f2a0d6c2c4003666f59fbf75eb274356ee6b059ff2cddf2b457143ee5e1aba471
+EBUILD percona-server-5.6.39.83.1.ebuild 8506 BLAKE2B fe867adcb0963c377b7f06ccba8b4d49fa878390321c5dd77562e27527c9503182cdd853fbcd42c5558d3ff8cb4676ec0e251fc65331bd31419bf92907ba8b2b SHA512 fd146e3f0db22253af87e4c98c34285ff9fd39bb640ab968cd58ee181d8b573c970ec71e7f34aa0999a05e6d4537055f4f588a2434412881431747e5c79c31ea
 MISC metadata.xml 1505 BLAKE2B 63c11ed734843c7f07a7b71525f21113828cf7bea4fe9f15cbfde952f5e27fbeb8ad1942306a3224478c1a2d19f2ea22d26ee124db19fa7122d573095f98847e SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6
diff --git a/dev-db/percona-server/files/my.cnf-5.5 b/dev-db/percona-server/files/my.cnf-5.5
deleted file mode 100644
index d48f6c4e6887..000000000000
--- a/dev-db/percona-server/files/my.cnf-5.5
+++ /dev/null
@@ -1,148 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size				= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
deleted file mode 100644
index 27c8676451e1..000000000000
--- a/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20171121-1518Z"
-SUBSLOT="18"
-PYTHON_COMPAT=( python2_7 )
-# Build fails with ninja
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs
-
-IUSE="numa pam tokudb tokudb-backup-plugin"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
-HOMEPAGE="http://www.percona.com/software/percona-server"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-COMMON_DEPEND="numa? ( sys-process/numactl:= )
-	server? ( pam? ( virtual/pam:0= ) )
-	tokudb? ( app-arch/snappy )
-	tokudb-backup-plugin? ( dev-util/valgrind )
-	"
-
-DEPEND="${COMMON_DEPEND}
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-	test? (
-		$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
-		dev-perl/JSON
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
-	"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
-	"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
-	"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
-	"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.34.patch
-	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
-	"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
-	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
-)
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-pkg_pretend() {
-	mysql-multilib-r1_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary && tc-is-gcc ]]; then
-		if [[ $(gcc-major-version) -gt 6 ]]; then
-			# https://bugs.gentoo.org/639936
-			eerror "${P} is incompatible with >gcc-6.x."
-			eerror "Please use gcc-config or package.env file to switch to <gcc-7.x for this package."
-			die
-		fi
-	fi
-
-	if use numa; then
-		local CONFIG_CHECK="~NUMA"
-
-		local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
-		WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
-
-		check_extra_config
-	fi
-}
-
-python_check_deps() {
-	has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	mysql-multilib-r1_src_prepare
-	if use libressl ; then
-		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
-			"${S}/cmake/ssl.cmake" || die
-	fi
-}
-
-src_configure() {
-	local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
-			-DWITH_PAM=$(usex pam)
-			$(mysql-cmake_use_plugin tokudb TOKUDB)
-	)
-	if use tokudb ; then
-		# TokuDB Backup plugin requires valgrind unconditionally
-		MYSQL_CMAKE_NATIVE_DEFINES+=(
-			$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
-		)
-	fi
-	mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild percona-server-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
-	if ! multilib_is_native_abi ; then
-		einfo "Server tests not available on non-native abi".
-		return 0;
-	fi
-
-	if ! use server ; then
-		einfo "Skipping server tests due to minimal build."
-		return 0
-	fi
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if [[ $UID -eq 0 ]]; then
-		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-	fi
-
-	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	# Run CTest (test-units)
-	cmake-utils_src_test
-	retstatus_unit=$?
-	[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-	# Ensure that parallel runs don't die
-	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-	# Enable parallel testing, auto will try to detect number of cores
-	# You may set this by hand.
-	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-	# create directories because mysqladmin might right out of order
-	mkdir -p "${T}"/var-tests{,/log}
-
-	# These are failing in Percona 5.6 for now and are believed to be
-	# false positives:
-	#
-	# main.information_schema, binlog.binlog_statement_insert_delayed,
-	# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
-	# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
-	# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
-	# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
-	# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
-	# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
-	# fails due to USE=-latin1 / utf8 default
-	#
-	# main.mysql_client_test:
-	# segfaults at random under Portage only, suspect resource limits.
-	#
-	# main.percona_bug1289599
-	# Looks to be a syntax error in the test file itself
-	#
-	# main.variables main.myisam main.merge_recover
-	# fails due to ulimit not able to open enough files (needs 5000)
-	#
-	# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-	# Called with bad parameters should be reported upstream
-	#
-
-	local t
-
-	for t in main.mysql_client_test \
-		binlog.binlog_statement_insert_delayed main.information_schema \
-		main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
-		perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
-		funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
-		main.variables main.myisam main.merge_recover \
-		engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
-		engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
-		engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
-		main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
-			mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
-	done
-
-	if use numa && use kernel_linux ; then
-		# bug 584880
-		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
-			for t in sys_vars.innodb_buffer_pool_populate_basic ; do
-				mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
-			done
-		fi
-	fi
-
-	if ! use extraengine ; then
-		# bug 401673, 530766
-		for t in federated.federated_plugin ; do
-			mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
-		done
-	fi
-
-	# Run mysql tests
-	pushd "${TESTDIR}" || die
-
-	# Set file limits higher so tests run
-	if ! ulimit -n 16500 1>/dev/null 2>&1; then
-		# Upper limit comes from parts.partition_* tests
-		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
-
-		if ! ulimit -n 4162 1>/dev/null 2>&1; then
-			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
-			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-			if ! ulimit -n 3000 1>/dev/null 2>&1; then
-				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-			else
-				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
-			fi
-		else
-			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
-		fi
-	else
-		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
-	fi
-
-	python_setup
-	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-		--testcase-timeout=30 --reorder
-	retstatus_tests=$?
-	[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-
-	popd || die
-
-	# Cleanup is important for these testcases.
-	pkill -9 -f "${S}/ndb" 2>/dev/null
-	pkill -9 -f "${S}/sql" 2>/dev/null
-
-	failures=""
-	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-	if [[ -n "$failures" ]]; then
-		has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
-		die "Test failures: $failures"
-	fi
-
-	einfo "Tests successfully completed"
-}
diff --git a/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild b/dev-db/percona-server/percona-server-5.6.39.83.1.ebuild
index 2e7499a7dc6e..2e7499a7dc6e 100644
--- a/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.39.83.1.ebuild
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index b9230a3842f3..3247eb59dba4 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -37,7 +37,7 @@ DIST postgresql-9.5.5.tar.bz2 18525082 BLAKE2B 1a8e81b1f5b530c670863cfb08e47541c
 DIST postgresql-9.6.6.tar.bz2 19605724 BLAKE2B efdb13a4e32133b31a0ee368aed9bf76f0511596a2d77ade60129c2c76b0ba2c7dafad532cf09ae007d7110175a153968cfa151cf8aa7008b59d36ed00ed18ed SHA512 ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
 DIST postgresql-9.6.7.tar.bz2 19504886 BLAKE2B 04ed26987f3a38826b7e04bf364d8f59fc93aa700fdf74b4fc6afdb2fcf12697945c8354e49507af9c4d48fcc05173182cb164778c97845bf84250fd9e5ad882 SHA512 6a66cdd5b74ea6dc95628b89bb7663555370be56b3e938f635950628ad5d77443ac8f40c747be1fc1cfc19ca8b0a27f41e52fe4db83a43c7a7bab9bb076c7844
 EBUILD postgresql-10.1.ebuild 13697 BLAKE2B d356373a27d27fdd2447f93691847816fd089019206d7371cbd6c84a513b6d490b20278232769fe1de63d60d6bdd1e0ff9afce5fbf7b0da66296a57167d689df SHA512 65bbb3d9d6e64dbf46d8d24c0aacaa930c417b262fa01442cdb09820bf47d37e81fa272e5afe808cb96bd5a3fdad3d23540c1d08a2d5a8de8bb6e8f4b0a3db11
-EBUILD postgresql-10.2.ebuild 13698 BLAKE2B 1a836945073f8d6bbb1edec840a188e322765567463df31dbee81c18e1fdcf1f4d0a9165f7a9666efc94bd82cee4cdc5d17f87256a9867647908c1865ab60d7c SHA512 b6596e599263774973f38a5158d2e679e82b5081e685e60d186c36ecf564e1328d123e5f0b6e6849e66a9ba8dee810d8073482d86acc321117e3f9602e619a0b
+EBUILD postgresql-10.2.ebuild 13696 BLAKE2B 9e698da7b11e72853ca6be05bf2ef4de219cd5069c858890dc2576fac25315d7297dcdcfcec9d44daf2bcdc7c30dfffab90378402f23a14d51b966e9fdb22a47 SHA512 780426e29e1c31e4de3f720a6cdc237f262f81d19f901584327f6d2af997f56b18ef3345ba0edc8cfb60905eee341edfd87729092b7ff8a3565e6307afe18256
 EBUILD postgresql-9.2.19.ebuild 11686 BLAKE2B f925064291b78586507d974cf47f850cdcd900dc6a8b60432ca02f242582ff876a13033a093200f4936898d48eb2ff47d74f808c84908962cac0f8b767a9c199 SHA512 886faf3fe74308c908e8c49e7a65cac36e55932eafee581ab021ef66ab3cc7fe2e37c5e4011b33239f6c11935465a6875e8f6d5b86fe4f64e5ead807a1e73164
 EBUILD postgresql-9.2.22.ebuild 13296 BLAKE2B da5e5cb771bbd20396f1621b7af93052a5e2fb022073286aa023245c083c146cad4d911d8754a94a33f9960ab91c8219c76bc624d15e2fbb385b54ac10f34558 SHA512 e16dca2871f2ede54993d9a81768ebc5ad3391041916d42108db09617c7d5577bf0f8daabc30b4d7a6851e991886e3155320a0a1c384c55eb248de12b3f7894e
 EBUILD postgresql-9.2.23-r1.ebuild 13492 BLAKE2B 912b67da2be82aa402ff4cb684f273a1630a6b551adb66d92125bfae9c81b66a48fb7eace28086525ee1bfffa1072a2f756b374a2d9ff10018ace257ab8643fb SHA512 cfb518dd4033579b2fe7f459555809c7d141bc0e15d80d308afa0ad1d3ec92e8809f81d92b855b97d76b299b2e6ec7a48971f2a6fc052da2ec82f048aa22c009
@@ -45,14 +45,14 @@ EBUILD postgresql-9.2.23.ebuild 13304 BLAKE2B f6e73d69d67cafc83186920d4a6d9eaf17
 EBUILD postgresql-9.2.24.ebuild 13483 BLAKE2B ef135a71dfb8f2349c106ddfa34c164058567dbc516d269487dba7b686200ea43e22ca18d5259d6ec321bbff4eb3c369faab14bdce558ecbaed424469732f53e SHA512 0220041ff150b574f7b2a7de0aa902813251abc192521e343f17d8b4aba1cdfb4c95545c8432372dd6bbf0b16c9f0628079dcfadd1c519f840be9b51bbca5444
 EBUILD postgresql-9.3.15.ebuild 11941 BLAKE2B 33410678e64b27a4802e11c1a5fcacadacb0b1332abdf61dfd64e0d6173b0be91ae9d457b58255dd56e410e13c9b5f778b7094acc8e1ddc1e265f685cff6a60b SHA512 3372d3801726ea6509713d79393ee59fc30eb2d832f17805f3d990308813064a59f42b7930d3342639475eeb37bdadc4952cf945e574f47c8ab7f0e9013b83d9
 EBUILD postgresql-9.3.20.ebuild 13742 BLAKE2B 8c6a98061068a6ee781f77fa994c683d80c2c7a1fc4ba7b7cf08a8a4932ff6b7d2522563a9da03b537034da7ecc84b3ab4974b5d1cbdbdab9d64f0e24779cc9c SHA512 21a54b6e8d4483bd15b464e6ab23cc04dbfe2b38fda30131b0d5c26a6cb156aca3ddd09b7228b32b64e4edadd9f24fe0a779efa9f04e633078a4153fcb11086f
-EBUILD postgresql-9.3.21.ebuild 13751 BLAKE2B 1730adadd67e5b93b7d3e3dd8db055e5c7e3f7e91db5069dc29075c6ab2dd96fa70df8b1c579e66425deb6dff8c19edc11b29c9634b4b5d2480a12d68bdd283f SHA512 bf08d33c60165edc38490d72c3694f1cbef6410ba5ad15dd3688dc809a6f944c01deaef2e6b78028771997ff627868c115f37bd229f46a3d89f064702ae2e187
+EBUILD postgresql-9.3.21.ebuild 13749 BLAKE2B 22ffda9f323225c1406ca21aebf04e91420461a4a8906d8cee6672a122835c70ff33464b0f3c15cd18016cf89b954f5d7d78c1b270e1fae3d0d8b61da04379d8 SHA512 f60f0c4664245933a14b97069077e3137b71a04ee564b85e6e241caaf24b14e47d27281fc31a7d00972d14c5793a075e288ee7406fce811e4293bb598fa00025
 EBUILD postgresql-9.4.10.ebuild 12751 BLAKE2B b90abd3b620ce5020b6c9af6e26856026c43204d7f15943a04c33c6dbe75c6b8aab8e4a59022a76913baa8596e0e44ffb454d8d98d7b1fad3747955d0e867ec3 SHA512 ccf11b56f79cd334fb67c13b549506c5c1bfe09b9496466d5d4d4dc976a9e5275cf9e9c1d0e579d615716f1abf320953126d531591439d5d1f777cdac8e4f70e
 EBUILD postgresql-9.4.15.ebuild 14552 BLAKE2B 5e343b4b7c24bfe2cab725491f41c4ec7eb12ca81595e268325adedad80e1266737ce3a18b5d4bd2dae8b3ebaf11b0ae55bed298aa9263eade7e2e7da00b3ff7 SHA512 afa0b8c349c8bd9c10b512f02c8dd16e6857d1a52acaa3ec7d695eb4ca3b7273c2cdcdc7b4b20f7c005570e4bdfd78126c890b6eaa60088ff9170cb5ec1b9595
-EBUILD postgresql-9.4.16.ebuild 14561 BLAKE2B 5256dc5e253fc837649426959ba6a710ef3b2a234b4088b46db08a35b2bacf5d45fba2357bd66c5c6e11a9e138d71d5495806d544fa4b60aca0a554656df1a61 SHA512 40d3a1aed466df25a5c855c420bced8741bd0d7cde03693ab7325c3d24fa64fda20db15c49e5f5b84b84468990f07ce1fd233d3e52e9b1ab9d8f28a3dffac0e4
+EBUILD postgresql-9.4.16.ebuild 14559 BLAKE2B d1803b901aedec4afd9fdff110a93fa00644f5278922d870a2d6f87ef4d3227ea21c90118b8ec0ac2b4014f869ca05d6cd7e56bc4c31975607a518f0df854681 SHA512 125b1e725673ad06db8f4ecf8ccd7d442a3538a1d61148f3e7dc6e28bb759ed76c6a07a65638331ec53f1c047cb32e25966c456489a1ea52c4f63d1b5377b5b7
 EBUILD postgresql-9.5.10.ebuild 14780 BLAKE2B 988e6270060614715936959b06867137f0629884d98cb50643d7d0fc4314c8192fa4205125bb376b3d9ac8d0b17cbceabd89b79671e9bd78017ca13a7c40ecc2 SHA512 26f93ac88c51609e62ea3d2dce5dbbc63cf8ad52ac76f029a437befd907d17d5b343a77a651c362b3292f8cb81784c480febe3909431a2f24ac51b9335d0b149
-EBUILD postgresql-9.5.11.ebuild 14789 BLAKE2B d58a0098ea848973501beaa11e1842ca3cb9b1a0885c13966b51c12d6631f7060fd078219472402f55068cbcc64028d021687d7251540da618b1fb5693951924 SHA512 42bb6d13163d4cbd9ccbbd6dd1089fe8174a84df3d37d6d2ffbc3c2d65036ffbf75a3c7e022419b2cba7de7b4d9226fa77fb3d7985f8a9c9bc4ff5ff94d3d795
+EBUILD postgresql-9.5.11.ebuild 14787 BLAKE2B 278ed045fbf1b359f2703b6fa0044fcbf69c158684cd7c4615c992f1c70fa38c0e99fcf67e1f51b6b643b9258fd84312ba2dbbf009605af73c2d2711b26da6a5 SHA512 b44f526cd924128f8c91fcee99d2afaa81501a3430f7018b2d03dbdc1b71e2f6c335afb5c3397455d7ac647e42f0d126ce1ac959142649b8dc1e7d62d9f0b8a5
 EBUILD postgresql-9.5.5.ebuild 13090 BLAKE2B cdcc7cfae7249c37a72bdb0a5c91362bc926170bc47d046f2023ac34ea925281d2f136500c1cae288b4ca2d4c9c8f90b490ddb648c26b3fbcbbf9fcdbabfc2b7 SHA512 957a4a494eb13d125867531c004193746cac0c3197ae3f45b191f78c7c02941400bd02f18af8f954ffbb45523688f5dc3cb4d804f5504020e0304083395cf8d0
 EBUILD postgresql-9.6.6.ebuild 14922 BLAKE2B 25182d0ccbf475123d876bc4ad825b9b5049b7bd8edd8e96ef7390ab8d371515df12cc95426ba503366e81fe04be01c3a4c40a688caeb60fdb972f8f5e7c8ec4 SHA512 385e3c883cfe4926be01f760205a4c0827f6f20c0e465a082cd474e7b68c2a9977a2ebe4acc90c04171ff32f265abedcd12d225dcc3215981fe59216b1dbf6a2
-EBUILD postgresql-9.6.7.ebuild 14931 BLAKE2B 4987e4eed2a0eda2fb2a6a997648e60dffcf80b3b3ed0e06ae9f20bcc4257b460fa4add991c3baf8785c0abe9a5cda6b5a50f668b94aed951be6c19e80d577cb SHA512 6b8a5982697a8b4dbf6722330829f260af5715925d68ab0a6190b0a16b7669eb947b81fe35f332c70122bb820bc8342bcdc92a7c3420e4a88da3122e27542824
+EBUILD postgresql-9.6.7.ebuild 14929 BLAKE2B 17d12d477735be1eb7e18670b763b67e15dfb800ab4c136e1d8b791bcca5625a520d1490a0e2a02408954f423f06288a7734ec800bc7272ae566fe285a5f312b SHA512 07be042fb762d274cfd2e7bc830ef3a8079156ed637861f22e04d20a32a4887f9996ef865d3ca6e0e1a5a786b83652586cff0cf09cc96700c2da9d667454b675
 EBUILD postgresql-9999.ebuild 13544 BLAKE2B 2a1f9c50e21e7b9981adb38d18d4814903578a461d81f8a250fccc73b5680232f9d53d3c56486e65007b90a954f31939775ce5e4bcc621672e8b29e0ee332b0d SHA512 7c579c0a60b1e10e2d0c254fc9f60f2908db3634371d359c88ebf0acf581eaadf24ba5e8d3ee0ebd4aa05d840a97d0df74385578c0d792ee7ba87402b6931813
 MISC metadata.xml 751 BLAKE2B 4628a6d379a41b4646be34dfcfca2be58bc93b883ccd6f4d21a426aacb34dd7d5347c5f9d61f9211f4f91bff67d2d5935b203959ab0790c74031944a9ab799f6 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1
diff --git a/dev-db/postgresql/postgresql-10.2.ebuild b/dev-db/postgresql/postgresql-10.2.ebuild
index aeb8a7a0850f..12feeb24bb00 100644
--- a/dev-db/postgresql/postgresql-10.2.ebuild
+++ b/dev-db/postgresql/postgresql-10.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.3.21.ebuild b/dev-db/postgresql/postgresql-9.3.21.ebuild
index 9bd6eb22b922..d244e31223cd 100644
--- a/dev-db/postgresql/postgresql-9.3.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.21.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.16.ebuild b/dev-db/postgresql/postgresql-9.4.16.ebuild
index 2f448ba1c0c0..a4602b193c8a 100644
--- a/dev-db/postgresql/postgresql-9.4.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.11.ebuild b/dev-db/postgresql/postgresql-9.5.11.ebuild
index 4e1148a89f37..a744fe54b2b0 100644
--- a/dev-db/postgresql/postgresql-9.5.11.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.7.ebuild b/dev-db/postgresql/postgresql-9.6.7.ebuild
index 1d5a335c5909..91ff370b1e6e 100644
--- a/dev-db/postgresql/postgresql-9.6.7.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index f4b3b7d1e043..e309ee74c47a 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
 DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
 EBUILD psqlodbc-10.00.0000.ebuild 682 BLAKE2B 24cb9dea014d5864ee30c06fd731b5375526f61beb2833e4a2d399eb1ec8add1acc6e5f347cd7207066bfded78d0ad99e5ea81cd38ac42ac5aaca82d7ac826f5 SHA512 d19554f16da5540d8925062536aa3ed2598cd66a0b21d93bfad2fc07fb00531477a5d53660b266f4bd3181fb7fd5c311a749d5e101eafa5a696349d61206dc89
-EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
+EBUILD psqlodbc-10.01.0000.ebuild 683 BLAKE2B 944fc0d6473e258eabae06bc554f8cb176f1d28447d338a25a111fa4516fc43d37e539a6740eaf70d1899c70c58b073d1125dca50d563360cecd0381cdc7325b SHA512 b9c1b8559da8f244fe58a4d5f5e1bcda26d10b3f889229dbef254e6f27ce4189590fa0a65aabc1b7ad193a1a3657b2a773a1eae95ca42507794fa8e891474d8b
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
index a7d8360210f1..34920d386eeb 100644
--- a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index 96e3f02b44e7..c52883a4626f 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,4 +1,4 @@
 AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
 DIST qt5-sqlcipher-0.1.1_pre20171202.tar.xz 24340 BLAKE2B de40988c9ca13de0ebafebd4078f9da1c21ad4d8d78a9931497048859617d34f4de8ba630d438024dbb034bb817703e1e456619c3897b3c7dc6dbfa2a719e307 SHA512 e95eb1e73ff944d24f785129cb3e6ebc297abf457d14a2c6466d64230003932eb99b83dc3b216b27fe40565213e67d62b45d43fa538f6f693626283c788ca562
-EBUILD qt5-sqlcipher-0.1.1_pre20171202.ebuild 742 BLAKE2B 296d942058bcbdf242cf2e6007b58c32094271a3806c817bae562e63b6d2dec7ca88052e9f9104fa54217cc6fe6166f3bac59d3ab329424dc09e8bcc97aee4fc SHA512 a5584697facc849b47006ae361feae84f8d5bedca3d80fc7d695885c9830839dcc3d9df02a628906e0b0abcc093e80e3529866b747779bace0f2358b93834d07
+EBUILD qt5-sqlcipher-0.1.1_pre20171202.ebuild 850 BLAKE2B 4d733633ce0338957f45f34d4f2859f19df21708e848b5031eed809d4a916a01f2e441f71893a957198fddd7528453773343ffcb72637faf6de0a77c26ecba3b SHA512 064e4a08cba7c7fbfc0f303edc54c138d62abadc7a3688f08d7daab5bc2c972af3d1101f80397834810b682cfa4179d35947f57d815af743c61b6fa9311d304e
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
index 75caf3f0bb1a..74d3f8006b79 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.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
@@ -24,6 +24,8 @@ DOCS=(README.md)
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-install-path.patch
 	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+	# workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
+	cp -R qt-file-cache/5.9.{3,4} || die
 	cmake-utils_src_prepare
 }
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 27c67d521f58..6439ed7f78ad 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -5,20 +5,27 @@ AUX sqlite-3.20.1-full_tarball-csv-unsigned_char.patch 1087 BLAKE2B 20e74644ea5f
 AUX sqlite-3.20.1-full_tarball-tests-big-endian.patch 3507 BLAKE2B 50df13de29f0a1cbbd47d9932e5bbfd32a2992d9f1fa28ca4bba3d5477f9f49fc65b50736fa0ab99fc6b9c09b43fd56cfc4071b0e69a2d07e2ff7c91ddb5b96c SHA512 e9e3827f78cc51b401727138ce2bbe5cd157c47c1d2da8994e2f2b44ab66705625edabed3b0246c82ba56d59761f8451917ffcc6ddbba1dc36a519e5b8a5c96a
 AUX sqlite-3.21.0-full_archive-build.patch 5885 BLAKE2B a1ec0a84ebfaf68e13c6b591152f4d1a634a3963a528d581303b7f8fe79f35b32af18193833aad82c3619b911c548e2a6f0da4ba639dd8e33e5ddec5a89cad99 SHA512 27dc99503373d5bc235fcf45fa9731d3328d75332a88be39a12650237b08c7b779b8a95446654e59df0da855d310e0dff35388a661d8d51fc8d363575f52ab7b
 AUX sqlite-3.21.0-nonfull_archive-build.patch 407 BLAKE2B 38f71008ce9554333668bd1d3a2ff94a95a060e2d920f05f7d7be7e65fb3cbc549d265beaf3bebcf653dc4ab28eccc762fd51e983167c82b899a2d35789ac48a SHA512 1047210c37e638a8bcf80b071e780f28e4260c73c581e0fbf9021d0df5287c5e9a17193e563e8de76b41d3f158ecb8fcccd3df227c1f9360246bc52a70f75651
+AUX sqlite-3.22.0-full_archive-build.patch 13457 BLAKE2B c5cb64031e92af91542f59cebdb71161723b1de5f0f7dc1f5324571a0d85a942dbd5265d7afca738d044fafa06a59184c3716a8526f71d37763c73bf85839ffe SHA512 f1484ad421b99153b21e6f9ccf0c827fec1d081294a4b7965b483f54a76eda3af9fe879ef7c2cd95db9be270fbdaf726b46844a4988076a2f52e4eb6fb36ffa5
+AUX sqlite-3.22.0-full_archive-headers.patch 693 BLAKE2B c94193298bf3d3ba22c78ed8e2af4dfd21aa7fba2f8743130f7960599d0670d84b05f30cbe26be5f29715e64f895055390993f33d0fbc4390894ccf0b40da298 SHA512 3a39be126aca6f4b6ab15bb6629d26ab3a9635473f9f1c3e55072ad9a525d6236cf3149577e9b8cdb68759dd8dd9d87a11685a7430e7c6d02724b544bd065559
+AUX sqlite-3.22.0-full_archive-tests.patch 7566 BLAKE2B c59f71e46eaa7af45cc2046db2eaa73d8da3e7fc14341fca8418cf77eecb14b6278f54fd9932ff5f5a6f2d53e4dd9f07b88ac7e343533020e4650f1b2a4642f8 SHA512 a9dcd1e3caba1454c22b051c31237ce82b4e5e79783581111e3ef3cbf937b7bb139a569db5df7eeccc221113421cf4765af45a499bc5dc335f8ff5c5b2cf9d43
 DIST sqlite-autoconf-3190300.tar.gz 2542682 BLAKE2B bcbc3ce87b569c2d84c099776db292b10fc0100ec10a285bbb8819b996994aa020d5576620363e9b45debf27481e3f17a8589b71aa7551f4ee44b137d4c538a1 SHA512 7896c99726da75818f1027d5675b24724bc89c738874c868868e60c09d4509ad5a6da93f54cfcecb3a1052e4f164f7cb864ede333b9ccfb4f6b811b052ca1d3d
 DIST sqlite-autoconf-3200000.tar.gz 2565548 BLAKE2B 29d88fb8597b6ef7c7b3613c73d8b912cd22e1354c664a2edae0b5d0379103b1025a54d83f24ee74159bed3b928627cb1a50c8df48658ba0cdc5ce7fdbfa5920 SHA512 f5b0ffcc27adeed5b27b29962d03defa167151868f2281c5642a8ddfa10ac8971aff22081a5b46bd36bcf664bd271975e80249ec403b73656658b33af084ec94
 DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0
 DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298
+DIST sqlite-autoconf-3220000.tar.gz 2644649 BLAKE2B e73fd7846362e6cc07eb96ea18e8883c1473c2b07c6e0c89e7e65726c5a6556b50bac71904a5b3a431ba40ff72b32e55c3e5ab7461567b5643560a0790a9a4dd SHA512 13e791bb1d7ba7edb5d84f4945f36ce2e03898a5bb1612d28799ef35a100f32e85cbb38f4ef65a7b43d020e5d48bf09b2e79cbb2003cc8aca2b09458b8c5d5bc
 DIST sqlite-doc-3190300.zip 5649351 BLAKE2B f0bc52bebe6e3c4be227d8f6cf2689fb2f6d46e6472d61334a7959697d4017dcee87c4ff146293f13a88e69990c2e7f291e4ad8ae5359c378e1bcecf6dfe2aa1 SHA512 4f99b6797f76dab1859eaf4596c42d6b10a80a1ad9dcb33b82fcc4ef80a8e8299ac24c0d2a0f41debf9e82d43c9ecf9675547eb6163756f29afe847613ef75f3
 DIST sqlite-doc-3200000.zip 5695366 BLAKE2B 0e6dba7666d449875026772204943c892e8984a85cd517a33d7a5bdccb352070fc2cc8012b9b57b70c2436587ab5d6840ef329253bcb27c7c1cd10b0b4c30c06 SHA512 0dfa9487c5e4084a9c17e8bf83a92b9a2cd53642efeff0b12051ecdeaf11e3896031f1b4d59021354a293b8acc8c6fcab827961721fda7a5de8415460d3bd280
 DIST sqlite-doc-3200100.zip 5759028 BLAKE2B a633672b739160873e64b89e1350c85b0002fd8f268b6ae0f5189de12f411125fbb309585175727b8915fe1468b3e70e7c33239826232c3e7bc8c1c59132bec0 SHA512 518ca59644cecfcd67f511268112e421c5d7bbd77ef1e33304bf306ef110becf1e2a7fe37c506ec6892edb9d5c6ee77657b374c2e061f49890d18af062dea2b3
 DIST sqlite-doc-3210000.zip 5800635 BLAKE2B c9e15fe7373045783d05bd7b0a70f980e3c8a3c0ec4243f85fe338788830a58e82f1c6b3c053efe75caa33e99a6162e2f9831e4f5b9577c0bf90a305ee2f0381 SHA512 799c7279166b489d1a5acc9410808c2d4b78e64037fc15b60764180fe1c698f35e27e86793140302f560cfa583baa2c33e416d5c9e1842ec58c6cb6093729334
+DIST sqlite-doc-3220000.zip 5856836 BLAKE2B 1be73848040f3ae9734a44c94e4c36cae269d79abb20467f9f8368754e1ae07f4c25490be985b44d08f427e281fc268c6569dc0f5bbb6254621c62798507d687 SHA512 f9141d3907e5c1a3008d3b7e111e46e7ff1f010358eb682d3e1187a67deb7cca7ba1d5fbc5b19da26ee8df3a0c71a098fd0e8d8ca89c25e5ad2b3e12ba7dc312
 DIST sqlite-src-3190300.zip 10193997 BLAKE2B 2286d410594cb04acc79e4877101cbd5018cb84802394fbe4fe9ceaca4e9b20064372f5189d8d70bc7c034789fa92799224939e46f35f8fe47fb42d08f9b29e1 SHA512 514c3de6346bdea359036a79c880133f0eeed4cdfc9e811d662dc343f91ea43edda0f9760405a48e7f61ea1dd3478980cc7d3b5409ef27adcb5311a06e36297e
 DIST sqlite-src-3200000.zip 10575632 BLAKE2B 2f0f41129e56477531f59d91e02469ccf5e21eaadce57a2a81bde9bcd549c12d55a496f27fd07bf0ded78b55aa8a6e4d48e5073638dc87eaeef8e989906fccfb SHA512 40fe7972902d041f012c7739c8712aa40069aebc7be680fde8f43b33fed885bfc42331bfb7200651486484edb71cbdd77ddb9c119d0847bdfb0e92063090f029
 DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca35584092c663fed176fdd69164623bbe58afd15cd74fcd32a0cec893cffdb0f096873188c42ec5595ef7d635c79ad SHA512 845a0d64c9356aadf178c04dd716bbd37a7353526b06cfa8e8f65653cf6a1893a5c5e8c78d20b43910c34d9167272cf517749c91ed0ba7686977e3d0327e8939
 DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
+DIST sqlite-src-3220000.zip 10721627 BLAKE2B ed4cf93c36c095edeccd6ee4dac5419c516264a42eb9d6d2e333b1d4a134c6198dfcd2bbae41dff811616f0dc7f9e9bb487f9c5b5f631fcb5885540a84bf527a SHA512 e35defb0ffcc10100399051bc734746de40fa3dc5cd673eac470fb58cd8bd6d911b6dacb5e8489e2dd79c6ae75faaeb8c02384f64c4595963e62bd3faeb9446c
 EBUILD sqlite-3.19.3.ebuild 7611 BLAKE2B 1263a4f8abaff47d5295084f20992bcba69901f1883bd7413d6ab5d8c3b0a8ff6d3a8155857939a4498ee574244222af7f9d1194e32a97bd7f7b0ddbd6d4f067 SHA512 774cca8ce00fea1abd5061bddf8a5661b6345c7d92a40cff80e67e50c05f8015374ee9164a56345a27bbfaa5b377cdbd24ff88b1747cde2c7d32ad3b48c0650a
 EBUILD sqlite-3.20.0.ebuild 7620 BLAKE2B ea080930bb5e163562cd5e1b7e7e66437cd10638c2e8de05ef657028d5811169b0ba769c43fe016e7fb630daf8e9e03a92b49056bc06be8d6145e2e69af789dc SHA512 22a41d407e0c18fe978eb26cf7606bb977779f61fa26e39f9ebb9d289c26a884ec4d8dec311a2147c5eb51532b8fa9ef6eab4f042a3d7a6e6fb7f06053e67193
 EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
-EBUILD sqlite-3.21.0.ebuild 8458 BLAKE2B 48d854b3dd9c48c14fb534aa2f37cc0af1fad552ea940d4381aa60ede0e236a343040fbb2c6e83b19ea08079e0a3501f66dc389f47582f2507d8e8acba125a88 SHA512 3d6f5278c9bf233e16e40acc54f6e0bf30f5456736c9f86f34c2a156573495438783811428fd9f470e02df84177b4cd67dcabc87aa3669a8df7a87276c6d8042
+EBUILD sqlite-3.21.0.ebuild 8456 BLAKE2B 18e5a760e610ad09748b7f3d65f3e447b4b5203aa0739fb935ad0889426ac79e1304a3ef48b3d535540f7e1165c3b3563ebd80824407ff5fcd7538c6a98d070d SHA512 66e0e61a4ef4d69f883745db5997e1404d2ed9cf115e6ff003535362da22401201c04e9d5c92bafd8ca2ec51934308359cbe61c27481892547973efb3282959e
+EBUILD sqlite-3.22.0.ebuild 9319 BLAKE2B 1a6ffe8c2bbc4c5842298562ed6feb47b9187168f80740e3252bed8ea857585ceda1bf16153c8770c08221c0924cfff849bf35445b2984d9530bd8a3e250c170 SHA512 0d774f05a56a677fda403b99bc036ec647ac574d1f5a1c1689fc37726159ef69e6c8b764739cae44a5b6e41cb7d7ec61bdf5dad949a766e1fe05ddd40a1543da
 MISC metadata.xml 745 BLAKE2B 967f5a809e007354fac9d750f068aaf552aac8503f72d20c57dfd0f85dbdbf620209bbd9646cb2b79cfc5f2a40917422c4925784d54220f61132d70ddd414d53 SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch
new file mode 100644
index 000000000000..5e1236a4e968
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch
@@ -0,0 +1,405 @@
+Move some code to libsqlite3.so to avoid duplication.
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- /Makefile.in
++++ /Makefile.in
+@@ -307,6 +307,9 @@
+ # Source code for extensions
+ #
+ SRC += \
++  $(TOP)/ext/expert/sqlite3expert.c \
++  $(TOP)/ext/expert/sqlite3expert.h
++SRC += \
+   $(TOP)/ext/fts1/fts1.c \
+   $(TOP)/ext/fts1/fts1.h \
+   $(TOP)/ext/fts1/fts1_hash.c \
+@@ -355,8 +358,11 @@
+   $(TOP)/ext/rbu/sqlite3rbu.h \
+   $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
++  $(TOP)/ext/misc/appendvfs.c \
+   $(TOP)/ext/misc/json1.c \
+-  $(TOP)/ext/misc/stmt.c
++  $(TOP)/ext/misc/sqlar.c \
++  $(TOP)/ext/misc/stmt.c \
++  $(TOP)/ext/misc/zipfile.c
+ 
+ # Generated source code files
+ #
+@@ -425,7 +431,6 @@
+ # Statically linked extensions
+ #
+ TESTSRC += \
+-  $(TOP)/ext/expert/sqlite3expert.c \
+   $(TOP)/ext/expert/test_expert.c \
+   $(TOP)/ext/misc/amatch.c \
+   $(TOP)/ext/misc/carray.c \
+@@ -447,8 +452,7 @@
+   $(TOP)/ext/misc/spellfix.c \
+   $(TOP)/ext/misc/totype.c \
+   $(TOP)/ext/misc/unionvtab.c \
+-  $(TOP)/ext/misc/wholenumber.c \
+-  $(TOP)/ext/misc/zipfile.c
++  $(TOP)/ext/misc/wholenumber.c
+ 
+ # Source code to the library files needed by the test fixture
+ #
+@@ -610,25 +614,25 @@
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+-		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++		libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ 		-rpath "$(TCLLIBDIR)" \
+ 		-version-info "8:6:8" \
+ 		-avoid-version
+ 
+-sqlite3$(TEXE):	shell.c sqlite3.c
+-	$(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+-		shell.c sqlite3.c \
+-		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
++sqlite3$(TEXE):	shell.c libsqlite3.la
++	$(LTLINK) $(READLINE_FLAGS) -o $@ \
++		shell.c libsqlite3.la \
++		$(LIBREADLINE)
+ 
+-sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
++sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+ 
+-dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+-	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
++dbhash$(TEXE):	$(TOP)/tool/dbhash.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
+ 
+-scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
++scrub$(TEXE):	$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
+-		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
++		$(TOP)/ext/misc/scrub.c libsqlite3.la
+ 
+ srcck1$(BEXE):	$(TOP)/tool/srcck1.c
+ 	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -704,7 +708,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo:	sqlite3.c
+-	$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
++	$(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+ 
+ # Rules to build the LEMON compiler generator
+ #
+@@ -995,14 +999,9 @@
+ # Source files that go into making shell.c
+ SHELL_SRC = \
+ 	$(TOP)/src/shell.c.in \
+-        $(TOP)/ext/misc/appendvfs.c \
+ 	$(TOP)/ext/misc/shathree.c \
+ 	$(TOP)/ext/misc/fileio.c \
+ 	$(TOP)/ext/misc/completion.c \
+-	$(TOP)/ext/misc/sqlar.c \
+-	$(TOP)/ext/expert/sqlite3expert.c \
+-	$(TOP)/ext/expert/sqlite3expert.h \
+-	$(TOP)/ext/misc/zipfile.c \
+         $(TOP)/src/test_windirent.c
+ 
+ shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
+@@ -1161,13 +1160,13 @@
+ 
+ # Fuzz testing
+ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) $(FUZZDATA)
++	./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ 
+ fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA)
+-	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
++	./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
+ 
+ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA)
+-	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
++	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ 
+ # The veryquick.test TCL tests.
+ #
+@@ -1197,24 +1196,23 @@
+ smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
+ 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+ 
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
++sqlite3_analyzer.c:	$(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
+ 
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+-	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_analyzer$(TEXE):	sqlite3_analyzer.c libsqlite3.la
++	$(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in	
++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in	
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
+ 
+-sqltclsh$(TEXE): sqltclsh.c
+-	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
++	$(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+-	$(LTLINK)	$(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
++	$(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
+ 
+ CHECKER_DEPS =\
+   $(TOP)/tool/mkccode.tcl \
+-  sqlite3.c \
+   $(TOP)/src/tclsqlite.c \
+   $(TOP)/ext/repair/sqlite3_checker.tcl \
+   $(TOP)/ext/repair/checkindex.c \
+@@ -1225,30 +1223,30 @@
+ sqlite3_checker.c:	$(CHECKER_DEPS)
+ 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
+ 
+-sqlite3_checker$(TEXE):	sqlite3_checker.c
+-	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_checker$(TEXE):	sqlite3_checker.c libsqlite3.la
++	$(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
+ 
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
++dbdump$(TEXE):	$(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 	$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
+-           $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
++           $(TOP)/ext/misc/dbdump.c libsqlite3.la
+ 
+-showdb$(TEXE):	$(TOP)/tool/showdb.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
++showdb$(TEXE):	$(TOP)/tool/showdb.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+ 
+-showstat4$(TEXE):	$(TOP)/tool/showstat4.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
++showstat4$(TEXE):	$(TOP)/tool/showstat4.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+ 
+-showjournal$(TEXE):	$(TOP)/tool/showjournal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
++showjournal$(TEXE):	$(TOP)/tool/showjournal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+ 
+-showwal$(TEXE):	$(TOP)/tool/showwal.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
++showwal$(TEXE):	$(TOP)/tool/showwal.c
++	$(LTLINK) -o $@ $(TOP)/tool/showwal.c
+ 
+ showshm$(TEXE):	$(TOP)/tool/showshm.c
+ 	$(LTLINK) -o $@ $(TOP)/tool/showshm.c
+ 
+-changeset$(TEXE):	$(TOP)/ext/session/changeset.c sqlite3.lo
+-	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
++changeset$(TEXE):	$(TOP)/ext/session/changeset.c libsqlite3.la
++	$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+ 
+ rollback-test$(TEXE):	$(TOP)/tool/rollback-test.c sqlite3.lo
+ 	$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
+@@ -1267,11 +1265,11 @@
+ kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
+ 	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
+ 
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo 
+-	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
++rbu$(EXE):	$(TOP)/ext/rbu/rbu.c libsqlite3.la
++	$(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+ 
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+-	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
++loadfts$(EXE):	$(TOP)/tool/loadfts.c libsqlite3.la
++	$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
+ 
+ # This target will fail if the SQLite amalgamation contains any exported
+ # symbols that do not begin with "sqlite3_". It is run as part of the
+--- /configure.ac
++++ /configure.ac
+@@ -590,6 +590,9 @@
+ if test "${use_loadextension}" = "yes" ; then
+   OPT_FEATURE_FLAGS=""
+   AC_SEARCH_LIBS(dlopen, dl)
++  if test "${ac_cv_search_dlopen}" = "no" ; then
++    OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
++  fi
+ else
+   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
+--- /ext/misc/sqlar.c
++++ /ext/misc/sqlar.c
+@@ -14,6 +14,8 @@
+ ** for working with sqlar archives and used by the shell tool's built-in
+ ** sqlar support.
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <zlib.h>
+@@ -119,3 +121,5 @@
+   }
+   return rc;
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/misc/zipfile.c
++++ /ext/misc/zipfile.c
+@@ -24,6 +24,8 @@
+ **    *  No support for zip64 extensions
+ **    *  Only the "inflate/deflate" (zlib) compression method is supported
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include <stdio.h>
+@@ -1665,3 +1667,5 @@
+   (void)pzErrMsg;  /* Unused parameter */
+   return zipfileRegister(db);
+ }
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/repair/sqlite3_checker.c.in
++++ /ext/repair/sqlite3_checker.c.in
+@@ -2,6 +2,7 @@
+ ** Read an SQLite database file and analyze its space utilization.  Generate
+ ** text on standard output.
+ */
++#define SQLITE_CORE 1
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1
+ #define SQLITE_ENABLE_JSON1 1
+@@ -14,7 +15,7 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ INCLUDE $ROOT/ext/misc/btreeinfo.c
+ INCLUDE $ROOT/ext/repair/checkindex.c
+--- /src/shell.c.in
++++ /src/shell.c.in
+@@ -61,6 +61,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include "sqlite3.h"
++#include "ext/expert/sqlite3expert.h"
+ typedef sqlite3_int64 i64;
+ typedef sqlite3_uint64 u64;
+ typedef unsigned char u8;
+@@ -124,6 +125,10 @@
+ # define SHELL_USE_LOCAL_GETLINE 1
+ #endif
+ 
++#ifdef SQLITE_HAVE_ZLIB
++#include <zlib.h>
++#endif
++
+ 
+ #if defined(_WIN32) || defined(WIN32)
+ # include <io.h>
+@@ -963,13 +968,6 @@
+ INCLUDE ../ext/misc/shathree.c
+ INCLUDE ../ext/misc/fileio.c
+ INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE ../ext/misc/zipfile.c
+-INCLUDE ../ext/misc/sqlar.c
+-#endif
+-INCLUDE ../ext/expert/sqlite3expert.h
+-INCLUDE ../ext/expert/sqlite3expert.c
+ 
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+@@ -3467,7 +3465,9 @@
+     sqlite3_shathree_init(p->db, 0, 0);
+     sqlite3_completion_init(p->db, 0, 0);
+ #ifdef SQLITE_HAVE_ZLIB
++    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_zipfile_init(p->db, 0, 0);
++    extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_sqlar_init(p->db, 0, 0);
+ #endif
+     sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
+@@ -5316,6 +5316,7 @@
+       }
+       sqlite3_fileio_init(cmd.db, 0, 0);
+ #ifdef SQLITE_HAVE_ZLIB
++      extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+       sqlite3_sqlar_init(cmd.db, 0, 0);
+ #endif
+       sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
+@@ -8222,6 +8223,7 @@
+ #endif
+   }
+   data.out = stdout;
++  extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ 
+   /* Go ahead and open the database file if it already exists.  If the
+--- /tool/mksqlite3c.tcl
++++ /tool/mksqlite3c.tcl
+@@ -116,6 +116,7 @@
+    rtree.h
+    sqlite3session.h
+    sqlite3.h
++   sqlite3expert.h
+    sqlite3ext.h
+    sqlite3rbu.h
+    sqliteicu.h
+@@ -399,6 +400,10 @@
+    json1.c
+    fts5.c
+    stmt.c
++   appendvfs.c
++   sqlar.c
++   sqlite3expert.c
++   zipfile.c
+ } {
+   copy_file tsrc/$file
+ }
+--- /tool/sqlite3_analyzer.c.in
++++ /tool/sqlite3_analyzer.c.in
+@@ -14,9 +14,6 @@
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_LOAD_EXTENSION 1
+-#ifndef USE_EXTERNAL_SQLITE
+-INCLUDE sqlite3.c
+-#endif
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
+--- /tool/sqltclsh.c.in
++++ /tool/sqltclsh.c.in
+@@ -27,19 +27,17 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
+-INCLUDE $ROOT/ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE $ROOT/ext/misc/zipfile.c
+-INCLUDE $ROOT/ext/misc/sqlar.c
+-#endif
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ 
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
+   (void)interp;
++  extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
+   sqlite3_appendvfs_init(0,0,0);
+ #ifdef SQLITE_HAVE_ZLIB
++  extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
++  extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
+   sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
+ #endif
+ 
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch
new file mode 100644
index 000000000000..751f00a62bdf
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch
@@ -0,0 +1,15 @@
+https://sqlite.org/src/info/6185d190e250faae
+
+--- /src/sqlite3ext.h
++++ /src/sqlite3ext.h
+@@ -563,8 +563,8 @@
+ #define sqlite3_value_pointer          sqlite3_api->value_pointer
+ /* Version 3.22.0 and later */
+ #define sqlite3_vtab_nochange          sqlite3_api->vtab_nochange
+-#define sqlite3_value_nochange         sqltie3_api->value_nochange
+-#define sqlite3_vtab_collation         sqltie3_api->vtab_collation
++#define sqlite3_value_nochange         sqlite3_api->value_nochange
++#define sqlite3_vtab_collation         sqlite3_api->vtab_collation
+ #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
+ 
+ #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch
new file mode 100644
index 000000000000..a253028b7f4b
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch
@@ -0,0 +1,249 @@
+https://sqlite.org/src/info/e4766cabdf64d8e9
+https://sqlite.org/src/info/d9e59cfb8476e1ec
+https://sqlite.org/src/info/ba0631de60ca38bf
+https://sqlite.org/src/info/b685d3231097fb90
+
+--- /test/fts3rank.test
++++ /test/fts3rank.test
+@@ -14,7 +14,7 @@
+ 
+ set testdir [file dirname $argv0]
+ source $testdir/tester.tcl
+-set testprefix fts3expr5
++set testprefix fts3rank
+ 
+ # If SQLITE_ENABLE_FTS3 is defined, omit this file.
+ ifcapable !fts3 {
+@@ -56,9 +56,14 @@
+   SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid
+ } {0 {{one two} one {one two} three {one two} two}}
+ 
+-do_catchsql_test 1.5 {
+-  SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
+-} {1 {invalid matchinfo blob passed to function rank()}}
++if {$tcl_platform(byteOrder)=="littleEndian"} {
++  do_catchsql_test 1.5le {
++    SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
++  } {1 {invalid matchinfo blob passed to function rank()}}
++} else {
++  do_catchsql_test 1.5be {
++    SELECT * FROM t1 ORDER BY rank(x'0000000100000001') DESC, rowid
++  } {1 {invalid matchinfo blob passed to function rank()}}
++}
+ 
+ finish_test
+-
+--- /test/func6.test
++++ /test/func6.test
+@@ -33,54 +33,125 @@
+   CREATE TABLE t2(x TEXT PRIMARY KEY, y) WITHOUT ROWID;
+   INSERT INTO t2(x,y) SELECT a, b FROM t1;
+ }
++
++# Load the contents of $file from disk and return it encoded as a hex
++# string.
++proc loadhex {file} {
++  set fd [open $file]
++  fconfigure $fd -translation binary -encoding binary
++  set data [read $fd]
++  close $fd
++  binary encode hex $data 
++}
++
++# Each argument is either an integer between 0 and 65535, a text value, or
++# an empty string representing an SQL NULL. This command builds an SQLite
++# record containing the values passed as arguments and returns it encoded
++# as a hex string.
++proc hexrecord {args} {
++  set hdr ""
++  set body ""
++  foreach x $args {
++    if {$x==""} {
++      append hdr 00
++    } elseif {[string is integer $x]==0} {
++      set n [string length $x]
++      append hdr [format %02x [expr $n*2 + 13]]
++      append body [binary encode hex $x]
++    } elseif {$x == 0} {
++      append hdr 08
++    } elseif {$x == 1} {
++      append hdr 09
++    } elseif {$x <= 127} {
++      append hdr 01
++      append body [format %02x $x]
++    } else {
++      append hdr 02
++      append body [format %04x $x]
++    }
++  }
++  set res [format %02x [expr 1 + [string length $hdr]/2]]
++  append res $hdr
++  append res $body
++}
++
++# Argument $off is an offset into the database image encoded as a hex string
++# in argument $hexdb. This command returns 0 if the offset contains the hex
++# $hexrec, or throws an exception otherwise.
++#
++proc offset_contains_record {off hexdb hexrec} {
++  set n [string length $hexrec]
++  set off [expr $off*2]
++  if { [string compare $hexrec [string range $hexdb $off [expr $off+$n-1]]] } {
++    error "record not found!"
++  }
++  return 0
++}
++
++# This command is the implementation of SQL function "offrec()". The first
++# argument to this is an offset value. The remaining values are used to
++# formulate an SQLite record. If database file test.db does not contain
++# an equivalent record at the specified offset, an exception is thrown.
++# Otherwise, 0 is returned.
++#
++proc offrec {args} {
++  set offset [lindex $args 0]
++  set rec [hexrecord {*}[lrange $args 1 end]]
++  offset_contains_record $offset $::F $rec
++}
++set F [loadhex test.db]
++db func offrec offrec
++
++# Test the sanity of the tests.
++do_execsql_test func6-105 {
++  SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1;
++} {8179}
++do_test func6-106 {
++  set r [hexrecord abc001 1 999 {}]
++  offset_contains_record 8179 $F $r
++} 0
++
++set z100 [string trim [string repeat "0 " 100]]
++
++# Test offsets within table b-tree t1.
+ do_execsql_test func6-110 {
+-  SELECT a, sqlite_offset(d)/4096 + 1,
+-            sqlite_offset(d)%4096 FROM t1
+-   ORDER BY rowid LIMIT 2;
+-} {abc001 2 4084 abc002 2 4069}
++  SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY rowid
++} $z100
++
+ do_execsql_test func6-120 {
+   SELECT a, typeof(sqlite_offset(+a)) FROM t1
+    ORDER BY rowid LIMIT 2;
+ } {abc001 null abc002 null}
++
++# Test offsets within index b-tree t1a.
+ do_execsql_test func6-130 {
+-  SELECT a, sqlite_offset(a)/4096+1, 
+-         sqlite_offset(a)%4096
+-   FROM t1
+-   ORDER BY a LIMIT 2;
+-} {abc001 3 4087 abc002 3 4076}
++  SELECT offrec(sqlite_offset(a), a, rowid) FROM t1 ORDER BY a
++} $z100
++
++# Test offsets within table b-tree t1 with a temp b-tree ORDER BY.
+ do_execsql_test func6-140 {
+-  SELECT a, sqlite_offset(d)/4096+1, 
+-         sqlite_offset(d)%4096
+-   FROM t1
+-   ORDER BY a LIMIT 2;
+-} {abc001 2 4084 abc002 2 4069}
++  SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY a
++} $z100
++
++# Test offsets from both index t1a and table t1 in the same query.
+ do_execsql_test func6-150 {
+-  SELECT a,
+-         sqlite_offset(a)/4096+1, 
+-         sqlite_offset(a)%4096,
+-         sqlite_offset(d)/4096+1, 
+-         sqlite_offset(d)%4096
+-   FROM t1
+-   ORDER BY a LIMIT 2;
+-} {abc001 3 4087 2 4084 abc002 3 4076 2 4069}
+-do_execsql_test func6-160 {
+-  SELECT b,
+-         sqlite_offset(b)/4096+1, 
+-         sqlite_offset(b)%4096,
+-         sqlite_offset(c)/4096+1, 
+-         sqlite_offset(c)%4096,
+-         sqlite_offset(d)/4096+1, 
+-         sqlite_offset(d)%4096
+-   FROM t1
+-   ORDER BY b LIMIT 2;
+-} {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069}
++  SELECT offrec(sqlite_offset(a), a, rowid),
++         offrec(sqlite_offset(d), a, b, c, d)
++  FROM t1 ORDER BY a
++} [concat $z100 $z100]
+ 
++# Test offsets from both index t1bc and table t1 in the same query.
++do_execsql_test func6-160 {
++  SELECT offrec(sqlite_offset(b), b, c, rowid),
++         offrec(sqlite_offset(c), b, c, rowid),
++         offrec(sqlite_offset(d), a, b, c, d)
++  FROM t1
++  ORDER BY b
++} [concat $z100 $z100 $z100]
+ 
++# Test offsets in WITHOUT ROWID table t2.
+ do_execsql_test func6-200 {
+-  SELECT y, sqlite_offset(y)/4096+1,
+-         sqlite_offset(y)%4096
+-   FROM t2
+-   ORDER BY x LIMIT 2;
+-} {1 5 4087 2 5 4076}
++  SELECT offrec( sqlite_offset(y), x, y ) FROM t2 ORDER BY x
++} $z100
+ 
+ finish_test
+--- /test/walro2.test
++++ /test/walro2.test
+@@ -39,6 +39,18 @@
+   }
+ }
+ 
++# Most systems allocate the *-shm file in 32KB trunks. But on UNIX systems
++# for which the getpagesize() call returns greater than 32K, the *-shm
++# file is allocated in page-sized units (since you cannot mmap part of
++# a page). The following code sets variable $MINSHMSZ to the smallest
++# possible *-shm file (i.e. the greater of 32KB and the system page-size).
++#
++do_execsql_test 0.0 {
++  PRAGMA journal_mode = wal;
++  CREATE TABLE t1(x);
++} {wal}
++set MINSHMSZ [file size test.db-shm]
++
+ foreach bZeroShm {0 1} {
+ set TN [expr $bZeroShm+1]
+ do_multiclient_test tn {
+@@ -169,7 +181,7 @@
+   } {a b c d e f g h 1 2}
+   do_test $TN.3.2.2 {
+     list [file size test.db-wal] [file size test.db-shm]
+-  } {0 32768}
++  } [list 0 $MINSHMSZ]
+ 
+   do_test $TN.3.3.0 {
+     code2 { sqlite3 db2 test.db }
+@@ -182,7 +194,7 @@
+     code2 { db2 close }
+     code1 { db close }
+     list [file size test.db-wal] [file size test.db-shm]
+-  } [list [wal_file_size 4 1024] 32768]
++  } [list [wal_file_size 4 1024] $MINSHMSZ]
+   do_test $TN.3.3.1 {
+     code1 { sqlite3 db file:test.db?readonly_shm=1 }
+     sql1 { SELECT * FROM t1 }
+@@ -196,7 +208,7 @@
+     }
+     code2 { db2 close }
+     list [file size test.db-wal] [file size test.db-shm]
+-  } [list [wal_file_size 4 1024] 32768]
++  } [list [wal_file_size 4 1024] $MINSHMSZ]
+   do_test $TN.3.3.3 {
+     sql1 { SELECT * FROM t1 }
+   } {i ii}
diff --git a/dev-db/sqlite/sqlite-3.21.0.ebuild b/dev-db/sqlite/sqlite-3.21.0.ebuild
index 3ffed2d02980..0364ee16f59e 100644
--- a/dev-db/sqlite/sqlite-3.21.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.21.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-db/sqlite/sqlite-3.22.0.ebuild b/dev-db/sqlite/sqlite-3.22.0.ebuild
new file mode 100644
index 000000000000..56d3540d02b4
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.22.0.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
+	!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl:0[${MULTILIB_USEDEP}]
+	)
+	tools? ( app-arch/unzip )"
+
+full_archive() {
+	use tcl || use test || use tools
+}
+
+pkg_setup() {
+	if full_archive; then
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if full_archive; then
+		eapply "${FILESDIR}/${PN}-3.22.0-full_archive-build.patch"
+		eapply "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch"
+		eapply "${FILESDIR}/${PN}-3.22.0-full_archive-tests.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+	else
+		eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
+		eapply -p2 "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch"
+
+		eapply_user
+
+		# Fix AC_CHECK_FUNCS.
+		# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+		sed \
+			-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+			-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+			-i configure.ac || die "sed failed"
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
+
+	options+=(
+		--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
+		--enable-threadsafe
+	)
+	if ! full_archive; then
+		options+=(--disable-static-shell)
+	fi
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support column metadata functions.
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=(--enable-fts5)
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support JSON1 extension.
+	# https://sqlite.org/json1.html
+	append-cppflags -DSQLITE_ENABLE_JSON1
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support scan status functions.
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support Session extension.
+	# https://sqlite.org/sessionintro.html
+	options+=(--enable-session)
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
+	# https://sqlite.org/pragma.html#pragma_function_list
+	# https://sqlite.org/pragma.html#pragma_module_list
+	# https://sqlite.org/pragma.html#pragma_pragma_list
+	append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
+
+	# Support soundex() function.
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# debug USE flag.
+	if full_archive; then
+		options+=($(use_enable debug))
+	else
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# icu USE flag.
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if full_archive; then
+			sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# readline USE flag.
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+	if full_archive && use readline; then
+		options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+	fi
+
+	# secure-delete USE flag.
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	# static-libs USE flag.
+	options+=($(use_enable static-libs static))
+
+	# tcl, test, tools USE flags.
+	if full_archive; then
+		options+=(--enable-tcl)
+	fi
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+		(
+			docinto html
+			dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+		)
+	fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1540493995e4..ec2465436e3f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 74f0cb89d245..df9ee9a6fe0e 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-core-1.9.2.ebuild 3222 BLAKE2B 8cec2ce3c0b6ec51fbb24091dc4d9de9eb879d61031db57297665881e9e30a83ca3c074453198d5a2c43f66b04ec95b575f41d5d3ea0db48155b0283911f1165 SHA512 28718f896d5ea688a8f073ef4c42fa76de5def3f3bc94cc4f34d0bf66fec3469d8050832e501f53aac4c57c4020453b8cb010b9bb2b9db7052841b0804f568d7
+EBUILD ant-core-1.9.2.ebuild 3238 BLAKE2B be308ecc951e791d77c83af9119a4bf10a6ef716f8cc2a2b6a9c25cd63c6172e78111c6b412330b1f66f1030801ba5276de6d50619e9a6b733926b5352ef0688 SHA512 6410f6a3a293b7fe15103c3474940526f6597a059c0e8e29762155da56c0c47df95a2c7a9c84781ea40fa4e551b7baa1db47a6427bc5653ff7f62602eada1864
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 571c56636156..e2696d37d4ba 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.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="5"
@@ -16,7 +16,7 @@ MY_P="apache-ant-${PV}"
 
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
 HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 7a6233c32b69..6efb1b40b8f3 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -9,5 +9,5 @@ EBUILD protobuf-java-3.0.2.ebuild 2150 BLAKE2B 0cd4177700cbe9a7850bffb6dc6c4c224
 EBUILD protobuf-java-3.1.0.ebuild 2147 BLAKE2B 51dd234d7873b295094ab1910a66d6be1db1b64e67680ad3abaca224d4b87eb5043afd4f080d06a7a7fe4dec15f2a46f81d6d26ab547bb83e342bc012ecca840 SHA512 fdec0f920fd80526440ea4909b8fcea86fec0d56f4ca8f5773d3d8747b49e747f7836c1714036a9815402af9f19f46581ed8332266baf93e8e9cef87258a4b87
 EBUILD protobuf-java-3.3.0.ebuild 2153 BLAKE2B 0d7fdf2a46cbfc78402339259d879952f92f6ade17667197040970b35d4f9b3e5f3d49c17d7d8d7d5a7c1a5006ba2f23774f815b86a6e8fb9abebff68246381b SHA512 1895a3f22215ce2cf3c57fcdc94375f3e18801499ff51ca1374ff2af15b821e8207b3c50267b4f9748aca5ddb85106c087e692120a2bec3e7c315f5ae942ddb2
 EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
-EBUILD protobuf-java-3.5.1.1.ebuild 2094 BLAKE2B 58eb9f337ed72da262022d6dd355b25c2b80f929d298d04a19aaffd7809316a9877d64059a121dbf089b09f72880c44bad83bf0a1ead0bcc1f13f4f247862e47 SHA512 eaf689739387102fc9aeed2a5a72bcce3c65181b55a088972c6f11dabcce1357e2d5c7c61e9e350b664b894973e7418cd434cca00710f45bb98d15559b27da2f
-MISC metadata.xml 755 BLAKE2B c3d064a14c826e53ec4646734899d9f2d0b432c8a72c18f89760cd9fba4736512537f87198af1e51fab110afe74e09fa0062a5dd640e74282222c4e4a13f4964 SHA512 499f0c3c8c1a10a50277519ac7cbba5c849ebdcffaaf2dc9a7dcb9bd34f48b98fcbe7409727764471857bb5f6039b9cedde6a9e7ba0950b9898cdd3be06faab4
+EBUILD protobuf-java-3.5.1.1.ebuild 2093 BLAKE2B 4b0155f489f9c36da98f403bd6edbd6e0b20ed2cbd42e792cb657da252fe431ccb6911fd4f782959fac0891fdf15dca89cf4802701df04a61ea72dd67f912acd SHA512 700622c8a9ae3dd62761e101c5e6cd7d29d1ce11fce7397fbef651a02af3f89ba4fd1a654ad18b8a01e8f65f1dfd80a1be92d3cc89c63b5a8537c9115ced9856
+MISC metadata.xml 885 BLAKE2B 3499382ddb2b4c8c085bc6f8e233f09697845ea8e61195185fde7a6665be40688472d7cbfad617dfee794b7c80ac2e1b9416fbc0b005721badaccead97a546c6 SHA512 ed6b1840c7ee5033dfaaff14c7bf8688ae1712b7e1f38c10e181ae789c14d406219e764793b9e370e6557283437166aefa5c78a0725a7c17ff0e78296047c748
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 91ba87d8d702..76ef3585d3ad 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
+<maintainer type="person">
+	<email>arfrever.fta@gmail.com</email>
+	<name>Arfrever Frehtes Taifersar Arahesis</name>
+</maintainer>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
 	<name>Gentoo Java Project</name>
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
index 0db08537169d..6231169c0083 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.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"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e4318132fdfa..45ba5d6a4c4e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,30 +12,32 @@ DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b5
 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-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
+DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
 EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1408 BLAKE2B e85fb32e1837f8118fbd06ffafaa9fb4facbc0137d6d12689ec230c4e038e502d1ddd4b843b8db3c0d5a0aa0721ff4ea73a0c3ba6db643b30e1e5cf472bf3b59 SHA512 c40b0a1b9986b2a83ababe7cfee1b86da05ffbb00fc101771bdb8a90253fd57d7f80229fe833b3b259ad0388ec7bb06d393c9e1733f9113d9b3dd42a3bc70ae8
-EBUILD tomcat-servlet-api-5.5.34.ebuild 1422 BLAKE2B 673107f8696d92bed774b2ed0fbfdcc044b981a0646ef05de3f0a40b8e52865be4134049ff943cd9c1d179d1b90dfa6e6ebd6863baaee5ea351316cf0fe5bdea SHA512 1fb8fb2127817da2a6b7a3f324d57098f27dfd902538b66d7509f7bbb11c043e8e8ec3d528822e21e0780053a8276f6b0bf1d2e329f86752c923845a914b5a27
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1421 BLAKE2B f8216cf7b3933757f8d0f1a906d6704acd133b4bc3acee4b064b2189327580f06160178e85221a134ec8a66c7b6c19ba87b55f2b7602dfc0b3759ef877c10fb5 SHA512 e34b2993c265d5340c7c48df3cf1f347601e5c8426a20086141c38ed2e80de0679d671c834b25b873e69ea328490bb1427ce320ecffeb607d383c6708e4805a0
 EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 BLAKE2B 4c535b70c79c97db06b483d23cba3d8a1a7b81700caf60a76e9340f09ee695180c67faef8eb97b4748cfb5fcdc10dca4409f052eba0e23065033081ef7c76024 SHA512 13d4039bdaacdc91a678d67592ff6bbb407fe56955122bb8a7a5ad9368e1b848dedc14b57e0b5f9b7d583b64e553ea862d2e87e53cfbe5fe01edb394f4707dc9
 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-6.0.53.ebuild 965 BLAKE2B 79ee853118429bd20b1c08f260865f01ae250e1c2ce67c4a48b31f8d5e4dd5711ec68acdd07b127a900014ecfa77a1a75bd02345c66cbc5744e1f1b535bc6990 SHA512 2ab89d11d3b6eaaeaf677e48cbae4d09e313dfac63ac9296d5a3ad3e37a93f23a548c06d3cc5fb79da73e83d32f5fd5a6c9eec899aaea36ec90873993d8d3f3c
 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.48.ebuild 986 BLAKE2B f326eedb07b5048e2e6b0231fcf98dbfe00d2b7a6de0892e6ab30be25b74d758a389892d74897cf8f59749ec77b3f6e68fa3a0721a428e991846e4b49335727f SHA512 477f040dbdca1c4503f94b0e2cdb16e2910d117ccdf473751c3af0670525db08f004beeffeb7b12c7cfcf8d603e0ffdf3ef0323e2e0632d8253e7dc99fda1292
 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.24.ebuild 1034 BLAKE2B 56a3a1d3f53d267dbfa60bd5f87ea5b1ca9c0e48fc500592c8be4324f9a2c3b41e9e2a32c6c1507f64559fddffee8dcb1afe86bd2ae8607add8cd2e618d4ec09 SHA512 18f7cbbcad7c7d36b101d76b136040a54ff5a3c3bb6d12de1e555cfbd9cf590fa5a9a2b6c99a66912324ca45fb36d367628b8dd302b2b5517281a6c09e6bd863
 EBUILD tomcat-servlet-api-8.5.27.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
+EBUILD tomcat-servlet-api-8.5.28.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
 EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
+EBUILD tomcat-servlet-api-9.0.5.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-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index c4969b6bf64e..092400c6f849 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.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
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
index 26121ea67adf..ef08f2239026 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.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="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
deleted file mode 100644
index c987d5ccd920..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 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.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
index 4dfe83e0e403..776cd13fd833 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.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="5"
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
index 4fcff024f711..dd1e671df369 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.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"
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
new file mode 100644
index 000000000000..ee8c1d72fb55
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.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-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
new file mode 100644
index 000000000000..16548ef959d5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.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-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+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-lang/Manifest.gz b/dev-lang/Manifest.gz
index 65e1c9fff124..48fbe93c117e 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 077949c64e78..3fe3782d4f4e 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -23,7 +23,7 @@ DIST otp_src_20.1.tar.gz 87342296 BLAKE2B 21f93369bc4fe082e3cdc6849463cb638ac8c5
 DIST otp_src_20.2.tar.gz 87136848 BLAKE2B f83e652320b67b72cf42be3c23a9251806096fea4e255f73c8170bcb61ea1e008983f1da1c9dc7b46b76e1fd0d96f94097f5d629eb28c08eb424bb1e7a1cee28 SHA512 6c2cbef9fa67f4aa9d0c22bedf87f39b0067994614663afee88c57bb7789eec45cb1970dcbd930d163a27293b8d24b20a90cf6ed30ff1a14492a9ccdd5b59a65
 EBUILD erlang-18.3.ebuild 4587 BLAKE2B 58e0ac86aa7bba8cddb0a12423e902de3c3756cfa1bb13348315ec2d022e55b6635f700dde91adfc35324a6ecfba4b680119dd6e4bd475b9089a6d4461be9672 SHA512 e66b473b6bb3b9274f6610ad30fd47b03337a805ec00afbdc5f0620fb74bc39e0a1650ea719d67ea07ffd6532beb94f6bff980570546e0f625158220876400dc
 EBUILD erlang-19.1.ebuild 4482 BLAKE2B 36a4249649473f50cce66f542c98dbefee41a56d57bd6327f911e6137d5d9bd5fc0656e3f5770f804ae425d428739530be8395a078cc6d930e6c4df2e44edc90 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60
-EBUILD erlang-19.3.ebuild 4537 BLAKE2B 9770980bc233dd3ff2389aa18beba32540f5d245744d4c1835db026ff418a4e9957fc0b2b4fbac239792e5256a9f283c5738442a68be21545fa98718b62e7bbb SHA512 d37ffa83bbf65ff9a6b7a63157962e3f522df350172e7123c3d94c46d21b050c1de75f930c5389136eb8bef204d2649675dbbccbfe3c490d16da720b4484198e
+EBUILD erlang-19.3.ebuild 4536 BLAKE2B 7c5b8f36fc62ded99b29c13e58ba6f43f2ea70353a4ef0bc86ddc73157b54d2da4ce70f92ce05774ddde4a8c56d92043924733f5fa43039eec392f33429c1cdc SHA512 b15b80ee7667dd6ac818eb25e31aa561da15532297ec35c83bb24f8b88df1edd80b05125eef94dbf9b8b89ce728436924983e43361ff5f63c6ee03a8dbc28609
 EBUILD erlang-20.0.ebuild 4538 BLAKE2B cd6f780cd2674c710e12d9ecc2c82881fe729ba54369401af69306a79eeebba4f7c06a6d78af3d44925f118a3f46a89bcecdfaa3dee92ec990791dcf565c5062 SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa
 EBUILD erlang-20.1.ebuild 4538 BLAKE2B cd6f780cd2674c710e12d9ecc2c82881fe729ba54369401af69306a79eeebba4f7c06a6d78af3d44925f118a3f46a89bcecdfaa3dee92ec990791dcf565c5062 SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa
 EBUILD erlang-20.2.ebuild 4586 BLAKE2B e3eed51b916285c87e212446047d07d47492410580464a2c800642be36426848f859573387204afd7ab67d72bbfaefec4189b973525f23829bed9f7a365d436b SHA512 80d5567d6233c7d9fcd53ca64814dd8cf188094decc6f8708563c22bef77b0b85bd23623df825f085f738547bf64b68fdde160b2ca9389b743a2c56259bf37b6
diff --git a/dev-lang/erlang/erlang-19.3.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index 47bbeaf58023..444f67675404 100644
--- a/dev-lang/erlang/erlang-19.3.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 REQUIRED_USE="dirty-schedulers? ( smp )" #621610
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 15cc3294da84..716965abefc4 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,8 +12,10 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59
 DIST go1.9.1.src.tar.gz 16377700 BLAKE2B 63558227bdbff43da788c43e082e54dfa0210e53de650b3e2a4ab09c55a9937a0d1fee66be8263653c2d8be774611f2485c7e673b8a5fbc7f7c0adc5fd4fdc1f SHA512 3c5d11089a54c61acd1a4fad9618ddb2058cc783a54564407ee50e37c864deaadfd5effeab623080c136a599096f448aae091ef41d0afca1abfcdb98adf4a793
 DIST go1.9.2.src.tar.gz 16383591 BLAKE2B 3ad9d0e7b6b817a4eab7ffcca30ba86a0e50e68ed028b11f54b8813f4b1a9a0598c79d501c733e7fbf77831c8f7df681692f9aa6b860b16a6288dcab59d40226 SHA512 1034098575c317eeaf648629690a4dea0c479a69c3b80d9917f6b96c8781ce79c0f29859f667dc4e07d47a44972aa09bd0163a458f897cf45f9d09eb03e4abb5
 DIST go1.9.3.src.tar.gz 16385451 BLAKE2B 0d16eba4d411a5ddb1915a305725e9762874568abb048cc5c8939e82481d7d530902d532b62c8fe10fe7e31465617171d17cb5aaf3ee51aa29b9a66837bf6874 SHA512 31c564af58b78c648c9bece8fa2ed3334feb80316b07b16f6286319e26d317da90d1af0464c3a2f776a3da72d31b22b063dbc620b93114bf142a11e8a625e527
+DIST go1.9.4.src.tar.gz 16392325 BLAKE2B c5a503e8c539f31a1bbef9c6d89263b7214fb433476830c205153aa07ee0debc273eb004dddd662f81cc6cd2d4d949af654a4f4db1c890530feadc90ce05e630 SHA512 1a7c830e07507ff7b89025adfb5c713444d97301f8ad47ef2564722c1e28186e946350f07e22777fbdd6f2f589c334eb01dfd589e97cb8a86f73669547badb0b
 EBUILD go-1.9.1.ebuild 5581 BLAKE2B ad0fc38ca45942e4047137143513d7ce9c8a473278dca5b941b377e0454407d2878e625854448d3898cf5f3f9c4fc37a5e43f84d3e1c8e79da055dfecc0651dc SHA512 f45cfc64b0671b7089cf6e802b4963598e3c47b338ebf8ee6f741ddc4979ba1fe3306d7ef02e7625af2b4b8c4108e8b6ec8f820a2ba75560d04a4c37960d4997
 EBUILD go-1.9.2.ebuild 5581 BLAKE2B 9f6401701cb5a0d81919f3105b52606e93b6c5b7b2dce7d7e5831c5aa2b7eb33fb6ef719b7007bddd64f275d2b9dd71493551ed1f13910744e2286ea1e85832d SHA512 c52898e89d3bd46bb409aca12b6a839aaa4f884ab59b5f1a0bba4761804a89f2d3de7f65e3a9e6d97f2abf7b925540e3f54f12e86eb6952419cda0e045a13028
 EBUILD go-1.9.3.ebuild 5584 BLAKE2B 235e48cd961466acd6fa167d10425588aba877b407f5b0abaeae2b69df440c528e7a6f217ea0d7d677d119be740523bf874aff9655e4f59704fade25d25fed84 SHA512 3794c681a1dccdcd4d644265b303a3f5b272d548694a3a07f1352133f1a7d918518a5c6165980e5a51828228a6740121a36cf1f5dcd399c974cb27b4b12728e4
+EBUILD go-1.9.4.ebuild 5582 BLAKE2B 6a7be60c188e532ab80cb1c27b99b936bef472aa6fda0ccf8fa83abbcbef9e4829e1401283f96fa22d21758884d1ef73203f186a1954c28ff3a8fc39dbbb6409 SHA512 5557757a7121bc35e09bdd2f6f6d68f9d8a7b38add4633c020c26930104fc34c33a6a090b1a2bb100202e63fd70500196b900e4e7e3ef44034e901ae57d83ea3
 EBUILD go-9999.ebuild 5584 BLAKE2B 61972a420ecaceb45bd90c22c57e4b297766f018b9d6c9acd17add96e70c4c5a43d415e25f726151558d043ae6d1c4d6cee880cc2601ee289f9942e2dce431f9 SHA512 9b009525bda054f8451d1a202a7dfd7087de6e9d57633f7a8c9c74bdae6407e420237a0c80c58e5650c5beb9c01cef29052ec8e182129f23d2cbcbbdf2efbed7
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.9.4.ebuild b/dev-lang/go/go-1.9.4.ebuild
new file mode 100644
index 000000000000..9b087eab782f
--- /dev/null
+++ b/dev-lang/go/go-1.9.4.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index cec284b25af4..cbc3112edf5f 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -4,11 +4,13 @@ DIST MoarVM-2017.09.1.tar.gz 4579930 BLAKE2B 5c09f468338b23208ae8d5a331b2b4dbaee
 DIST MoarVM-2017.10.tar.gz 4789334 BLAKE2B 842ee5040d64b8398a24436c34f673b7b43cfa7cdfb809d05705742e7c20ea9fa7426c0183ceaf0c3e6f8a06d5262bc632160d7bfbd9143492f1ea46e1cb6381 SHA512 f79e60b22615cbbb5b16d4b810c864f7cbc2c36e73769b132b84edb03e0d975da6f7db153492a3101c86946d728a21af6225d61e752e36557c2c6f1bcd91859c
 DIST MoarVM-2017.11.tar.gz 4797567 BLAKE2B a8178c4b639b8e6876fe2d904ebb8a3cd34f5f04d5f6092ce8fa65383c88f4af7ae72ded46981b556573439cdc32131fe569e9bd3c163f316574c1ac037dc583 SHA512 93666c66835701b4a7bb25478c1e5a8019362ad0de387f58eb921fa35230566149906386ae1f8280a163d94a86544d4441029812ad177b62a21d64b2638e01d3
 DIST MoarVM-2017.12.1.tar.gz 4761355 BLAKE2B 91426378e5a651c56bd6871a044733e3efb587a3c743385d07f3ff5f4de4682780b69dca130d149deef3192ea16d69a4665f57e5620bbee237fb70a6d3e9433e SHA512 aaa57fdf5b65bf0148e4409d044ff28b0755bba7a663046f99f4be55f5a0f466e76a883445da39e2c79cc7f76b27455fe775686a19204866bc8c1569008e2c37
+DIST MoarVM-2018.01.tar.gz 4762110 BLAKE2B 643fc082ec1ba9b79bb5d0c13e66703850b75673a73e659fc8b2400cbb0d986b1882b7d23721a77773891649d709328ace1023d50d4ffacae5d75091a8976912 SHA512 2e558c92562096596992e6e0070092481e5a5d25ac3047110d023536deebc9a4db21d9844ecf3b7c0ae5cc6fa529cc48d9a8e98cdc2f5e23a8effc37b7509ef9
 EBUILD moarvm-2017.07.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
 EBUILD moarvm-2017.08.1.ebuild 1426 BLAKE2B 314a707b0a9e3a6498a9ceb2311c5a87134b3edfc4ace686279d57bdf9dbeb151b4bfe2dd7a9971409c21ba43cab4ca1175c6ebe207e1cad966cee1792354fa2 SHA512 cf0f2f323900463ad479168d743d0a3a2a71615fad66cee346fb8d2db5246cdcb0db1397cbdf5abfdec6677bdc032b0842c2dec9f144cf36e8619b0232644fd9
 EBUILD moarvm-2017.09.1.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
 EBUILD moarvm-2017.10.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
 EBUILD moarvm-2017.11.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
 EBUILD moarvm-2017.12.1.ebuild 1364 BLAKE2B 1b219150b6093edc5452ff2f7294af49fb4378c305115c882444768c3cdbfb82de7b2a2151fc88f41641ee0094ea5158d78776b271d51b40a37978b1ee2c11db SHA512 f8ef6139b8940e3d10b378df80331088866723343f094b7b9772fb45ab203d2dc4499974c614269790831057c953a9d1804dcb9c160d740c68d6a14f316f7795
+EBUILD moarvm-2018.01.ebuild 1364 BLAKE2B 1b219150b6093edc5452ff2f7294af49fb4378c305115c882444768c3cdbfb82de7b2a2151fc88f41641ee0094ea5158d78776b271d51b40a37978b1ee2c11db SHA512 f8ef6139b8940e3d10b378df80331088866723343f094b7b9772fb45ab203d2dc4499974c614269790831057c953a9d1804dcb9c160d740c68d6a14f316f7795
 EBUILD moarvm-9999.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
 MISC metadata.xml 1033 BLAKE2B ab51966874191d7f6d2638766477e3688d68cd91c40231d22232801186d142b693d3668fe4a08baa41d7f7ea6783cc7a47fd1ead7610249f80d8054740fa0fd8 SHA512 a0b21dacbdbf3d269e575ca18127e9d512bf2f23f71dcc8ba8b1e4f54c1274a5e37c1e3c609e78e11fdab7100523cc11420e20d088f531794c7f3f96a42432ac
diff --git a/dev-lang/moarvm/moarvm-2018.01.ebuild b/dev-lang/moarvm/moarvm-2018.01.ebuild
new file mode 100644
index 000000000000..405febb3308d
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2018.01.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		dev-libs/libuv
+		dev-lang/lua:0[deprecated]
+		dev-lua/LuaBitOp
+		virtual/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	use doc && DOCS+=( docs/* )
+	local myconfigargs=(
+		"--prefix=/usr"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir=$(get_libdir)"
+		"--compiler=$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+	use optimize && filter-flags '-O*'
+
+	perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 5ad3deb55edd..4f7e3dd3a000 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -4,11 +4,13 @@ DIST nqp-2017.09.tar.gz 3724208 BLAKE2B bcb1c8eb18d09945949100e077e753e3a4dc48e4
 DIST nqp-2017.10.tar.gz 3768260 BLAKE2B 3058235d81948383429f7fa8ec5a1ceca098192051be176b82a17213da9eba0ee17995524ec267c945baee4f69b3afe7f0ca3ac74af6eec8b1fbb5872d467530 SHA512 fd43e1f7d768de58aae98afc031ad5fa5d28e767bac4f4acf913b356c107035c98c6551ad34f17f7a7a76269f96905882e348e5f821d7edf2cf7ffbee50798bc
 DIST nqp-2017.11.tar.gz 3771211 BLAKE2B 816c521b0722479d385fc00511fc1f6b5472c03ad21a58f4dca9b61f5675b240d9aad2f1bb0e50de9c76d9da396f21d92adcdbad113aba5c112b26d427d2053a SHA512 913b287e7a6a36ee618c10958fa5d521c8e35202784bfde4353ae0704e5af5915249cfcb36fe3de96fafe890eaa571545d6142ce99f07eadb1fd34929ee95524
 DIST nqp-2017.12.tar.gz 3795477 BLAKE2B cf50ec801ac2d7e30588a2c7d1109d5d360deab4e51fe329c78a681cc5cfb418532faed82aa4eeb8eeded409913baacb9204273b305831f7d50fb587c08fb5cc SHA512 0255747ab1719c5a1b084cdb47d2c3fc08bc6ac2f081e67297c7b72e723ce7c3ecf3c51d096cb9e0d370e8907ea8b233c03a3d484dd16d1feef5db3cb1138137
+DIST nqp-2018.01.tar.gz 3798898 BLAKE2B 5dc492bc5561a674d3faabb63c881ad97bff3528bc3f8bd75caa7f2e78aa4464849f326c611936106c6f14ca56f4de5f4575407ab134d4218409829c22885b3a SHA512 0bfec280ed2c70bbf25b274632e830838526fef1e8f8c08387b1e79e1ef739dfaafe67dbab17eb24cf33c1b2aa984029dc0740fcc43e463e92f908dfb2360249
 EBUILD nqp-2017.07.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.08.ebuild 3611 BLAKE2B 8ad194ebd4d744affa19df84d800637d5a486cd8b9f87be496d1328d80a62ccf82f78a5567775e3e6a7eeeef9f8abbc16f5143c5ae49eff12988b3a40d727568 SHA512 42f9651aa22042a571e77c13c9e5b46402cc4ff7cc71579daca171cecee7c7250eab476825693a5921e1edd66f44987b9bc096e046e570037ab2144fceab01b3
 EBUILD nqp-2017.09.ebuild 3611 BLAKE2B acd8500829423373c89bfafa1389f5559494d2fa6abfdffd0881924cbda52364c4dbbdf742a1b591512fa689e799e2b360d1e1725562020f1e4e2026b376a750 SHA512 8271504114f3dca61e290006077957063d624b8a967c0c67a8b32fb28e217e5ccc895f1d63d4a95fc10e491962b86fd70ba7a420643a988788da2f30bb032edc
 EBUILD nqp-2017.10.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.11.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.12.ebuild 3609 BLAKE2B 795b4e2004593fff7df1cd1348862e4bed63110c84ffc95d055d0940b60330ba6f421a46681c885e5d4802e512f55c9a555d46ef73ad6448fe327514857fbc77 SHA512 6246e11f2c71d5f438313f3594f8659ea6d88631ee6e3d03079a5b985be3630465dcd46aabec11c7a49f22a77f1148dde4cf59352c6703f7036942bb55877e69
+EBUILD nqp-2018.01.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
 EBUILD nqp-9999.ebuild 3607 BLAKE2B f4c87264d989c591b3ae834e455b7bb84d14bffdf667a553ae5709d4a2340eb9450331f6077956460c94095f211dd7af33431e6c6fc8bec7f19bec7555c86e4e SHA512 c0be49582eb04c3a80b4a9191ee121018adb177fbd379083231c9157eb8fb051d447f0e1c5a05214f40d52c30fabedb7d2a72dfca7625239822f1a6119dba68e
 MISC metadata.xml 747 BLAKE2B b635e6983ae4f77695acc0c8770d252d5d60dbb2aa8650002e68e768051f67251177ad760573c4c842b6ab297ee1ac68d1c01151dc599873e6a3a751b8d25a03 SHA512 b86ede9a0dc7587f24308ceb470666aeabf7cd96f2da4afe05195a2b74c1836826ddf269a6ed00f0bfb190c9b241a4d500940afa9060913b8f724989b20a68e2
diff --git a/dev-lang/nqp/nqp-2018.01.ebuild b/dev-lang/nqp/nqp-2018.01.ebuild
new file mode 100644
index 000000000000..558b645a275b
--- /dev/null
+++ b/dev-lang/nqp/nqp-2018.01.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 8d79c7b3d6f6..8775bb943cfe 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -5,11 +5,13 @@ DIST rakudo-2017.09.tar.gz 3006759 BLAKE2B 22df3775aed16bf404a2f1bf716c22989c7cd
 DIST rakudo-2017.10.tar.gz 3049348 BLAKE2B 7e017635a6807d25b0c62c312db5c86199cca1f7d405b7a55b09cfdff922e67b63df66cafd547bc555c4adaf146a8cb2eeb8de5110e844042721f24e4efe9e95 SHA512 f3832a5dcd0048a7d9018c46e8430245b3d6565516d61f4dc57ff06d5dbf38afab7b9a4791a0f88ef4422899418f3ce550e5271cef668ab74804f898c8c5faaa
 DIST rakudo-2017.11.tar.gz 3063336 BLAKE2B 781c2359c93e25e1a0429ea509923b0ca76a6a7a2e7d467ff9fc08eb4cfd915ef37641242db9cf92c725b74938b4555f111f4ccdd2af75b46450767f58517994 SHA512 6cb36938e1d395e5271939fed69fb0e2ebfccbf738a7d2cfef620853dfbc157efad4aa802f3c3fcf5d232c291ae0ab21f5bb65c7a17d8a5857c143e7e8976fc3
 DIST rakudo-2017.12.tar.gz 3076450 BLAKE2B b97fa774a307486d7af830478d031cef64f3d4ae95192c8d99f1247e349ebccc83dfd3e864d3c829722b9388d6c9ca667ef55f42c8df86cba10278ff9affbc23 SHA512 0c7870ea90bc219cc27c4ea6130ef6e46172d0cd8da3d0b49dc8c8585cddc87a004dfa945075254a6bca3005d7bc68f181c79e229084f97e532ad086c512bf44
+DIST rakudo-2018.01.tar.gz 3089785 BLAKE2B 6e74c17b44e489a5a1a60f177290962eac752ad5750dd5d6e64e5a9264d8b6ba7dfe4234087a1b1cbebd3933376b83dd305c3bd255ad39bc81b9c99b8e51b303 SHA512 5030089265f7c4d0bde663eb1d26a0e40ddc9b1dedfd7a350a2238f5136f08abb986d2568c05efe031248ecacdd19888be6e08b954bbeedc03e769d3016b17ea
 EBUILD rakudo-2017.07.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.08.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.09.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.10.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.11.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.12.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
+EBUILD rakudo-2018.01.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
 EBUILD rakudo-9999.ebuild 1714 BLAKE2B e74244497b591e490e774d82492e16c05e61546cc7071a776d7002e22f32608f138456423edab6c7aabde9dd6c84b414c42343c4dcf45725a8ae021b5eb1d5c0 SHA512 06451f51ced45674984aada066a94a268bafdb858172330a041b47196c2caae91af4263cee68171f34a8f89933f59b5517d54c456ff24a2b7e76b61e238bf56d
 MISC metadata.xml 626 BLAKE2B a4703502a1adeec04aa03fabc5b093138866102fc4b21fcca60730671d29b3f1eb48afce5f7bbcbbf31d06d5af557e03f0cf20f9f6fcbacef172d7970ceb5d8d SHA512 8ab071e74418a4782cf11c870bda3dda2656c0e1961e05edcde9776f4ad1eb18a07af9f2dc3fdfd5970f3d51f63bd342956c0afbfb79ccdd7f6e9d30403824b8
diff --git a/dev-lang/rakudo/rakudo-2018.01.ebuild b/dev-lang/rakudo/rakudo-2018.01.ebuild
new file mode 100644
index 000000000000..b442d4008798
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2018.01.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fd163d574600..3cd240b4127c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 69ecf805daa5..24f3efbeb69b 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,17 +1,10 @@
 AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c
-AUX boost-1.48.0-disable_libboost_python3.patch 1513 BLAKE2B fd0f5d8d3ff67861725e18b10a7191025b5f0cf242dbf38a44896d5b305268d6e585f093077b2e9a6ae9e13b7b94a01e387f7858215fbe78b127f84f6a8d8de7 SHA512 9a2b189530af9fa149203f0621b171461f11212306aeb4d94075a2896ed97abb12d47e6bc0429814405829244604044c2101ad34686a10b12ebe3536b2289ed7
-AUX boost-1.48.0-no_strict_aliasing_python2.patch 745 BLAKE2B 204ab844356219e90c80bcd0824090672ebe90ea95b79c5dd94d2759a1a522d1b6fa487fce1c991439848cf5581a85bfb8eca6a79150b78aa703bba8efc06993 SHA512 ad4c7b8ec59154e2e9588b72a23453f4dc915eecc87a065b10eccc6f713e4a55270f0766bad7766c53dfb934e4d94a25d006567c9e18d0e7dc32649f5a601296
-AUX boost-1.48.0-python_linking.patch 1282 BLAKE2B 06365a2fc9348829d673aa06756adbb0681af062bac8ea1a569f54a20c6680630d4d2cb38d7a152a1ff14d7795fb3373310a6da32c01c6a3f745c110fa5aae4b SHA512 9aff888908476107bde818f306fafd855408d214dd13abd3406339b911ba3c56a7a76ac2a549c63be16ba73a86275860fc1bf78c2fd976c872772b4199ecedb6
-AUX boost-1.51.0-respect_python-buildid.patch 1577 BLAKE2B 0db82775912e88d84bfbf152912db4754e42bf17c954e4b505d3ce796bd3883c589902570f0c6762d073c7827e044e2d3b174329f7f8dd132cf46fadc069a1c8 SHA512 bbe7e586a95c615d51612bf0404c07179b07c33a33e67957af5056ff80f44c620f81244d7fe30519f08f2d19e1d87f8fa09fa32c7f5d37f6f13de4590c050731
-AUX boost-1.51.0-support_dots_in_python-buildid.patch 617 BLAKE2B 1e95323dacd3c351bfa5a7c2d92a358e3068439fba12e01fc8889b4f3d607cd8640f2d2547f2fa1453a04f972022a47a70b11066ff7632a89dd976428085235e SHA512 667452299f96ac3008340f901c6a5355956676b10f82134e650f8c8e06e7c6f8814c2b92d07e958c31b11e013601c0b3ad4020cdc35bbd558761fcd33bb68b3c
 AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73
 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
 AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
 AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
-DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
 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.62.0-r1.ebuild 12501 BLAKE2B 2eec65f9186d5d411aaa67475810871777bde06316f7c36b44437cfe2e2a68bb7cc867f63745ee3abb4bad3c8db3efa228adbb65035546b3796e19b2d973e859 SHA512 3294c7dfbdd1a414cf910edd38882c57e97b670b844d18cb547887ff1b3d74c7ac09ae74a4a1e5c10d1a8be58cd7b9292e82752342a33f7a5c6c525ac0bac072
 EBUILD boost-1.63.0.ebuild 12465 BLAKE2B e04262f3f3a40a0cdf877c2e5c3b76356bfcd20a0140dc0b8e3e6f0e9978e020a62438e0413972064c56d3813ee2fe040ef6a0a514fc2798e0249ac896a6a956 SHA512 14f708e886a954d83b9e7d5e3a7b3b4dfce6345631fce38b2f18ba4f51468c8ceb692430a6cebf36443979e4880653d72c144b5b240415c4e59f02d82d66dc93
 EBUILD boost-1.65.0.ebuild 12446 BLAKE2B c8c22809a2ba6d496f1d3985f9f102083e4cf196a127900002443a26eb38a9e4cc761f26e7d3d9327435924bbf034a8a5d725549fd127731ed16d7ba5e9aa5e1 SHA512 9db27a7d0f96e7112360d70eaf19f1596b7d80099e2eaf3115f8e082763f087410b80973c7348a60aa0ee93a0989b82252c7923c6f479b5f74c210cde51f00aa
 MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild
deleted file mode 100644
index 7ee2ada110df..000000000000
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild
+++ /dev/null
@@ -1,444 +0,0 @@
-# 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} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="hppa"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch"
-	"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch"
-	"${FILESDIR}/${PN}-1.48.0-python_linking.patch"
-	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
-	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		# boost expects libpython$(pyver) and doesn't allow overrides
-		# and the build system is so creepy that it's easier just to
-		# provide a symlink (linker's going to use SONAME anyway)
-		# TODO: replace it with proper override one day
-		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts=(
-		"--user-config=${BOOST_ROOT}/user-config.jam"
-		"$@"
-	)
-	echo b2 "${b2_opts[@]}"
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-
-	use icu && OPTIONS+=(
-			"-sICU_PATH=${EPREFIX}/usr"
-		)
-	use icu || OPTIONS+=(
-			--disable-icu
-			boost.locale.icu=off
-		)
-	use mpi || OPTIONS+=(
-			--without-mpi
-		)
-	use nls || OPTIONS+=(
-			--without-locale
-		)
-	use context || OPTIONS+=(
-			--without-context
-			--without-coroutine
-			--without-coroutine2
-			--without-fiber
-		)
-	use threads || OPTIONS+=(
-			--without-thread
-		)
-
-	OPTIONS+=(
-		pch=off
-		--boost-build="${EPREFIX}"/usr/share/boost-build
-		--prefix="${ED%/}/usr"
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-	)
-
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
-			-sNO_BZIP2=1
-		)
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED%/}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED%/}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED%/}"/usr/include/boost/context || die
-		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED%/}/usr/include" \
-			--libdir="${ED%/}/usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED%/}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
deleted file mode 100644
index d4560400d7d5..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -39,23 +39,6 @@
-     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
--
--rule find-py3-version
--{
--    local versions = [ feature.values python ] ;
--    local py3ver ;
--    for local v in $(versions)
--    {
--        if $(v) >= 3.0
--        {
--            py3ver = $(v) ;
--        }
--    }
--    return $(py3ver) ;
--}
--
--py3-version = [ find-py3-version ] ;
--
- project boost/python
-   : source-location ../src
-   : requirements
-@@ -82,7 +65,7 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
--rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
- 
-     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-@@ -91,7 +74,7 @@
-     {
-         python2 = true ;
-     }
--    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -148,7 +131,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
-         :   # default build
-             <link>shared
-         :   # usage requirements
-@@ -160,9 +142,3 @@
- 
- lib_boost_python ;
- boost-install boost_python ;
--
--if $(py3-version)
--{
--    lib_boost_python yes ;
--    boost-install boost_python3 ;
--}
diff --git a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
deleted file mode 100644
index cb26792f99c9..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -85,6 +85,12 @@
- rule lib_boost_python ( is-py3 ? )
- {
- 
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
-     lib [ cond $(is-py3) : boost_python3 : boost_python ]
-         : # sources
-         numeric.cpp
-@@ -119,6 +125,7 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
-             # On Windows, all code using Python has to link to the Python
-             # import library.
diff --git a/dev-libs/boost/files/boost-1.48.0-python_linking.patch b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
deleted file mode 100644
index 330cbb11e885..000000000000
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -109,20 +109,7 @@
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
--          
--            # On Windows, all code using Python has to link to the Python
--            # import library.
--            #
--            # On *nix we never link libboost_python to libpython.  When
--            # extending Python, all Python symbols are provided by the
--            # Python interpreter executable.  When embedding Python, the
--            # client executable is expected to explicitly link to
--            # /python//python (the target representing libpython) itself.
--            #
--            # python_for_extensions is a target defined by Boost.Build to
--            # provide the Python include paths, and on Windows, the Python
--            # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
diff --git a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
deleted file mode 100644
index 17a681611b6f..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/6286
-
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -99,13 +99,6 @@
-     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
- }
- 
--# Python build id (for Python libraries only).
--python-id = [ option.get "python-buildid" ] ;
--if $(python-id)
--{
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
--}
--
- 
- ################################################################################
- #
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -8,6 +8,8 @@
- #  Authors: Douglas Gregor
- #           Andrew Lumsdaine
- 
-+import option ;
-+import regex ;
- import mpi ;
- import indirect ;
- import python ;
-@@ -24,6 +26,13 @@
-     <tag>@$(__name__).tag
-   ;
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -2,6 +2,8 @@
- # Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+import option ;
-+import regex ;
- import os ;
- import indirect ;
- import modules ;
-@@ -30,6 +32,14 @@
-         ;
- }
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
-+
- rule find-py3-version
- {
-     local versions = [ feature.values python ] ;
diff --git a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a8912eb5e048..000000000000
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -30,7 +30,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- rule tag ( name : type ? : property-set )
---- a/libs/python/build/Jamfile.v2
-+++ b/libs/python/build/Jamfile.v2
-@@ -36,7 +36,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 66fa7286ba67..de49ff996b44 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,8 +2,10 @@ DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d65
 DIST dbus-glib-0.104.tar.gz 793417 BLAKE2B 87c12f15e7a960acf2071fae9a689780b74ef146e0f776e117fed66248d16d2ae45e52d264fa87eafc336935db5c64f85474a4b16f29389436faabd976beae6f SHA512 eff599f169976055545b51459d77845002d8bc7e8dcd056cec2bf83836d07c66b03baed2023bc87a6d7c021d35c744987830f8ed6f9c3391a49ee199db85134b
 DIST dbus-glib-0.106.tar.gz 793343 BLAKE2B 8444c587bf002a23abe6f0ffedd1dc1c3a60445cbdab923567c74bd80ebb178ae24c9ee685426601782785e5f67ebbcc1524d65379135958bc7d3ede44c48feb SHA512 13a1d4600add29d29dbb8d1271570e6c04f70ddff0862d28fcb7df774bfa76a961f90303f897f3b970070eb959e909d5d02a94941e2edd8ba315b9aaa3a602cb
 DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
+DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
 EBUILD dbus-glib-0.102.ebuild 2144 BLAKE2B 9c03b870f2711061dc58b4789aa7bc156c3ec347873ed1b6829365a49ee4b812549909ce95af5095b70232299380664d22cc6655c98f6aa7c2946c08d23d906a SHA512 2464a7f101b40806dce95827c693263d6ac533f97fd18473a5262c3a98ca92d8a8b08b2ecf4aeef1110798b36348255ea963a90818a35cf8121d789a2b5cbb3f
 EBUILD dbus-glib-0.104.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
 EBUILD dbus-glib-0.106.ebuild 2108 BLAKE2B 30253cc6295eb45f268a5bc9f13d666c9b6c19e97fa2a7fdb5bdb2e3687f70ac4e3eda78cd889509c4d79449cfbe2d22de4c2ced5c012e9a6d3bc5fa7d2845ca SHA512 a047380aac56e192915e21938e65c29d8ee73d9e2feaf36747c9a28af8d7456e7ab9c9a8289240ec271cad508f1cc483122ee2c69fe124fed5f30b092bea2104
 EBUILD dbus-glib-0.108.ebuild 2100 BLAKE2B 39c5706373fcad6b2e5edbdb77394ab13a9a71e9a3e8bb0150e4ccdd507ea612c1d476d8b412d9bbdf11bbc196ba88cca928ab9754c02b362703b8de6ca9bfe2 SHA512 5f259f54a4b8d06e329b2ffd6d0e650a8af0bc1274e34d009f3c5488be75f91b6522a8d758a20eb8ead9e0bc94037ffb9a42abcb6a26580ca7997fa0469152e2
+EBUILD dbus-glib-0.110.ebuild 2047 BLAKE2B fce708b2bfb4014d81a0e56b9805aabc9aa385fe7a20318c6ad79c10fa996a83e60cfc78a747939682f7746fdd5d16c36aa858cac2fc9dbd760763256d3a3a59 SHA512 5f973f6c74d1a295c61ca26d45738ab4aafe5a121f86da43a06b2fcd71be2a57ca2b34de0090e7a8a045e6f5fc0c4d4bbbbb1f8a35c570f0d8bf2df9d2928e60
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
new file mode 100644
index 000000000000..85c48abd88a0
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils multilib-minimal
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+CDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		--disable-gtk-doc
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}" || die
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}" || die
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	prune_libtool_files
+}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 66a32a50eb56..269648b6a6e0 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,7 +1,9 @@
 DIST ding-libs-0.4.0.tar.gz 827058 BLAKE2B aa6e1cef9747646ece2643495eaa720254a964ea1adf8695f0a8a2d9c401b141a72e0c81d9d9cd44aaa81feed73118b7c7e52a24121d4ee0f71928dcf4ecf43d SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0
 DIST ding-libs-0.5.0.tar.gz 868840 BLAKE2B dc89dbd0951d8505776ae98a10bbfb54f4a2106da0a5b76f3d08556f7df0e85093862813ceb12f0190709ca71fe75eceb2c373dd95a0437f15ceec0bd70cf171 SHA512 d79db6794dbb59b518db15c51c3f981e8873e478a156ca8ae766a61107796968eeed36cf21bd20f5e6f04c5b460d3a40ab114a482754e2f3976c53bb82fe1fcb
 DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e2758ddc42338556a2c697e83ec4c57aa60867d5d2dc6add935266c8a4404f59d089fe52507d52783aed8bbe967503 SHA512 7218b6825bc078bdc35f149bd17944f427af0e32fa4d94026c00ecd14037598959ad7e1dee46af6fd3736424cdb499720fd8e1a0d1dfd173a5bc0085f8f986b2
-EBUILD ding-libs-0.4.0.ebuild 490 BLAKE2B 0fe7f20767b2dd1e8b3d1e46982f1c94c82298b412b7567d7e261c468131e5fe451ee231ee25d2f1fa44452c5d6d0c79b485dd1a1967d2b88222a623ab6f0159 SHA512 26b70f0a10519e7bbf8da6f2fc73c6aef3f2c3dd544bd0c8330834cfb2d0946c33f266eeefa0a55c6552c4ca297934ede3f66d0784a21a175ac6496f05c76f59
-EBUILD ding-libs-0.5.0.ebuild 546 BLAKE2B 114570d9911057951033196f3746c24594026fbd97de6b6d502f1ec41d8c8c2d7b6c13ea1e6631bb24262dacea2112adc7afdfe2c38232115883e08cafff832e SHA512 919631adedd25a89e1f0004524f53ccb50a450c3c165de0354e823a4557a1a4d010e55d6d20e703dedb769a3205910c164dbc3d73fefb7e7e85888ea0304705d
-EBUILD ding-libs-0.6.0.ebuild 596 BLAKE2B b62ccd13e047cfe11731d12d9011af489a59415afe5e432ff7a77e347813a47d007b9e5be29761b8177b0b04a20a5523da73368e4d638edf1a685d1da7fc032a SHA512 b7a4323745e97d4e70072ccbe36c9aa4f224e6f3d96810906832c1a002a28fd0ed8526ada3a459bc23c7c83937d09053af8c130257c19bf84627c982ae0cdca7
+DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
+EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
+EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
+EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
+EBUILD ding-libs-0.6.1.ebuild 603 BLAKE2B 36c5ec0674329382387be092b92278aec1e5f6f4b689553230c884c6f32a25dd8b64bc64fe503dcb9896041c98b2529b9ce6a85aec5d4c964bd383568ce6418c SHA512 103944fc4f531c596976def499a8c4af2494aff85ba4086b22e85e1d98c089f5226b6b67940a12d6d50a9a40477d22f27128112521b742450723281328587303
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
index 64656250a69d..8aa0f79aa2c9 100644
--- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.4.0.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
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools-multilib
 
 DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
index d252ab3bea6c..f917de14d1b4 100644
--- a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit autotools-multilib
 
 DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
index 601c9a1db213..1f488639729e 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit multilib-minimal
 
 DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
new file mode 100644
index 000000000000..b29bfb4ea957
--- /dev/null
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="set of utility libraries (mostly used by sssd)"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index b23c9316b801..15bc816e8cea 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,8 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.1.tar.gz 358650 BLAKE2B 541ce7cf5bdb9fc8c0cb6d7f1f6326d47c0cb32f71b517a8bfe8aeecc74658cf17bbaff93854bd57aa898e1f22bff1269c20422bab347df6c1e2ca1d8eac13de SHA512 af65ce02707ed2712c70470c9151bffee87e6d5b3b97218b653d3061b74001a7f3ac59e15b71362e4466e7ac16573bdb6331dc00ebccd906ce08ca8176b6770f
+DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
 EBUILD keybinder-0.3.1-r200.ebuild 1173 BLAKE2B 45e340e209d26411e5268ea16c4c929b921cf5447f03b18475227637b49a0f65dc781a231ad6d19296b744cc6f4f640b418040d9e81d76e154a6c90b1adc8f7d SHA512 631ab2a39cb8fe98b95c961dcecd252741fd1799353ecba32637e47afb8338ac29f112ff506b732cef9cd31e75bdf48ecb2a6464c414bc4e3ea7b945152a8ce1
+EBUILD keybinder-0.3.1-r201.ebuild 1197 BLAKE2B 02db2149021737397e30d62ec5de976af4de13447ac6a6d03bfd41a983b5d1632eedc65a284c10594d9e98a3fc47880e607e8fd6f70e6a2898f95a2621f83f97 SHA512 9b48eda63e11a35fdefd9c2667a5286df7579910d4f0ea67d2df11f01eacbe863b40237fec23f77fd0b2cbc75cce132f4af028e3326892a2ca24102f0b5a2cdf
 EBUILD keybinder-0.3.1-r300.ebuild 939 BLAKE2B ad5c4af3b728edbef0c2c61882ae35a2e8c630392f7446efe13701ff6fd83bbfa1bc51768244437b4cdafa00620a5e8e5e69ce9fcbcb9880aed1f6a7fedeb6a5 SHA512 c84f03c94a0a27549ffe215a0648882f324f80d38e30c49a97a2b8529c133737c673f74545d2742efdc845d2be5717c66624fdf6ec34e7dbb442c3c71c70efa7
-MISC metadata.xml 223 BLAKE2B cede765d06f6d86311c003cfad1644c1b372e8a2991f8aa34bda1aef39f5ba5f5dc4df033121a94ad095ef48a3dfe7028409d4cc308d55316fb79e7087ee765f SHA512 8fbb217256f73ea719d6b267940c2ff296e62c13f64836a0485051019c88475a4ec7800bda03d1e69e84e9bad96f8f1a9a6f8392cd3a2dea3bac4967721e58d2
+EBUILD keybinder-0.3.2-r300.ebuild 1056 BLAKE2B f2b2dd065cabbb6603a4d268875d59d4725fbab59a40c06865bf58fa785142ce02303016da2ca378a51c4b6970c378b77ccbde77e3015c80759cc9381620d2f3 SHA512 dfa866abf83e47ba266a1db43136321afab931afbab818fd54f70c0e4d98bd32af1475958814af1ba10f9b757b4a352394acf8ce0003bd58f38a3b2df6d31dd9
+MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
new file mode 100644
index 000000000000..4557421f67e1
--- /dev/null
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection lua python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( >=dev-lang/lua-5.1 )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.3:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable python)
+	)
+	# upstream failed at AC_ARG_ENABLE
+	use lua || myconf+=( --disable-lua )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
new file mode 100644
index 000000000000..155449bb9eb1
--- /dev/null
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-3.0-${PV}
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	# remove old symlink as otherwise the files will be installed
+	# in the wrong directory
+	if [[ -h ${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then
+		rm "${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0" || die
+	fi
+}
diff --git a/dev-libs/keybinder/metadata.xml b/dev-libs/keybinder/metadata.xml
index 61950dc27134..c363c085d028 100644
--- a/dev-libs/keybinder/metadata.xml
+++ b/dev-libs/keybinder/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">engla/keybinder</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">engla/keybinder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 2d646ac2f371..c47afe5d8b3a 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,11 +1,10 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-0.10.1.tar.gz 423218 BLAKE2B 1c0af89efda8d899a703d92b7cb7c56cf37b06e4f35b026f511edfd444072b8fbd4870fa144b565e3d171be5ea09b1af2a871f18b9dc5d884e546c96fa48a396 SHA512 bbbb772c855f5ce1e38abe7186400d9a2c9663dcdc72bd0a822bbe171eed3d01e33a6ec2196d4f6f8f0895f309d031b1eb77ec188bd16b37e52b306fafb66d17
 DIST leatherman-1.2.1.tar.gz 431781 BLAKE2B 0fecfd8f1cdee49548e7408664b78c3edbc76f39dca6abfff3f052dcdae0aaca32ad6197d5cbdce8630116b801c1a8e55d9915531769a3327bde1ea3b242a354 SHA512 f12414093d09b86878558cbe68f03b7f36fc89131412edad0573dbc891b1c422b98b9923babbed9ac4acef2cad869ef452d602199ae4d3e90fca5a3e2eb688d2
-DIST leatherman-1.2.2.tar.gz 434088 BLAKE2B 40ba4903f7bf0b9e07237291364b664ca84c74d8289a9065cd86833fd30e7f8309b1ef4d36514b5c2abfff45b287ca8d3eb60bae5ecb7e1579ca4d60eb866517 SHA512 1142a9be30efc8b1d52c9e38347dc39250c00c97c0cd7a299b63d6abb7140ec75c1fff0dc166b436ca6f4f82d7699869ea6988d807e8be8058a689841ac73b2a
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
+DIST leatherman-1.4.0.tar.gz 805151 BLAKE2B 38d5b895370997c91d2d1637ca23e3019bba97e27bc0aa0fb86cd931573c19a669c40ce8c9473c60b365b8474d75ec90b3e8dc2b0f1d488452cef4736668423d SHA512 dcc59928c4623ce0746e2583d4591ae5a9b0426f186ab4105a5a8156daf12d83901e496f2d7edf2a1b77c8087ad200fe90ec703081d65ecae0f999b12e53b0ca
 EBUILD leatherman-0.10.1.ebuild 981 BLAKE2B c4ba598588bb3b388e627a36f6401c596752a8683814283460e8ae1d5e575ede72d603859ac6c514c451f3f0f655fb3ed01f300f41bb8ce7cb3599c599cbd02f SHA512 1d6b8e7fe40dcd0188b246fd29ce34dcd70afdcb9260899f5bf662a7de9d517a05e40a7187091bba03f97b304c0cdcb8f493e478c3f0e5687edaf05c1467fe9f
 EBUILD leatherman-1.2.1.ebuild 1069 BLAKE2B 2415743c31d327115a44cd551902fa5f8a768a103074cec467b84e2e1f930d392b2e31d77f40f6037462e306b92079375d5c209508ea6744cc1b87be6497e38f SHA512 a16f251b7baa9bcd65dc45e31f744d0a00aba3bed5419825a9e538f7b611bb86820cdb24be67fa6fb996c31686f97bbc9f4ec7116e8cab5653c9773edda93636
-EBUILD leatherman-1.2.2.ebuild 1073 BLAKE2B 6e46f69dec2e46fbf4ca43a94376d00650c368dfca841b65ab7de9561fd71a4534a84186651920db1acb289fbe637a959813f6773ba23d6deb32844bbbbaab9a SHA512 046b94798a40ae31b7b95dc49b1d1502c4b86b0b6057455c25fffa191db120c980557972e3d1c8479a25b9284aa686564bb287e039ba42027916c79e239b4f8a
-EBUILD leatherman-1.3.0-r1.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
+EBUILD leatherman-1.4.0.ebuild 1218 BLAKE2B 064bd32081b3207ce77a0b9a09c05abc702045857f80f1c3db468f4b05286398fff03556c5c1d33a247362752c8689c28dc8cf91814e4a31c6bc65308b6dacac SHA512 bed02b2319ea24a6f40cf374212ffe2b90c5e03f8992fbe2fc2d3734a4313f9718424836563afadb50c6089a919e7b7c935a44399edba4a4c82525385110e48f
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.2.2.ebuild b/dev-libs/leatherman/leatherman-1.2.2.ebuild
deleted file mode 100644
index c166cb33d18e..000000000000
--- a/dev-libs/leatherman/leatherman-1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.4.0.ebuild
index dd10169b1741..dd10169b1741 100644
--- a/dev-libs/leatherman/leatherman-1.3.0-r1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.4.0.ebuild
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 7a0766cd6fcd..f14f1b4b2d5a 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c
-EBUILD libburn-1.4.8-r1.ebuild 877 BLAKE2B 2dadba49cdc0664d4b0b684f8e4165724d7cc5e5f6a2cc002b33823723078c3be55a7f178740e3244675416635c0cf93f3f6148997fc92cf48a44bbc16485895 SHA512 85be1316d0f4d7a291b8eef085e17396ee2b94c5cfaec0b0b982865ad473f2d2cecfdd73ddb86dd4f734f77ddf2a887076ca14bb12e9cceb29f74eca1e956ba0
-MISC metadata.xml 538 BLAKE2B a591dca3074f586f80aa758e7aa25ffbd9903641f46afe5fe851315d94c237e304d09771e30c179023500ccf4a06c4bc9222683543be4fca820205a55f0d0d00 SHA512 64ea37a1d2d40222bca80e2ebd8b2a63b3b5d6e879a9fd67651753f228e9ae4f38b505a387b5a885b12f44915a21bd2329d6922ce2a9b853910d47902326a9cc
+EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836
+MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.4.8-r1.ebuild b/dev-libs/libburn/libburn-1.4.8-r1.ebuild
deleted file mode 100644
index 48b875561534..000000000000
--- a/dev-libs/libburn/libburn-1.4.8-r1.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
-
-DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs track-src-odirect"
-
-RDEPEND=""
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	$(use_enable track-src-odirect) \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.txt}
-
-	docinto cdrskin
-	dodoc cdrskin/{*.txt,README}
-	docinto cdrskin/html
-	dodoc cdrskin/cdrskin_eng.html
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libburn/libburn-1.4.8-r2.ebuild b/dev-libs/libburn/libburn-1.4.8-r2.ebuild
new file mode 100644
index 000000000000..e18746798c9e
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.4.8-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="debug static-libs"
+
+RDEPEND=""
+DEPEND="$RDEPEND
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libburn/metadata.xml b/dev-libs/libburn/metadata.xml
index 5245cf4760a1..21fe2e58d3b3 100644
--- a/dev-libs/libburn/metadata.xml
+++ b/dev-libs/libburn/metadata.xml
@@ -9,8 +9,4 @@
 Libburn is an open-source library for reading, mastering and writing optical
 discs.
 </longdescription>
-<use>
-<flag name="track-src-odirect">Read track input with O_DIRECT (see man 2 open), 
-this may deliver a better write performance in some situations</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index cdd8f7346e4d..d5de0f6b43ed 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -5,10 +5,8 @@ AUX libical-2.0.0-libical.pc-icu-remove-full-paths.patch 1358 BLAKE2B 5f29ec8e53
 AUX libical-2.0.0-libical.pc-set-full-version.patch 629 BLAKE2B e7d17235c6993c1ad4ae446d36020849db14c534d517c0f6e48ac96af7e51a9e3285eb1d9cb9886101c38f88b65aafd985cf35099e140ee537468fa585e60bbb SHA512 a30127d93d1366d65e464c6d4ad08a42b9de142eac6e14a905cad3e0e094e6deafa689e8deaaa3bc8746adfc9667f8a6657088a2a1e0643035a5a3c2fbde173f
 AUX libical-2.0.0-tests.patch 1176 BLAKE2B 4e96464d103095452ef7be6ebaf5331a9bc51cc3e1f2aa3afd74326ce5809bc577e36299f0293f34348d6b65c404d995399bcf28e2809968c91253409f60bbbe SHA512 c818aed46b64c7ecd72356506ccc36508521040886d9049b2ac0c20f2943f26b5f3ef10d3850b164132a08545f1ea86852db3b4b9ac17f3e4b2f56398a7ed1fe
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
-DIST libical-1.0.1.tar.gz 720618 BLAKE2B 7506db93346c1104dbc6572d69e6de1f38730e906ec863badb38f4b7f635a175110f5eb1d9784e5baf74bc509bbf7875e5769ca3e47660012845cbbe6d92309e SHA512 efce88c73352fc34e9f7eda2234bdb593e917b33d1373cc6e6a21a72db1b14f2ed72976d6084dddcd8f07b08a15d5f04370bc825695d2fd40cc7b8488a7a977f
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
 DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
-EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
 EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
 EBUILD libical-2.0.0-r3.ebuild 1711 BLAKE2B 584078e51c208ed6a8eb40b9ea56cb7d5f75cdc1f0940018fc0283a4a0b2e08b28ce1a7698743c2187dc3bc0b6fb8c0f1636b5c5f4e032028fe9c1da6a5ae008 SHA512 b694e2ea6b883b05803c9190304e3e3d49c081aa57e72b90f157cd8a2d3a522213fb53e19fb9f4c627decf0486a12f45f3eba3a2c2bdab5478a6c5b50415c2ec
 EBUILD libical-3.0.1.ebuild 1988 BLAKE2B ed29518f1db3fb3b12eb648c167e70e0a992f6f28a6edf55cf4cc5b54e1ad42d1448d22a33b64e2e252d656745bfa27b2cf8fbc15dea80fee15a9de3315c73c3 SHA512 1ec6ac8c38e99e1609e88337a4b4a4c9b60a1670abd0cf72dd08d0de06340e083a36b1361c05b281834886ca0ea25119dcedf03d8ad21de23b7f4d2bc83b7350
diff --git a/dev-libs/libical/libical-1.0.1.ebuild b/dev-libs/libical/libical-1.0.1.ebuild
deleted file mode 100644
index 610e4e22bee3..000000000000
--- a/dev-libs/libical/libical-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# FIGURE OUT: Why ebuild for 1.0 was marked || ( MPL-1.1 LGPL-2 ) against what COPYING file says?
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples introspection static-libs"
-
-RDEPEND="introspection? ( dev-libs/gobject-introspection )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-src_configure() {
-	local mycmakeargs=( $(cmake-utils_use introspection GOBJECT_INTROSPECTION) )
-	use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		rm examples/Makefile* examples/CMakeLists.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	fi
-}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index bc166e09de21..c531b3b333f7 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,6 +1,8 @@
+DIST libinput-1.10.0.tar.xz 491444 BLAKE2B bd7f4a68cd1ebc981cb16f402c8ea6a7bd99d7bbf289fe07923400a5bf9e259b3726c5c1765d5e31fe09b95cf9eadc88769c578d6be0f2fee4c12455d44d6d70 SHA512 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f1cac22892722d48983788b43a136617c62ad39c8d435bbf07c0cb9cd720250ea91e31f10526acd5147b1d78237 SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
+EBUILD libinput-1.10.0.ebuild 1444 BLAKE2B 9bbc30b14228ee7c70b5e66574664eb8b699413868a0ba0644d919a518b144400d79c82a6901b40d31fa9138696f72d57d4decca4afc42de6aa3dcbb5fe55d74 SHA512 201e65f2b68ce18f19d9b1656e8eb25bfc54821aea970eed17144ca8a6bbb85b3d205a49ecb515719d71482be3f926a178303f765710ed4e672ce48fbe62e0b7
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
 EBUILD libinput-1.9.4.ebuild 1441 BLAKE2B 8a836146a0e384130f4f6584064b68bbc92a72e96ce0f952287278510c3b227b2cc8b1539b274e662d62107a43ff5797493091ae94a74567acf26c0e9599d549 SHA512 a7d4aa9e144f2c08e201f01436e9bbd8f9eaf96d88b614117a79e96f71316b28b054871b4bea81d77151f410c0c115c4311151c1dff712d2e1fb37b2d010125d
diff --git a/dev-libs/libinput/libinput-1.10.0.ebuild b/dev-libs/libinput/libinput-1.10.0.ebuild
new file mode 100644
index 000000000000..44cea37f06a6
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.10.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index d27cade1aad5..04bb4f50b1e7 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,11 +1,6 @@
 AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
-DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.14.ebuild 1129 BLAKE2B 52871bd77e5f913ccd7d703d21187bdf165245ce30018aa7e3e825aa4fd68614fad5e7648428c2c6fc0f75e0bdda381d6914c2c81f221689790ad092fe93c0eb SHA512 52429bbb7c05fc095f7c9c90ef2e42dae52eecded96e60c3dfe91a86c6eed43b077123ce5a5e3519aca12219986a8f12032cb865be01f7d9aa8bede8b215019d
-EBUILD libmemcached-1.0.18-r1.ebuild 1516 BLAKE2B 3cc6f403c3f161fbb8cf24c5af5932eda7497447a9fa5590b581e345537c6ce5658516631fd90c6a6e02b3046817683423e9ffb42e13f61fc9ad75ba0782d112 SHA512 f604fd2df67d929f13b2a1813b881b96844f9bc97d2ae8324f52646d5a52abd3aa6647a76c7f7d2fa5d72652ca2ae0008da19257d7e26c9cd437fe044b9b2722
-EBUILD libmemcached-1.0.18-r2.ebuild 1536 BLAKE2B 2f5cc8f43e879896d16950028a76e91091bb370aa2ba889566caa3afaec127f49b5d618e62ebe94693f51782f6b7ad0e23e7d9ff4431d5b3fa00d31cc08a5a88 SHA512 ad63b8c6f385cb8660586b9fa4169b55a318af9b9f659f618917188d0b33672844937d2e79bc4c01d9a6c59a0d69abb0f7d3a3a906a369f56a5a2de5ad493879
 EBUILD libmemcached-1.0.18-r3.ebuild 1610 BLAKE2B d2080c57255f7d6527f5799a97e729adba6cedfa7f91156b883b1af0a6a89febbafc941e9124acb67da777c1cb0c94e69574781f3b8ab4d4b0097947296b7c5d SHA512 33ba4f396c80db7eac9a15b5b866ed4db844eb94b02bad995a1d772990d6f3f8b4cc465f4bfbbfd409a43ea6fe04bb649b1c7a3ec95da343e0bbf17a861c1276
-EBUILD libmemcached-1.0.18.ebuild 1452 BLAKE2B 2eae8ce042b00d87704e300c9773359555514e96104c6dd182b239c56024b10422f9c67f7e6f323defa3c688af1d59b6d2997ece4df9b3922c56a4811c71abff SHA512 16a92236938f4b9ccb6f2a7bfc75801f66e21a44c68789ebd9b28477d9b5ddc817745753608f9fd0649541a401c3efb71d7f5a5675ec4f16b9d3ada1108b1eee
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild b/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
deleted file mode 100644
index e80ecae12f28..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent static-libs"
-
-DEPEND="net-misc/memcached
-	dev-libs/cyrus-sasl
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf
-	if use debug; then
-		myconf="--enable-debug --enable-assert"
-	fi
-	if use hsieh; then
-		myconf+=" --enable-hsieh_hash"
-	fi
-
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
deleted file mode 100644
index 573767f416c1..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
deleted file mode 100644
index f5676b7b2a8d..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
deleted file mode 100644
index 0bb1960dc4eb..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 062ea8d4e136..58f437caa5d2 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,5 @@
-DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
-DIST pcre2-10.23.tar.bz2 1515314 BLAKE2B f5900bbd3dae401180299092751700840b628b6e1e766885436dd8bda1e22279a179e280994ef6c6c98bb2af1ec5002c283b2c2ad3ee0420c3acca814ca1742a SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-EBUILD libpcre2-10.22.ebuild 2320 BLAKE2B 21a1d2dee729733bb618c8febe31df823cc8058c2ee09dcb1bf79c82b332c6a9cd7051dff4586bf2f5f7cf9f94f051a6b988bdda2bd80051fcba6306052b2d98 SHA512 4763d6daea9bdd4bb8dff8f24e3b051366eb728cf9019097a344ecb3a497d6950f7e352c7fcfe240d6f596c8114f001d562f01f2da953b975b2f805f59c30a23
-EBUILD libpcre2-10.23.ebuild 2329 BLAKE2B af4214bdab9d05107951eee2f5ab079b08b7667ce492c534ed6e0b8b75d36418a64ff40f31b3af499994f0ab7ed58bcade42b48d610cb7f5a215df141793663c SHA512 9ac3202801afb4b8889c4ab8b767d283771caa77be01ffd3741918ee618107c37742ee3b4cd9abf4944b70cb8d1b459db6920abac55c18dcd4f3539a01ac8b31
+DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 EBUILD libpcre2-10.30.ebuild 2339 BLAKE2B 5fd326ec1dc0c4a5d54db90621ae6b9f07c91c4fbb9bf956e446705166d52de87c695fdcffde61e7e8233b538593558ee11ed9db79f1cd7263203aec647def76 SHA512 47979b06fed1350f34305eddfe073a791f91da379a0f05dfd21338bd9131911106dcb0bc899d5a572ad15ee1ddff1aac772216dd6ce87e1f2738ffc79bcf9c34
+EBUILD libpcre2-10.31.ebuild 2348 BLAKE2B 501e61f76820a596b4975bd0654981ac89be8da15c44cfab69abea1b1489eae80079855577d89200ecd96714b7d6a2307c0662cca4ec12cefc6ac67e6cf89f0b SHA512 3f6d74efd53d8466b67c6743801d73d2bb80e78e6dbf47d916d23be086245750d0a778cc81f146fe4d5e24fad9bbed28a5690da29fb12c4cc28d555052a293eb
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.22.ebuild b/dev-libs/libpcre2/libpcre2-10.22.ebuild
deleted file mode 100644
index f4650a2dbfb8..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.22.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
-
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.23.ebuild b/dev-libs/libpcre2/libpcre2-10.23.ebuild
deleted file mode 100644
index 226ebc4fece6..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.23.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
-
-inherit eutils libtool flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2) \
-		$(use_enable jit) $(use_enable jit pcre2grep-jit) \
-		$(use_enable pcre16 pcre2-16) \
-		$(use_enable pcre32 pcre2-32) \
-		$(multilib_native_use_enable libedit pcre2test-libedit) \
-		$(multilib_native_use_enable readline pcre2test-libreadline) \
-		$(use_enable static-libs static) \
-		$(use_enable unicode) \
-		$(multilib_native_use_enable zlib pcre2grep-libz) \
-		--enable-pcre2-8 \
-		--enable-shared \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild
new file mode 100644
index 000000000000..b3366003de68
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.31.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 854c98c3b872..f6ba1f9c26d4 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -5,7 +5,7 @@ AUX newt-0.52.15-snack.patch 797 BLAKE2B 6335815f32ec21d81956f411822ad2dc9ca7dfc
 DIST newt-0.52.15.tar.gz 183171 BLAKE2B e6fac06b28232c81d683b9fe613f8c75660543a1e1f9f7583ce27e2fcf8208e2695e94c190757af8da443c0b1fa30546ce8dc77630ee88464377d563193f52d1 SHA512 f93798e8e9e33b4bc1bbb6039d94ccdf55be76a0e0f918eb32a241fe527ea61121a8fc35ccd699e3f6202eb367ba4b4025b30264bd9b0face7c16782f113051e
 DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c528972cb555422065dd074bab7360b226fcc4278caafafafb3b53c6eb2c395b83cc18c3fd02efcf053480311 SHA512 223b4fba9568d7ddddd9292f52d5e556a24403642d1dac97b58c8ede698bc182ce7d5afd31df2cb1c5b8a8850529b50ce71d8ad84856be8d42fad0f1a33a48f8
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
-EBUILD newt-0.52.15.ebuild 2027 BLAKE2B f22ddffed76c60a187bcbec5f205ef154552dd1e72472162170523d0b9c24c7dc8bea98df0c451aafa13c42af13ff66b80954605d51c3a305fa6cf8d274ddf53 SHA512 3936acacd773e0d4fca2052f5eb581bd8cbec14ece1f44c40c18a52b2b205398b1ccef7dfbe50cd6fe73bfdf2361ecbdc6e84756c89c43728081a6b14185d851
-EBUILD newt-0.52.18.ebuild 1964 BLAKE2B 3a4829fb3e98fab50ac83c0934ab7aae5b58550657d86157925fbcceaddfcf367794c1d9b3cf9e7385809d777ccb7e3454a0be959072308a7ad204c21b577bdb SHA512 55961c54ede0379f42530892d39b768ad0f794060234e91e1c4dcf6a0e100b2656ba6980ee1116818ad1f198255eea3901d719afca0119142238235f91c02f2f
-EBUILD newt-0.52.20.ebuild 2057 BLAKE2B 2bb087204b2c49b7455a518a2a2f97739fadd8e2b81057123880fbc52c4a91dbf8e51d31b22c45ee5230c71a48edb337d05cad90b929866234edcc436066d3c3 SHA512 2211421457be95520f448d5cc3dbec66c16e7540a4ca7dd0ac29cc120a0524e3974ac9ef1148cbabc5a4ae7cc1f6438f0d4ce85df53b928bc5728b27b2f5eee8
+EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
+EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
+EBUILD newt-0.52.20.ebuild 2039 BLAKE2B 1ed4352d9265012f2c2a449a804b3a722a2dd11d10d966eb673e6cba6367d7942e611e8d67d12a266436d2b4649f131541ba82ccd5a8ef499c664af2ab23c2eb SHA512 1674fd43412df57dee87d1fbe9dd9914e1dc3afb14e6725ebfc2afd8a5dabd7f7dc64a0a23f4d3289f3f5636d02a86fc7c43d3b98c84c9c9c6eb31e68d9d5ccf
 MISC metadata.xml 220 BLAKE2B 11380346d91090dbb55d040eccb10aa6370a3c71cdecb1930d6a0ca0873d2d3d5c9edd704011e478f635e97c7b7aa4e03e485475e9d2d3acdd87a6545e86735a SHA512 92d5a05e3acc3e5910f8f0948c3cb31126a5aec7042421c0aed7b4721bd1fc83b819814a1772fe7ad0ddea4e0e9f485bae74cfea2c116dbca13994b05854da91
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
index 669bd8c5e902..7ba8453d0433 100644
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ b/dev-libs/newt/newt-0.52.15.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"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-r1 eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/newt/newt-0.52.18.ebuild b/dev-libs/newt/newt-0.52.18.ebuild
index 5b8a6e093be6..bb64ecc2c13b 100644
--- a/dev-libs/newt/newt-0.52.18.ebuild
+++ b/dev-libs/newt/newt-0.52.18.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"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-r1 eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index c71f947af1b5..54af8897f8c8 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.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
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit python-r1 multilib autotools toolchain-funcs
 
 DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="https://fedorahosted.org/newt/"
-SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 90a64b11ec51..9c30b29187de 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,8 +15,8 @@ DIST openssl-1.1.0g.tar.gz 5404748 BLAKE2B 23daf80e4143aad4654ae86f8e96042dd7328
 DIST openssl-1.1.0g_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
 DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
 DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-EBUILD openssl-0.9.8z_p8-r1.ebuild 5064 BLAKE2B 1dd5b2191321cc28d206e29305393cadcf0241340c09a5f1de3aa67567a3ad28f90640ab598355c521e1005e9ca4a3c6979943c225dfedac290be1ba90c153d8 SHA512 087d142686bd8a8af6a4eb9c387ea1c4283a6a9029749cb49d31382c780b8a9c18328193defe21db46bbc07e7dd892ca80ae547249e194bf34eb381bd3abaecd
-EBUILD openssl-0.9.8z_p8.ebuild 4985 BLAKE2B b8f63b012f266297638b3bd4a112a5122f80862b82cb497857e8444c5b98719228334cf47396d1604a4d85a3be0223204cb812eb1a2da52997f1acf457f0e558 SHA512 a2c58689aae6e12ec3f7e9d377aa9f5998c690efc8e53ec76609b2477da5e28fecc0ec89b8fefe4c83a281c333aa6d77e41de46fa44d449db66f1132318153ce
-EBUILD openssl-1.0.2n.ebuild 8024 BLAKE2B 5c05f34f02cd875e73a7ab83ce76feed1bedae7c794ac2159666b327e59475002ae872f92d06391cd5c637db39232a460c00fbd4df0a8dcb7cb2e10d0d732af3 SHA512 4e0d994a19a112223115e6d9768bb34fa753fc74354e97ad322603f3af209dea40b62f17c3aa5910813b75dcc2c0650a05bab285669c195f04b70a9d943f53a7
-EBUILD openssl-1.1.0g-r2.ebuild 9033 BLAKE2B e57575c188737b2d7cce7a238fb6e104d609ddb45c8ebc62d9652f7fc42c5609c574a46087e998877886241602841d57b1b82498fd017fc267d5d21161865e07 SHA512 e92e8ea7f41dae6ea6171af4559b0680d715fb783d1bd470a75d179eb8e2f8b2494a22cb41cdd93f286ee07d2ac0783684eff48cb2ccd5020f2839b73f811155
+EBUILD openssl-0.9.8z_p8-r1.ebuild 5067 BLAKE2B bbe98db5565577ca9bffa9224a8e1ac2903ec8fdadf23b2f59a8b82a7e71c2c4fb049abdd64ba00966ffbe037f7f9d396667ee61f548c6b4415ed9d055c49602 SHA512 c747f5f2dabd1705cb3dea9f22c5999dca4afab0623eae581137efbb537402cace75a76f3b7751809108fe00959e7b4d30475a6b9002291804149a78bb4e332b
+EBUILD openssl-0.9.8z_p8.ebuild 4990 BLAKE2B 58f2db31a50db3b2053a0d375eb40efbb78cd0f593f0ae2ea8a86c7d477385291e3b40407cefde9dd80e087ca9ef35bbd220e74762fb3d2a36834b3dec019ab0 SHA512 3d2236951d4fabdf29493d5dfe5a104aa32bbc938a003f3b46d793873da6cfb513408b321a96adc3f2b23630e7ef1aa84f61171024d6effdf72c9f57eff28282
+EBUILD openssl-1.0.2n.ebuild 8029 BLAKE2B 03b66a7d81e954f811b87314dd56bce86ba3e2dd4b15678d3a72ee40f03cf8d27fe70493c0727c640c96cf21dcab8b8a6a0f022af8505d68f49e6e024d2166c5 SHA512 0da731451be5903656e4035f7eb30b1565b0b5a9fe277e300e9272bc2bebcd97a1043a5e8ebcf62808f50e7a2f8c9433e15f4a6fa44aa86d5efee94fffce8a54
+EBUILD openssl-1.1.0g-r2.ebuild 9038 BLAKE2B 061620ab8e0d73643f8856cb4390727822902a98533d6c9a5f56b7f9cccfbd06c6ced2651a2f85de99f36ddb74848d4b93d88d31bf34a045d093a761bb277791 SHA512 27f444378cdf7fee91a79304ae71259e3956bdabd68daf3044c61416aea6976b61cc51f8436b5a3d7596a3fe7ea5804f5a728affe42ccd24dc07b2ac7a3747d9
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
index 7ec8a13fbd6c..f573e495c90e 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
@@ -102,11 +102,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 229fa4a52448..6ef3483361b9 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -97,11 +97,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index fc14a2ac5281..db4a0a8bd9d5 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -101,11 +101,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
index 9f2d149794a0..b782dea17bfb 100644
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild
@@ -144,11 +144,11 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 http://en.wikipedia.org/wiki/RC5
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 	echoit() { echo "$@" ; "$@" ; }
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8e43ba850bf5..5267ec41aa60 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -25,5 +25,5 @@ EBUILD protobuf-3.0.2.ebuild 3063 BLAKE2B c63eb054a4a792527a10946c512c1476907a69
 EBUILD protobuf-3.1.0.ebuild 3012 BLAKE2B 1ca83e01980372a2e6f2ac29500ece536162c64bace65414efd69c01d9484d9d76bdb93133c8b28f63bd982db074022c94c7cd1687ac9a2ff8339dcbb3c794c5 SHA512 673cb5e3ede77b7a68a1ff2c6e32fb0ebdb5b712b98253525be958a94272d340b885c6efc36c5066985667b70aae417f00f8fd7fd0816650968f10ea84e760a4
 EBUILD protobuf-3.3.0.ebuild 2923 BLAKE2B a8f3e9277cc151c971106d5285ebb1c5e6457f5ace09823c453d43cfe1197d8368ed9e6277fe29f51070098d7908689e83ed5bd99c4ac360bb7d9d59823aac3f SHA512 307008f8508679e1e54a86d4ca85547c24d5cddf4a5abbfd7835981a8194fd3d36e630eaa280847f727511211e2f9cbc532aeed8c9df6b934bd4f0b50ce341f1
 EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2523 BLAKE2B f22c62ab48794fc46f99a897a04817a13d98f91dd2e16e497c077f5fea5591ed39ca90ec496ed192e4dcb01e8ac9098bc3ea3fe0393eef62e5558485b4edb666 SHA512 59d0dea4bdafbd016799032e488796af153ebe797ea026ce7bcd8c156cad78150684fe186c899ee2bf27e248d256b16c412faa87cb5eae213b7f1490581f8786
-MISC metadata.xml 699 BLAKE2B 02042acf0fc18dc044723e8e59da58130672739cbbf9fc71eeff6d791322e965d8b5073ae2b4dfa749a23b3eefc2335e3b67d49e2bc8b501127eed1ea0613b0c SHA512 998dced87b96dee7c49277a755c1fc835a5711fd6354f6494e7940c42d9eddbe031174d65286209e6700e02fc51b196971647a64f538e0149d7af73e6de0144b
+EBUILD protobuf-3.5.1.1.ebuild 2522 BLAKE2B a008887d07cc77e7215c29fde449cb67a3c2ea8698b82381974f60d222dad8be8899d094179cb593b3ab88ab17280923027979ed8b89e9e6179cde54e6a5c81e SHA512 b2a160433b36c0e95a4db220b3b8f57b83e608428b402b480e444320af745c3cfdcf3c17e0055fc24232e158c3b5ce335e50370e02bfb95fd7eef1918e3ed9b3
+MISC metadata.xml 829 BLAKE2B 1a70e376287941c20f9a1f28b62e803c2d30037760802fd3a177aefb67222667f400093d372aaa2dcfc2db7ea0dae29d5767b09faf7784ca7ac881a2a38db62e SHA512 2b24521cdf16246d189dae7c62b53ba8516efa61002b3639b6b864d09fe9cde8a892ec63abc57ea8285bd772d6c5da7b60a60f6be9293f8fa5f34111390853b3
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 204584ce5e67..d242db0f825a 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
+<maintainer type="person">
+	<email>arfrever.fta@gmail.com</email>
+	<name>Arfrever Frehtes Taifersar Arahesis</name>
+</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index d6f72fb6d95a..3f6acc71004a 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.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://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 38f929cc7454..cdba2dd0a8ea 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -1,3 +1,5 @@
 DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f
+DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
+EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.3.ebuild b/dev-libs/univalue/univalue-1.0.3.ebuild
new file mode 100644
index 000000000000..8e6fe5bdaf55
--- /dev/null
+++ b/dev-libs/univalue/univalue-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 60e1a65f74d7..3e8a4a0adaf0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,7 +1,9 @@
 DIST userspace-rcu-0.10.0.tar.bz2 483899 BLAKE2B 76f7da8290a702c7ab4ce37743be6514df6f0b8a69fc68a7ae65ae32a8d63192efcebe2fbf995d13b60b5e593d1818d6fb201ef914d0390e0209020590370a56 SHA512 e3e458510f97709431caf848b007465110057d6fba7b9e39162fbc8857fa18299e884f0e484302aa8a79ab6e6a941921db9a4adabd863c151c1b547b7276eab8
+DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
+EBUILD userspace-rcu-0.10.1.ebuild 663 BLAKE2B 18005f9386b7a0faca02b10623716b078d3794a422a602dd6ef972b111a81a06d8d1152ce8c0e38b2aa56f92fff522d513cf4917cf96ca09e33864a38e38c88f SHA512 0975aa37fc6cf0d86ab995e3f2027be58f57a7d2232c5ad41e4b35afbf71c0865e4c849925e72d3abc95fd439758a3fde99d10a8301a0e2e408cd9f84957c544
 EBUILD userspace-rcu-0.9.1.ebuild 736 BLAKE2B 2254c2ca484cde4821753e7c2d8a2a5c8f71700d77068234f9215608104104f4eda13dd4d78e20222a5dec2295bd05b75dc9aaad733e8555e0bf57218079e330 SHA512 c6e0ddf946e8e07392545e52f2bad49d2da3637e800b77689112128374c6367d5efa6b9d44d6143b3f17a8d74cdcfb877f2922e6a112c0ee8bea834242af4818
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
new file mode 100644
index 000000000000..0576c317633d
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="http://lttng.org/urcu"
+SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index c14999379091..36424960f715 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,4 +1,6 @@
-AUX zlog_no_werr.patch 498 BLAKE2B 74feb340ed353fdbd2069ee6cecabbaf0670f771a527584127c05f514c658743e44b505eabe9cbbed910d850d2bc7eb3f2e64ec5255a7404e959f1c8f5bda50c SHA512 a827b7927089016a012bba7d2012800687494c540df73ae6797162157d412019bbc3943fced8e2a1e4f29c5faf5c9a998406b75a335ccd8c2bebd21b14c29fd4
+AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
+AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
 DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
+EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B e4f403206a4368f222208845079bc7ccb5ffb7f0cfe358797818afb96bb1754cf81ca714c63a0c300c36d04422870d835208d3ff153164b6c718cabdb5d1fc21 SHA512 9ec4eb07a9e20251fe1c92c938f72fc7ba7804cb7fcf0bb9e8b8aa9c4ed9c17824e15a46f17c319d465da2f1ee944f1abde035af6a1a8207bc74ab5e1a992b48
 EBUILD zlog-1.2.12.ebuild 625 BLAKE2B c6ae9a810dd1e34c941d93d12180a1c6e2a0a562a2cb173e2b6ca6bafc1a6def63fe36cb20afc824864c694d32b94cf52feec08469523344ecfbb47afba79571 SHA512 0bb1dd33dcf297c647c66da1f1d3bfab3574045ea5eba044f27a7972305769619ca2d6fdf8f9b1323de2c241c6f86b466b025535e99a89a1d383f8efd8196dbc
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
new file mode 100644
index 000000000000..4ce0a4b6d16c
--- /dev/null
+++ b/dev-libs/zlog/files/zlog-testsuite-flags.patch
@@ -0,0 +1,22 @@
+--- zlog-1.2.12.orig/test/makefile	2013-09-25 04:38:42.000000000 -0700
++++ zlog-1.2.12/test/makefile	2018-02-13 16:59:33.812131188 -0800
+@@ -1,3 +1,6 @@
++CFLAGS := -O2 -g
++CC := gcc
++
+ exe = 		\
+ 	test_tmp	\
+ 	test_buf	\
+@@ -24,10 +27,10 @@
+ all     :       $(exe)
+ 
+ $(exe)  :       %:%.o
+-	gcc -O2 -g -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
++	$(CC) $(CFLAGS) -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
+ 
+ .c.o	:
+-	gcc -O2 -g -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
++	$(CC) $(CLFAGS) -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
+ 
+ clean	:
+ 	rm -f press.log* *.o $(exe)
diff --git a/dev-libs/zlog/files/zlog_no_werr.patch b/dev-libs/zlog/files/zlog_no_werr.patch
index 6cb2e8708672..b01325db09d0 100644
--- a/dev-libs/zlog/files/zlog_no_werr.patch
+++ b/dev-libs/zlog/files/zlog_no_werr.patch
@@ -1,5 +1,5 @@
---- src/makefile.orig	2016-08-11 10:40:49.466873499 +0200
-+++ src/makefile	2016-08-11 10:40:59.626762850 +0200
+--- a/src/makefile	2016-08-11 10:40:49.466873499 +0200
++++ b/src/makefile	2016-08-11 10:40:59.626762850 +0200
 @@ -32,7 +32,7 @@
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..cd97f558f0b0
--- /dev/null
+++ b/dev-libs/zlog/zlog-1.2.12-r1.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="A reliable, thread safe, clear-model, pure C logging library."
+HOMEPAGE="http://hardysimpson.github.io/zlog/"
+SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/zlog_no_werr.patch"
+	"${FILESDIR}/zlog-testsuite-flags.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test () {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test || die "Tests failed."
+}
+
+src_install() {
+	emake LIBRARY_PATH="$(get_libdir)" PREFIX="${D}/usr" install
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index cde851bc9d26..185c36cd5616 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index afaf91a64b18..c9939473f168 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -4,8 +4,10 @@ AUX clisp-2.49-get_hostname.patch 2356 BLAKE2B fc1e5e8c2e3b9f1db8c144390564801af
 AUX clisp-2.49-readline-7.patch 690 BLAKE2B 7502d529c342228b722f568cc808099d9259f7cb59e28cff75a8f9c665f659bf75ea318afb7285a9ee3c1637219affaaffc3bb7001436a44d40605afe2a9432c SHA512 c5c1dd093d19d2d62db29808d418d8fce6233ad226a6b7414223e0cf8e9777231cdd69f4625ac1535a9bbc831b5a3e4fd4baad91a880f3992cd6d98220f887c4
 AUX clisp-2.49-tinfo.patch 404 BLAKE2B 12d9c2a7b6f83b4c0de6f8ab4e57fc2db2f3bfffbb535c0d5793052268a6d12ca21126a8b71895353b37c0a05e268f3eee192d827e63eb71ceb01c3c03cfe176 SHA512 10f27e205557cb48fe0165bd5ee7e3a33b0dbe403fa2d10df62854c44eb762a44ef005c78e8c23a67f7ed6d3c6317c893c7760f9c2ca72b6b088adae5f03247c
 AUX clisp-2.49.60-after_glibc_cfree_bdb.patch 8937 BLAKE2B 93e6413fc788272a53e35835fb72e897303a59f3f6fcb5fecc0b4dc6b68b3941d8745f2df091bec59e988d449c6a4ffc60216f45edb067f505164b9f51779315 SHA512 447ece26b0af6ecadaf5d46930b5b3955bd764953a073d7bf732da313a7b6298ff10334ab1120200468ff806cb90520e3707062b0503f633016f17cc8ea53fc7
+AUX clisp-2.49.90-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 DIST clisp-2.48.tar.bz2 7885098 BLAKE2B 42ebfe4721015f522184bce710bf95d79aa7f2a239410af249a8e85d80f140344ec80daaa34f7cdbfd2ae86407984657163ce3f6e4201eb132f7c71e21523cba SHA512 3288b6a2973c924006b14bbed1e8e3e688276a187ac2a6c7851dc7ae699e7832d30e5e7eecdabc76c08c7e8e8ce1b562eb97a44570d3035e558ea2310de2b719
 DIST clisp-2.49.60.tar.bz2 8745713 BLAKE2B 5dffd594c6d00c2057a98e3f93c888cd5cdc60009cd8fc987e39ff5182e71e575e148839d9c973fbfd0842b82ddf1b5918e86d128d9c79f6d0d4b6afcdc5853f SHA512 656cd59a23ba9be5304a6e0d64d79ac518072c431820b8cf95759fa8f3a66e2efe4d07939315b93e5e06b6e5348d8b32739b129a9e8ac0dc362dd5d1f1eb8aa8
+DIST clisp-2.49.90.tar.bz2 8921458 BLAKE2B 3be7cfe41038f42d8844d500877fa5c20e5c21dc0e162aa0018b297e4dfcd5374ef608793c9d809852e1f9885a155bb5b25fef8efe66016dd0ee400007386b70 SHA512 1fa7205e38883dcc863160b5418ddaaa2c45ee2d2f936de4067d1ea4a1e5043bf1235361bbbfc366afd6d8f1144497ccdccf1767ecf327f7a672b18742ceb651
 DIST clisp-2.49.tar.bz2 8091011 BLAKE2B e034c581b8100837b34d0adf1ef45bd667272d062945875175958178b4ef5b11e899dfb76505eb8cb51fca6101c11a9f21fb2cc9a78a3c0f82b06166211434f7 SHA512 eef66fc85199a2c283b616db61bf67ff103eeb0f19fa907da48994dc790b6f5f8d0c74fb3bd723c6b827c0ff3cfd89fa6ba67934fc669ed5d5249044b5140d81
 EBUILD clisp-2.48-r1.ebuild 4797 BLAKE2B 51c1550e35af93c381ce01eeaf51d6a2027b0b39fa4c880616db4a88d78f06acb8018850d583f13ec705e4a304f48ba09801a736f16a8625275734ab1d0f82d4 SHA512 130ffc47b63c934aa8556ea3e5d5eb8a81300d98bbbff503bdb84a1c7ad1dcbf97b092124bd841bd9b2009df5588aa78c2bda7cea34a461526199957cf44862d
 EBUILD clisp-2.48-r2.ebuild 4726 BLAKE2B f1110afde6cf8d5c5a2509f24705d9ddb5fc4b7c2e151ec52c002986a0b60673ea11e3643db8a383483c45eaa6c7655b07a03743712329b00201503069c57167 SHA512 afce7666a82e947f48e2eeed5ceba5f4cbe981e8f37d6e35beab4dc973a6077b8eecfebb2d1336f2476b6cfc252f5aaef552354d8dfc153920ac2d3291f76de3
@@ -14,4 +16,5 @@ EBUILD clisp-2.49-r101.ebuild 4565 BLAKE2B ec0ba0122c1638fce794a2579528534743a70
 EBUILD clisp-2.49-r8.ebuild 4394 BLAKE2B e49e12b943c60d9b5c3f1272829430ecaed2ed1ce23ae87883ab5056a210fcaa73f6e1adbf8b5a7159261d1fbe9908166f2e9d08fbc6074782cd09a8220e348f SHA512 7548cca817b47bfb9b09812c9564e86f2b5092d1263919d563172555d1371c86bdd0aa7f2f4b3315237a154b911f8c025f62917f434973a608f86728873e97f5
 EBUILD clisp-2.49-r9.ebuild 4464 BLAKE2B d9e5644fdcdcf0c12fc0702f2c1bcd458b8781b8e1885cd0a6b28447ca7f77e9346bfc696d06dfaa5be73a2f6b4db1a4511457f5d2a780dae1976e0290fcf34f SHA512 ba4afa4101c4581ae1a866f70d8f3ed903e81f95c03c26b492296dd4cd6b997d04d8f7235c1272dece85f52e2fdda427f2df65eae67cf2c65f9171b1476af0a5
 EBUILD clisp-2.49.60.ebuild 4360 BLAKE2B e26404fbf0cc0f6c3200e8c73c8ea880b8abf7e301a151453d3abb96f54a786858042213d51fea0c7de9dbf3081233cef40b8f51bc2cb5bfa386f541e9e0ec05 SHA512 2d5f81a1a3d6b7b2b23ca01648e50d3dd661cc02105b959d31c484eca26e2a5b6814fa038d2db43a234687856a7630f674401f21716ae180d95a6d8c6b217ba6
+EBUILD clisp-2.49.90.ebuild 4203 BLAKE2B 4a352d04bf95974c6e05f14aeca8cee4f2b048ff97570a21ab762483ef4040670ac4cf6cb3abb34fb8bc650b703d0044c757edebc429e2e1261ea650e18c6033 SHA512 19c71afc4935a54f64e3ac2e6b93843f87b3d09c892ab2742bd956d9fabe50cd49558112d371daadc896521cb1d37f9a39a66db63e80b6db1886d8bb250950c5
 MISC metadata.xml 1450 BLAKE2B a2d3c5142143c8ab054826effb6a0ccfce158bf636406703b1c45c5e63ae70ea0151b1982d376fc03131d8e821a85f499f98f7643b3bfc3884916c38da58227f SHA512 08cd4868b9d6f2600b13add32c2fffda8d59be7190779ef4d3bfc64ab10f13c2644b925cef0ca8f3aa06cd5c8473ef399dfaa3c3ac2cae88d627a6ad83e54128
diff --git a/dev-lisp/clisp/clisp-2.49.90.ebuild b/dev-lisp/clisp/clisp-2.49.90.ebuild
new file mode 100644
index 000000000000..e1167a08a895
--- /dev/null
+++ b/dev-lisp/clisp/clisp-2.49.90.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp"
+HOMEPAGE="http://clisp.sourceforge.net/"
+SRC_URI="https://haible.de/bruno/gnu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2/8"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
+# "jit" disabled ATM
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3
+		 virtual/libiconv
+		 >=dev-libs/libsigsegv-2.10
+		 >=dev-libs/ffcall-1.10
+		 dbus? ( sys-apps/dbus )
+		 fastcgi? ( dev-libs/fcgi )
+		 gdbm? ( sys-libs/gdbm )
+		 gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 )
+		 pari? ( <sci-mathematics/pari-2.5.0 )
+		 postgres? ( >=dev-db/postgresql-8.0:* )
+		 readline? ( >=sys-libs/readline-7.0:0= )
+		 pcre? ( dev-libs/libpcre:3 )
+		 svm? ( sci-libs/libsvm )
+		 zlib? ( sys-libs/zlib )
+		 X? ( x11-libs/libXpm )
+		 hyperspec? ( dev-lisp/hyperspec )
+		 berkdb? ( sys-libs/db:4.8 )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-misc/imake x11-proto/xextproto )"
+
+enable_modules() {
+	[[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument"
+	for m in "$@" ; do
+		einfo "enabling module $m"
+		myconf+=" --with-module=${m}"
+	done
+}
+
+BUILDDIR="builddir"
+
+# modules not enabled:
+#  * berkdb: must figure out a way to make the configure script pick up the
+#            currect version of the library and headers
+#  * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs
+#  * matlab, netica: not in portage
+#  * oracle: can't install oracle-instantclient
+
+src_prepare() {
+	# More than -O1 breaks alpha/ia64
+	if use alpha || use ia64; then
+		sed -i -e 's/-O2//g' src/makemake.in || die
+	fi
+	eapply "${FILESDIR}"/"${P}"-after_glibc_cfree_bdb.patch
+	eapply_user
+}
+
+src_configure() {
+	# We need this to build on alpha/ia64
+	if use alpha || use ia64; then
+		replace-flags -O? -O1
+	fi
+
+	if use x86; then
+		append-flags -falign-functions=4
+	fi
+
+	# built-in features
+	local myconf="--with-ffcall --without-dynamic-modules"
+#    There's a problem with jit_allocai function
+#    if use jit; then
+#        myconf+=" --with-jitc=lightning"
+#    fi
+	if use threads; then
+		myconf+=" --with-threads=POSIX_THREADS"
+	fi
+
+	# default modules
+	enable_modules rawsock
+	# optional modules
+	use elibc_glibc && enable_modules bindings/glibc
+	use X && enable_modules clx/new-clx
+	if use postgres; then
+		enable_modules postgresql
+		append-cppflags -I$(pg_config --includedir)
+	fi
+	if use berkdb; then
+		enable_modules berkeley-db
+		append-cppflags -I/usr/include/db4.8
+	fi
+	use dbus && enable_modules dbus
+	use fastcgi && enable_modules fastcgi
+	use gdbm && enable_modules gdbm
+	use gtk && enable_modules gtk2
+	use pari && enable_modules pari
+	use pcre && enable_modules pcre
+	use svm && enable_modules libsvm
+	use zlib && enable_modules zlib
+
+	if use hyperspec; then
+		CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/"
+	else
+		CLHSROOT="http://www.lispworks.com/reference/HyperSpec/"
+	fi
+
+	# configure chokes on --sysconfdir option
+	local configure="./configure --prefix=/usr --enable-portability \
+		  --libdir=/usr/$(get_libdir) $(use_with readline) $(use_with unicode) \
+		  ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}"
+	einfo "${configure}"
+	${configure} || die "./configure failed"
+
+	IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html"
+	sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \
+		"${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	cd "${BUILDDIR}" || die
+	# parallel build fails
+	emake -j1
+}
+
+src_install() {
+	pushd "${BUILDDIR}"
+	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
+	# stripping them removes common symbols (defined but uninitialised variables)
+	# which are then needed to build modules...
+	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
+	popd
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
+}
diff --git a/dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch b/dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch
new file mode 100644
index 000000000000..ae83bbb8770d
--- /dev/null
+++ b/dev-lisp/clisp/files/clisp-2.49.90-after_glibc_cfree_bdb.patch
@@ -0,0 +1,185 @@
+diff -r -U3 clisp-2.49.90.orig/modules/berkeley-db/bdb.c clisp-2.49.90/modules/berkeley-db/bdb.c
+--- clisp-2.49.90.orig/modules/berkeley-db/bdb.c	2018-01-27 12:03:01.000000000 +0100
++++ clisp-2.49.90/modules/berkeley-db/bdb.c	2018-02-12 20:37:24.203803219 +0100
+@@ -2216,7 +2216,13 @@
+   c_data.compact_timeout = timeout;
+   c_data.compact_pages = pages;
+   SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end));
+-  pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
++  /* ====
++   * compact_empty_buckets is in bdb-5.3 as part of output stats
++   * however this version use bdb-4.8 which does not have it
++   * ====
++   *
++   * pushSTACK(uint32_to_I(c_data.compact_empty_buckets));
++   * */
+   pushSTACK(uint32_to_I(c_data.compact_pages_free));
+   pushSTACK(uint32_to_I(c_data.compact_pages_examine));
+   pushSTACK(uint32_to_I(c_data.compact_levels));
+diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp clisp-2.49.90/modules/bindings/glibc/linux.lisp
+--- clisp-2.49.90.orig/modules/bindings/glibc/linux.lisp	2018-01-10 00:32:25.000000000 +0100
++++ clisp-2.49.90/modules/bindings/glibc/linux.lisp	2018-02-12 20:48:22.467775536 +0100
+@@ -1,7 +1,7 @@
+ ;; Foreign functions provided by the Linux C library version 6,
+ ;; i.e. the GNU C library version 2.0.7.
+ ;; Bruno Haible 10.4.1998, 19.4.1998
+-;; Sam Steingold 2002-2008, 2011
++;; Sam Steingold 2002-2008, 2011, 2013, 2016-2017
+ 
+ ;; NB: quite a few functions here have more portable counterparts in POSIX
+ 
+@@ -686,9 +686,8 @@
+ (def-call-out system? (:arguments (null c-string))
+   (:return-type boolean) (:name "system"))
+ 
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out canonicalize_file_name (:arguments (name c-string))
+-;  (:return-type c-string :malloc-free))
++(def-call-out canonicalize_file_name (:arguments (name c-string))
++ (:return-type c-string :malloc-free))
+ 
+ (def-call-out realpath
+     (:arguments (name c-string)
+@@ -1040,9 +1039,8 @@
+ (def-call-out access (:arguments (name c-string) (type int))
+   (:return-type int))
+ 
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out euidaccess (:arguments (name c-string) (type int))
+-;   (:return-type int))
++(def-call-out euidaccess (:arguments (name c-string) (type int))
++  (:return-type int))
+ 
+ (defconstant SEEK_SET 0)
+ (defconstant SEEK_CUR 1)
+@@ -1093,9 +1091,8 @@
+ ;(def-call-out getcwd (:arguments (buf c-string :out) (size size_t)) ; ??
+ ;  (:return-type c-string))
+ 
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out get_current_dir_name (:arguments)
+-;   (:return-type c-string :malloc-free))
++(def-call-out get_current_dir_name (:arguments)
++  (:return-type c-string :malloc-free))
+ 
+ ;(def-call-out getwd (:arguments (buf c-string :out)) ; ??
+ ;  (:return-type c-string))
+@@ -1323,8 +1320,7 @@
+ ;    (:arguments (size int) (list (c-ptr (c-array gid_t ??)) :out)) ; ??
+ ;  (:return-type int))
+ 
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
++(def-call-out group_member (:arguments (gid gid_t)) (:return-type boolean))
+ (def-call-out setuid (:arguments (uid uid_t)) (:return-type int))
+ (def-call-out setreuid (:arguments (ruid uid_t) (euid uid_t))
+   (:return-type int))
+@@ -1821,8 +1817,7 @@
+   (:return-type c-string :malloc-free))
+ (def-call-out ungetc (:arguments (c int) (fp FILE))
+   (:return-type int))
+-; You can uncomment this if your compiler sets __USE_GNU
+-; (def-call-out fcloseall (:arguments) (:return-type int))
++(def-call-out fcloseall (:arguments) (:return-type int))
+ (def-call-out fdopen (:arguments (fildes int) (mode c-string))
+   (:return-type c-pointer))
+ (def-call-out fileno (:arguments (fp FILE)) (:return-type int))
+@@ -1900,11 +1895,11 @@
+   (:return-type (c-ptr-null dirent)))
+ (def-call-out readdir64 (:arguments (dirp c-pointer))
+   (:return-type (c-ptr-null dirent64)))
+-(def-call-out readdir_r
++(def-call-out readdir_r                 ; deprecated
+     (:arguments (dirp c-pointer) (entry (c-ptr dirent) :out :alloca)
+                 (result (c-ptr (c-ptr dirent)) :out :alloca)) ; ??
+   (:return-type int))
+-(def-call-out readdir64_r
++(def-call-out readdir64_r               ; deprecated
+     (:arguments (dirp c-pointer) (entry (c-ptr dirent64) :out :alloca)
+                 (result (c-ptr (c-ptr dirent64)) :out :alloca)) ; ??
+   (:return-type int))
+diff -r -U3 clisp-2.49.90.orig/modules/bindings/glibc/test.tst clisp-2.49.90/modules/bindings/glibc/test.tst
+--- clisp-2.49.90.orig/modules/bindings/glibc/test.tst	2018-01-10 00:04:26.000000000 +0100
++++ clisp-2.49.90/modules/bindings/glibc/test.tst	2018-02-12 20:50:48.225769407 +0100
+@@ -14,6 +14,16 @@
+ (= linux:DT_DIR (linux:dirent64-d_type (show (linux:readdir64 *d*)))) T
+ (linux:closedir *d*) 0
+ 
++(stringp (show (linux:get-domain-name))) T
++(stringp (show (linux:get-host-name))) T
++
++;; usually __USE_GNU is defined, so this should work:
++(let* ((d (linux:get_current_dir_name))
++       (c (linux:canonicalize_file_name (concatenate 'string d "/."))))
++  (or (string= d c)
++      (list :cur-dir d :canonical c)))
++T
++
+ (defparameter *d* (show (linux:opendir "."))) *D*
+ (linux:dirent-d_name (show (linux:readdir *d*))) "."
+ (linux:dirent-d_name (show (linux:readdir *d*))) ".."
+diff -r -U3 clisp-2.49.90.orig/src/foreign1.lisp clisp-2.49.90/src/foreign1.lisp
+--- clisp-2.49.90.orig/src/foreign1.lisp	2018-01-10 00:04:26.000000000 +0100
++++ clisp-2.49.90/src/foreign1.lisp	2018-02-12 21:03:56.768736245 +0100
+@@ -805,14 +805,17 @@
+                 c-name (to-c-string c-name) (third variable) (first variable))
+         (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
+     (dolist (function *function-list*)
+-      (let ((c-name (first function)))
+-        (when *foreign-guard*
+-          (format *coutput-stream* "# if defined(HAVE_~A)~%"
+-                  (string-upcase c-name)))
++      (let ((c-name (first function))
++            (guard (fourth function)))
++        (when guard
++          (format *coutput-stream* "# if ~A~%"
++                  (if (eq guard t)
++                      (format nil "defined(HAVE_~A)" (string-upcase c-name))
++                      guard)))
+         (format *coutput-stream*
+                 "  register_foreign_function((void*)&~A,~A,~D);~%"
+                 c-name (to-c-string c-name) (svref (second function) 3))
+-        (when *foreign-guard* (format *coutput-stream* "# endif~%"))))
++        (when guard (format *coutput-stream* "# endif~%"))))
+     (maphash (lambda (type fun-vec)
+                (declare (ignore type))
+                (let ((c-name (to-c-name (car fun-vec))))
+@@ -1083,7 +1086,7 @@
+ (defmacro DEF-CALL-OUT (&whole whole-form name &rest options)
+   (setq name (check-symbol name (first whole-form)))
+   (let* ((alist
+-          (parse-options options '(:name :arguments :return-type :language
++          (parse-options options '(:name :arguments :return-type :language :guard
+                                    :built-in :library :version :documentation)
+                          whole-form))
+          (def (gensym "DEF-CALL-OUT-"))
+@@ -1095,6 +1098,7 @@
+          (version (second (assoc :version alist)))
+          (c-name (foreign-name name (assoc :name alist)))
+          (built-in (second (assoc :built-in alist)))
++         (guard (get-assoc :guard alist '*foreign-guard*))
+          ;; Maximize sharing in .fas file, reuse options
+          ;; parse-c-function ignores unknown options, e.g. :name
+          (ctype `(PARSE-C-FUNCTION ',options ',whole-form)))
+@@ -1102,7 +1106,7 @@
+                   ',c-name ,ctype ',properties ,library ,version NIL)))
+        (EXT:COMPILER-LET ((,def ,ctype))
+          (EVAL-WHEN (COMPILE)
+-           (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in)))
++           (UNLESS ,LIBRARY (NOTE-C-FUN ',c-name ,def ',built-in ,guard)))
+          (SYSTEM::EVAL-WHEN-COMPILE
+            (SYSTEM::C-DEFUN ',name (C-TYPE-TO-SIGNATURE ,ctype))))
+        (WHEN ,def                       ; found library function
+@@ -1110,10 +1114,10 @@
+          (SYSTEM::%PUTD ',name ,def))
+        ',name)))
+ 
+-(defun note-c-fun (c-name ctype built-in) ; not ABI, compile-time only
++(defun note-c-fun (c-name ctype built-in guard) ; not ABI, compile-time only
+   (when (system::prepare-coutput-file)
+     (prepare-module)
+-    (push (list c-name ctype built-in)
++    (push (list c-name ctype built-in guard)
+           *function-list*)))
+ 
+ (defun count-inarguments (arg-vector)
diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild
index 872d69632351..64ca0743656f 100644
--- a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild
+++ b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/Chris00/ANSITerminal"
 SRC_URI="https://github.com/Chris00/ANSITerminal/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RDEPEND=""
 DEPEND="${DEPEND} dev-ml/oasis"
 IUSE=""
diff --git a/dev-ml/ANSITerminal/Manifest b/dev-ml/ANSITerminal/Manifest
index 95c585a84d01..bd84b2a5dee1 100644
--- a/dev-ml/ANSITerminal/Manifest
+++ b/dev-ml/ANSITerminal/Manifest
@@ -2,5 +2,5 @@ AUX oasis.patch 416 BLAKE2B 36d9fe43bb37e4e89cb755add41ec0957615664d4e3f0d1ae0b8
 DIST ANSITerminal-0.6.5.tar.gz 52473 BLAKE2B 1f7f5b8dc1e7f9c2434a7e4eea1cec848f019a82a4137f744008532fac85016d3908890f2dd4cf5e8fb5c9f4aaad69cba4d56e75ab7ab57354ff7a4988a5cfe8 SHA512 43a059cc2a947a70409e19b8c6d01e1b5aa495290967f984a6d707e5ff329dd88e82ba68e08b6262da4a19bb24be2e61154fcf8781ee5cbad98240276d7b060d
 DIST ANSITerminal-0.7.tar.gz 16763 BLAKE2B 5d25cdfe02f3b6f155995208897a11a21535105caa8db682f60a1215113e507ccac294037177d0fcd52431e3853aa655ead14e2054ada1369754d39c8db9448b SHA512 986f9d7fd862741ac7039cbd92c19b847d7b2d03edfb2d0851fe46ecc9678bf4617d1e687a61af3d3b28e2cfe347a80312f9bf5c84f957de0d6c169ca4209566
 EBUILD ANSITerminal-0.6.5.ebuild 519 BLAKE2B e88ec25b4235ba7117c3540881600f6255a22ec4f04baffda4685657cc67424b53768ca4476fd89c3ae35795d67ac63c90d503b7dc753fb40a29703c098bfe7e SHA512 0d20f0f965a68cea5c684e32212f2e725d5bb4658b5138e8edb7ee28381f841cb9e9fc2c0dbde5de3ed7c6bfe363f76eaf6ca278d7766db9fd6eaee7c5695650
-EBUILD ANSITerminal-0.7.ebuild 605 BLAKE2B bf10e38043e241260575a3bc6794f29f96a8df9a41809499b9361c63d73ab7757445952487813c4d4678dd8a2e900daa9ac877cb62622d117096c182c10084a0 SHA512 d168e47aeecd77d503772f3e3724d5a49a4b92711b3102dde3adbabf010cfa03506f12263d4b31f087917aae3f05aed32fe3d1866bbca8ee7531966dd821edc5
+EBUILD ANSITerminal-0.7.ebuild 610 BLAKE2B 8504345457d1b4a3f4ad6091b9c3a57c67bc1072618491c7c60539c746332b3d25acd16c668c28a7e3bd7cee255f9d279d6cc36557da9e8ba365b23444944439 SHA512 223e5e614f081ef02ca96c77203d510f7add25cc8291baf078b5b4635e705f7bdf86708593a32b898742555fa6ea139e4348de6a76c4f770f301ad265d9a24e6
 MISC metadata.xml 332 BLAKE2B 654ce606957b2e3a4f3f301e02b320c5fcc616fd6c7414628a1dd85cf60ccf7aa7f23a3b43b5f6f919e8c482ace32380ce1d998ab9c85503ee840fc0af65293c SHA512 227751b6ba18690c3ebeea95baf04fe73de3b4f672351a1b9aef31da8c037ec917984ecba1ec4452431326b3df10674c07bf53d69cdbfcb406b535684e24ac51
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index e4f8501f7033..701223681413 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 1dcb79d66621..afccdf278c93 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -4,6 +4,6 @@ DIST base-0.9.3.tar.gz 286655 BLAKE2B 05a53a528a321fb627a2aba1521028b59741ce2de5
 DIST base-0.9.4.tar.gz 286689 BLAKE2B adf0da9f82aaa8884a99db2d307e72a40a232dbc2517b371af65671966d488f9f77e86c32425077cd513075b8a3546727f3f596eac7c46876b25198a46ac373b SHA512 9e25caee46ec09c835aa74857f415ac61adeb1ae8d6773334fa1b28699b9ebbac9ef95a698b1f324d0ad59c27ea52fea0e0df86bf4908b6ba3e5121eb8e26076
 EBUILD base-0.9.1.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
 EBUILD base-0.9.2.ebuild 702 BLAKE2B 604ee169030bb7aa3d81024da3ee846947a5dd891879d4f06b8eedc996aa145362a2af8194fb25e564551d9ca3879919b6d62d90741c39246d014485ef30d88b SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6
-EBUILD base-0.9.3.ebuild 707 BLAKE2B baab3ee38b0d261586847142a9889664a786e8a90132f271fe8be665790bd8ff79e885cedd3224d894e7bc0f306aa6076335f0c8570138b4fdbafc6491041137 SHA512 051898dde7e937f83f2b88087a3918918a04ade8fcfae7aa637bf5d73efebe6bcb77865b45308002a7dcccdb9c4e6f8a537a65eb935d3bd48eb5da3ed60bfbb7
-EBUILD base-0.9.4.ebuild 707 BLAKE2B baab3ee38b0d261586847142a9889664a786e8a90132f271fe8be665790bd8ff79e885cedd3224d894e7bc0f306aa6076335f0c8570138b4fdbafc6491041137 SHA512 051898dde7e937f83f2b88087a3918918a04ade8fcfae7aa637bf5d73efebe6bcb77865b45308002a7dcccdb9c4e6f8a537a65eb935d3bd48eb5da3ed60bfbb7
+EBUILD base-0.9.3.ebuild 712 BLAKE2B 26c21c6921e51c2314327587db47ffc7552615c5de04286e3d1461e86d96a364d90af24667b7fe69a0d3f50b21fa1c7563acc11c0061589629bad01f5418d729 SHA512 7eae087098b129eef8d7d3fc2b825b476e2b8c361f4e43d13f9276acdc412f7ee09c80627790ea4d79daea773194a0f8526074c05db5e49d506e6eb44b9dbad8
+EBUILD base-0.9.4.ebuild 712 BLAKE2B 26c21c6921e51c2314327587db47ffc7552615c5de04286e3d1461e86d96a364d90af24667b7fe69a0d3f50b21fa1c7563acc11c0061589629bad01f5418d729 SHA512 7eae087098b129eef8d7d3fc2b825b476e2b8c361f4e43d13f9276acdc412f7ee09c80627790ea4d79daea773194a0f8526074c05db5e49d506e6eb44b9dbad8
 MISC metadata.xml 327 BLAKE2B a3e0dde445b55a7e413fc654119aeac3d41b5b3956be7a3dbfbba82a6f4106d250b5b02b52f41283e7f1c44f746fbe1cdd779c940ab6d1a797aece1224a48924 SHA512 98fc8cf09cbf484d4b6c1ce63a2b422c1f66e8ba26e87990bb813c7f650cca486a973f1390785951ed2a7c50ae329859c848b165b7189d33eaa61da02334a291
diff --git a/dev-ml/base/base-0.9.3.ebuild b/dev-ml/base/base-0.9.3.ebuild
index ca33dfd699e3..05dc737ee91d 100644
--- a/dev-ml/base/base-0.9.3.ebuild
+++ b/dev-ml/base/base-0.9.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/base/base-0.9.4.ebuild b/dev-ml/base/base-0.9.4.ebuild
index ca33dfd699e3..05dc737ee91d 100644
--- a/dev-ml/base/base-0.9.4.ebuild
+++ b/dev-ml/base/base-0.9.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
index c06d08a58943..f1999de9b31a 100644
--- a/dev-ml/batteries/Manifest
+++ b/dev-ml/batteries/Manifest
@@ -1,3 +1,3 @@
 DIST batteries-2.7.0.tar.gz 768498 BLAKE2B ded30928d51bd6f6bc023803bb404a140a8bbc64d7dea3c6d63cd7ad4aacd470621a6179684772930c6e57530a57b3136711ca32df30332104db2081518f408c SHA512 ecb973c9cc535fce18db8efb1bfb9dfde73d7a7fc82cb6b0657547b6f7d173e9004015f698065ed5efeb9f89f1fcc1b548745b708139ce0d01eb6f63981421c9
-EBUILD batteries-2.7.0.ebuild 665 BLAKE2B 23d228c79b3e8d254f6c927beb28aba6286a5f9f2195747ae242c9fbcf20e018951127fafdfa9e20bbc1e88ac11f3b00338c3d1421aaf7968d96637779d64eaa SHA512 aef69324b8f9f06367f2c8604ac55c277a8f61469f6476fab6d3ea388404f7f41b4944c6b91bf294a493f320c30ab21cd536e29a9c3ae114e455deb4369e228d
+EBUILD batteries-2.7.0.ebuild 670 BLAKE2B 62ac606f17c6f80b2f888c9d4b56fadb59da1bf0478a925b232a9eb87cbd0aff8da407ec3a176a0ec7add982bb5a35b898a7b2d8bd4cae2a77a0b4f1ad7f6661 SHA512 e76610c9f031b0e818cc2ccc11326435b89791e18f5e6fda8d5f604920d7b4a514a1e4fd5df2ff63f3e42c074f7f4b612a7d947af0e7b5e29ef9698b44c6c604
 MISC metadata.xml 351 BLAKE2B f378c7afb7bced16f4ae5fac696bcc724995f79ecc49a84b3fab84c2f1bc58bbc5feb989ab8d4d5b29e5d2e0586e9e0b0b362b848c5025fe025775b37bad2f09 SHA512 12f12ef699bdbab80cb19ebf1a842d65bd53dc147d8e09568484988d9b5b8c86918c4e9afd90c27088426e8f85bbb9d2228544ac9ab4b9c9a60adadb2bda36fb
diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild
index a70e8f042dfe..7a5afefceaf9 100644
--- a/dev-ml/batteries/batteries-2.7.0.ebuild
+++ b/dev-ml/batteries/batteries-2.7.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${P
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-ml/camomile:="
diff --git a/dev-ml/configurator/Manifest b/dev-ml/configurator/Manifest
index cbfb50f21a37..d5f78125c8ed 100644
--- a/dev-ml/configurator/Manifest
+++ b/dev-ml/configurator/Manifest
@@ -1,3 +1,3 @@
 DIST configurator-0.9.1.tar.gz 10231 BLAKE2B e80deda7cf53a6fe2ef042696c5e815576a5f846e2cbe360b8b3e938ee2bd81b4e93f51141a1e10a18bb97a7b0ae41be64409bd85a9ad85eab4595ca36889ee2 SHA512 43d864d3317241dd66829747dd956ac42614cc687bbca23e2575cb1b3ab9d0c628dfbdd8f026bcd4d76cb87cf282d955d6a90f0e69543ee1ee1f01a1efa9b54b
-EBUILD configurator-0.9.1.ebuild 754 BLAKE2B 724e82444128818670586f3d9e537a8053566f9047d3901984b9cf658c9c54eb0af630eefbea265d455c5f2e91606d14e7703d1d85d1f481aef48535ce65491b SHA512 b8b2b397ad20fd75a4664db3ce95e1d597bc29a834f5b0c3063fa40408e9f005e7c57aab8c0e44c511e107101552126ef6b45dfca4f6e7c7a604d3bc0e8d68bf
+EBUILD configurator-0.9.1.ebuild 759 BLAKE2B 64a366966a07b283e36d366bb2d2f9586b077b6a6861c4e8f78ebdd2c48792f7cb4a53dccf2c70d48f462178502a9822605e8597710ed0fb22ce00213b188f9d SHA512 fe543f77813d1b892d379423199eff09b985a57b9b194f4827ddbb30312d3e04c00d1f312d82bc58148c5adf55436b7ed7d70bcc37daa31d060fe65e3becd922
 MISC metadata.xml 335 BLAKE2B 43149495ecfe838c2346c0d6c84b8faedd83a5b2bc11dbab6b1d3c6d28867012bc0c0f3e86336dff17f66fe55be92c52a770611d5565581fd39e06adb2401bbb SHA512 661360e00a85c70e5d1b28e2a4003d34fef28daa0e3efb909ac9bb748829e43ed50f5307d19c86e5c19142f64e1ab769845c583a45a2b4b93a9ddf2371ed96bb
diff --git a/dev-ml/configurator/configurator-0.9.1.ebuild b/dev-ml/configurator/configurator-0.9.1.ebuild
index 716cc43af9a2..76c8abbab093 100644
--- a/dev-ml/configurator/configurator-0.9.1.ebuild
+++ b/dev-ml/configurator/configurator-0.9.1.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="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index 8f516a8fbfe7..b72a641198a2 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1,7 +1,7 @@
 DIST iTeML-2.5.tar.gz 33750 BLAKE2B 362dcbd0a2e44842832ec5e2307eb2f291013344e80b791f1e2c3e5ffc43633f67c7e736ad3a6545197467700d043649080b5f8889b55e460748f769ca7f404b SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9
 DIST iTeML-2.6.tar.gz 34822 BLAKE2B feb7a1d7973f1710b245cb5d859d443b4c30a6128137523659768864cdd23eb18606a2b6d418d9fb37784bf2fe53fc45a4558e1565186e2402574df560a4afc5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567
 DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65
-EBUILD iTeML-2.5.ebuild 611 BLAKE2B 3e19bd3d119a8325a2a842feb9c8a180f5b9f6b3527b2b7bbbf7fedae7f27afebc6f5e324281f82b6a274c1ecf83e2d7032dda2027ea2c06a79eb9ae21a781cc SHA512 2c03e8aebb9ec9a99ebbc371ab2ca9b6fd7bed5495bc975de15197a64a6285880b5c312b3eb67c1d5c1073cf2fca34af3efb7eb530030f46c8ad8532236678a9
-EBUILD iTeML-2.6.ebuild 611 BLAKE2B b73a9a931c0fce2ed8545255f9d5ccebc2c5d319bd6954dc6ed8ec7c53af6a0299df6196b25a77f50adae3a57c8bf5e2f9604b6a5c64bafd8b956487dd665bf9 SHA512 5416f858eb98f2c6a57eb410bdddc96d4136f61e176d7f8986a0634438e647531b3be43d38f38304b008243eb744a949f7b72b5da9bae385d0782749fa64313d
-EBUILD iTeML-2.7.ebuild 611 BLAKE2B b73a9a931c0fce2ed8545255f9d5ccebc2c5d319bd6954dc6ed8ec7c53af6a0299df6196b25a77f50adae3a57c8bf5e2f9604b6a5c64bafd8b956487dd665bf9 SHA512 5416f858eb98f2c6a57eb410bdddc96d4136f61e176d7f8986a0634438e647531b3be43d38f38304b008243eb744a949f7b72b5da9bae385d0782749fa64313d
+EBUILD iTeML-2.5.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
+EBUILD iTeML-2.6.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
+EBUILD iTeML-2.7.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
 MISC metadata.xml 341 BLAKE2B efb397231b9a2c53e6229e93161a2c62c6fbf23b0b1b46441e1d43abe7485a399a6fb5cb9eb93aef2bbbf61c68b6042cd9909fed32f4fbf95a60cb84f286bd37 SHA512 c3f8f5f72ae96e9050b7c11de89ca754ac84019a857388e53a56cec3122020e06d7d6143b0cf9070f509cd62f1c32d4f52a2e4b3593a73b6fea8d41fc23d6385
diff --git a/dev-ml/iTeML/iTeML-2.5.ebuild b/dev-ml/iTeML/iTeML-2.5.ebuild
index 6f08c1457609..7047a3ea4d8d 100644
--- a/dev-ml/iTeML/iTeML-2.5.ebuild
+++ b/dev-ml/iTeML/iTeML-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/ounit:=
diff --git a/dev-ml/iTeML/iTeML-2.6.ebuild b/dev-ml/iTeML/iTeML-2.6.ebuild
index 90e9f8676bf7..7047a3ea4d8d 100644
--- a/dev-ml/iTeML/iTeML-2.6.ebuild
+++ b/dev-ml/iTeML/iTeML-2.6.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/ounit:=
diff --git a/dev-ml/iTeML/iTeML-2.7.ebuild b/dev-ml/iTeML/iTeML-2.7.ebuild
index 90e9f8676bf7..7047a3ea4d8d 100644
--- a/dev-ml/iTeML/iTeML-2.7.ebuild
+++ b/dev-ml/iTeML/iTeML-2.7.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/ounit:=
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index c3441e413c1f..6e2e2868e928 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1,3 +1,3 @@
 DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a
-EBUILD integers-0.2.2.ebuild 719 BLAKE2B dba97fd45ad1a474cd2abe1be31bc6fe02bc153627860e1f8b515c65afb2e79d2eec995712204b9e0ff32b94e4f684b98faa31a34c71e1e332c08af9f9a16b98 SHA512 21135775106bcfa74b9a752fc5ca97577921cd9cd1bb7741dfdd43a85c2272afa617577c0efacce50f63dfa0c1860d134be8d68230de5687881cb25d41375399
+EBUILD integers-0.2.2.ebuild 724 BLAKE2B b8a46e4a19a2ba854cbdfad4844e44d18da832d3ebfffa61599f37168125643c7f9973026f70317106ce58f0032b696f8509f5420cf0cd8fcccb689a269156a1 SHA512 e70e8cb10db7e476ed2590025f8b7ae23657199dce1c2bdf4ed2e8a2a8a0dd876ea10c3aa3882d59f9a426bc24db02268c1f58f53d7d4c1cc6c1f2622bceca59
 MISC metadata.xml 336 BLAKE2B f48e8874302f1baebe61f0c9f1f44ce0a9cc75755c35b8b53bad762b17847d0b9b2d535135798fa67956e15c770d0d2f1aef49f3e67e4c54449f5127f08a5da3 SHA512 b7461b0c3d899ba8cc254fdecc4665d7238296516d3ce8d2aac02ba14a65fd1352eafa20762979f9f9d4118d832a365100488c09b136c9916906608d3d718635
diff --git a/dev-ml/integers/integers-0.2.2.ebuild b/dev-ml/integers/integers-0.2.2.ebuild
index 224d5da47dae..4c4999134304 100644
--- a/dev-ml/integers/integers-0.2.2.ebuild
+++ b/dev-ml/integers/integers-0.2.2.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="https://github.com/ocamllabs/ocaml-integers/releases/download/v${PV}/${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/ocaml:="
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index abe9a8160cb1..beb3c956cc20 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,5 +1,5 @@
 DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
 DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
-EBUILD lwt-3.0.0.ebuild 873 BLAKE2B 142e418c2c80195504174e61f2e6de1cf4da37dedb7ffa2e7bb921253aac21a3c34fd36bb2b9b816e0195973911f861f6852c315b035dfc322857a26241fd762 SHA512 be52b492207f3ac8a5d07d914be61e148819509e6b8c4e263b071faa295c04e8b285b8627c349eb22435e4561189cabed42729a999ffb8be3c8f4720849e9abc
+EBUILD lwt-3.0.0.ebuild 878 BLAKE2B 29ca018034c3b02cac0f2bb438bb7f65bdf09f4518f6db8fd127fdf5dbb8d3b630f432039ee6adadd6d754d82f1d4c493d6898ec43c436799c3b716109d76a6e SHA512 6daa0c825946ae4f0362eb7ae368bdbaddb97d45a652350f0e6059a2454f7fb09184b33ce78cc861d9c81bb4dad3b139344f514d2646915bd3d4e053b3526f12
 EBUILD lwt-3.1.0.ebuild 1204 BLAKE2B 036b971a0f84a33861eeb51d85bd5214499953a06c11f77ddb5775ed258ce45955ee3de0b5c92e663e9eb73888915bc2d83009600c6b3fd6849abdb7428e73c9 SHA512 6265b5c996c2e63bead2f9eddd239804ebcb18875dadf84439b61c9f1e42bcd4ab71f05613ad7df35047d172cbb907a2fc2e366d72d320a4c49ddad0b290f9f6
 MISC metadata.xml 537 BLAKE2B a893b5cc9020877642327286bbe351ce97bc40e2108b106d738a883bb714b2962bf3a4ed85e6bcec774a851ec7d02bb61d6dc04df875b880c1b2c4ef4dad6d00 SHA512 6af3b63f018a1ff98c5431ba23ec4f6266436ac269862579858edbe4d34509c73ec75aaf6ce70e387371eb9b61212dde3b8a9612b333dd8c8bff5ce26df5f48f
diff --git a/dev-ml/lwt/lwt-3.0.0.ebuild b/dev-ml/lwt/lwt-3.0.0.ebuild
index c7d0d673ddb7..e811ad86da8a 100644
--- a/dev-ml/lwt/lwt-3.0.0.ebuild
+++ b/dev-ml/lwt/lwt-3.0.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=5
@@ -28,7 +28,7 @@ DEPEND="${DEPEND}
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd"
 
 DOCS=( "CHANGES" "README.md" )
 
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
index 6d19b315382d..5a61699a06a7 100644
--- a/dev-ml/oasis/Manifest
+++ b/dev-ml/oasis/Manifest
@@ -1,5 +1,5 @@
 DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
 DIST oasis-0.4.8.tar.gz 389565 BLAKE2B 50103f261fd4c9d11fea1d7c26abc047fd0f30ab17b871672cb1ce0a89fd47d378fd4f31d48f1a6835361ddb74761a0ad9fe4bc5ca514e470a4cf3594f30c762 SHA512 e0baf0f048647c25eac5472db0d2a22d0fcaf85fe61ebd88ec5a101c20d4916ecfa9d10fae069ba4479abb22b90c44f18312b9252727a8c7c7de4aa2d8d72663
-EBUILD oasis-0.4.10.ebuild 929 BLAKE2B b62538b7e23cfe7fc82b93e477851d0483be27e8f6c3e429e92c4dc922539fd93c30643c94770161bb25519462661d02b3d69d7ff1d99118887b440cdff19aa3 SHA512 7194f35870dd2dc21beedac39b1904dd53acfdd65607c9af4448c69d2ecf305640c9e600dea0aba2f5e658de562985d436cfb2335bc4d2bc38728a336c06d417
-EBUILD oasis-0.4.8.ebuild 911 BLAKE2B 08ae457d477a44475fa19abda91804648a414805b44631ecba3d9271e08a48ea04876af105a3d717154c785d997b39499e5824f8ef0677203345f756c04e4e88 SHA512 0f5c429a3bec3f745f80ab7f3cf9a9946663750896be0e34840fbd1db487f4f1fb2c4a5c8c258190e1ad8c7ad54a01cd0e0d73ceb653c034423b31b40de7ce4e
+EBUILD oasis-0.4.10.ebuild 934 BLAKE2B d8ffbc2f5e5d3e80e81ed636d1e37e37bc18d11112741f773597763c274029bc7dc2c89c0fee6436c66a2c56bafe270c7276c7b69f74b5e402320a0f651a3154 SHA512 ed409a6005f3accc39d4ee7e59869d8c0a9615ef3510eebdf9e40d8fce0f121139bc902a9cc434b7a2e2b005498342503903e144eade2ad894c346cd33951de4
+EBUILD oasis-0.4.8.ebuild 916 BLAKE2B 60f34a25a418dd0912aeb7506be67204aa15a74b09e149541a6efd721eb9e1ea4a28f7705d975202bfb9c8028dbd938eeaa5b5452582bf36d9635c93f5f0e8de SHA512 038a210bb0d225a6064401b0c4beee4a5f306272f1c48c63e1f6e4cbd666d6fe24704e70023893e1c064d9e26d775bcb9befb0f893c4b11d81bfd14a85695358
 MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/dev-ml/oasis/oasis-0.4.10.ebuild b/dev-ml/oasis/oasis-0.4.10.ebuild
index 0bccae24df62..03927db12119 100644
--- a/dev-ml/oasis/oasis-0.4.10.ebuild
+++ b/dev-ml/oasis/oasis-0.4.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=5
@@ -15,7 +15,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1694/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
diff --git a/dev-ml/oasis/oasis-0.4.8.ebuild b/dev-ml/oasis/oasis-0.4.8.ebuild
index 3b26058cb81f..e2f5056918fe 100644
--- a/dev-ml/oasis/oasis-0.4.8.ebuild
+++ b/dev-ml/oasis/oasis-0.4.8.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=5
@@ -15,7 +15,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1669/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index b3a9451654ea..b3f4df8c24c3 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-compiler-libs-0.9.0.tar.gz 6937 BLAKE2B d53a8312ffabfed0b137d435497b4d7953239f57176481f522cbb70fd49a1a8045850d7572830455aefff1a91c6c461c03f40392b386bacb03afda3f72e39005 SHA512 ee0751bcfb9cb75d272f7af4f7da184c0a8e348384a2481da9dea0245a4133de908a23d0a324e0353397a4f0c5bfd71d40a6a46dbd8e4acea922bad7cdc5ef64
-EBUILD ocaml-compiler-libs-0.9.0.ebuild 498 BLAKE2B 5109d96d6e03dddbb0eb890b7914a5e5f605600e0ed6168c9d5af3a4a790449f855618530cfb7e9cdc4ba20736c2c7291e44be23801b326cf6f62902e10b8135 SHA512 f5ca87489181798f8e5766fb54f5c1770e00acdac58404e28af2d603c3b870760e83f31ea8e4206bf56652214168334321eb78aad86e893f1114cdcb00dc0c18
+EBUILD ocaml-compiler-libs-0.9.0.ebuild 503 BLAKE2B 33c52b9fcc53493a2ff3ccf0382727a646ea1f22c1584bafad31be9167e581003986d58cd25693d1d933fbbf92cdc1ce3aa5ece8ad300a7d4d70f9f982283b60 SHA512 0dbffb4360a13f62719e16ca2487eca8c09bca5ea1b32fe7f1608790c92e46d4a56f5693cfe697cf9df6369cc450a7c0df5d70d4ce820829b71cb65485042838
 MISC metadata.xml 342 BLAKE2B 14c6d8ef32e2fead1993077a13af3474e398dd861e663216ffb0a0a8b7e82dbc9cc7f67da48949a6e2e78e2d6fd7dfb325dd1e5e778a255ceb2c25ccddc1ffa1 SHA512 6fc014610d8008f2215be854a93d1e2ea5759be991f7e107cbc38e5f754cdfde4ae770ee654163da88ffd1e071364e5562fd8e6aade66803f0dee7d103968d29
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild
index 82cd4f1c3a94..05a9b54ea1de 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 35b2ac9438b8..fcfa80b790aa 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -4,6 +4,6 @@ DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e55
 DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d
 EBUILD ocaml-ctypes-0.11.2.ebuild 650 BLAKE2B 1bd43c99474c52ab1e882eda377db31b244da06e74dbf522aecbabab8f68a90df42eab8286583e3eb1cb00edb07f0e3724cb64183f512ffcac48839eacc58595 SHA512 6dfd52dddec8dd6c19009ea60313cc03e7a8da66e93b55c402aa921f2aef4044973e027230293ec699e557232a8a2290180ed266e97ac89460292e5a1c527b3b
 EBUILD ocaml-ctypes-0.11.3.ebuild 648 BLAKE2B 9bb03bd6f9a5eff567892edc5d79d90a5ffc388b83eee5433b9d98a8fa91847325b211ceb7b277bfff69c276a90d462be7df10f0db00e4c338bbdf024765d8c8 SHA512 875eeac58bdc39cfde58e00880d30cc61d1c2e684d8a14a62cd98c553c1c7a3f2fb1f2a667f2577a345aca30c98704edca64fa6803d5f3bde7e17cad3c2ba602
-EBUILD ocaml-ctypes-0.12.1.ebuild 680 BLAKE2B 2e5268140218df4d052ac1df71527c1d536ec511ff086729bee964e4ad03e61bc6494fa4ed506c23b9d68ec6877305ecbc7dce315a0dffa2c67bd8424fd108fd SHA512 96801fe01b1968b7afd217bdda5ad1cca722a3da2dc8bf76a998877250f1694856d22edc2ffa9c9cc58cc05f4d3b1a489d49f1ced76374b922ca1fe13f4bd952
-EBUILD ocaml-ctypes-0.13.0.ebuild 680 BLAKE2B 2e5268140218df4d052ac1df71527c1d536ec511ff086729bee964e4ad03e61bc6494fa4ed506c23b9d68ec6877305ecbc7dce315a0dffa2c67bd8424fd108fd SHA512 96801fe01b1968b7afd217bdda5ad1cca722a3da2dc8bf76a998877250f1694856d22edc2ffa9c9cc58cc05f4d3b1a489d49f1ced76374b922ca1fe13f4bd952
+EBUILD ocaml-ctypes-0.12.1.ebuild 685 BLAKE2B 41ec3c0041cb0a2d6232f2786482dfaba28be12bd24f2af00ceff3eec21512a99ea52cba3b2c4349cf82a3d2a0f5ba371652e470356a85e091f8f4d0fbe49def SHA512 e07f03100d3893d783bd88cb56a90e356cf3c1f71d7ffc8835d124d6751170b5093497a27fcfb0d75b6fd072520e63925527658f948cfab58824c40b09300672
+EBUILD ocaml-ctypes-0.13.0.ebuild 685 BLAKE2B 41ec3c0041cb0a2d6232f2786482dfaba28be12bd24f2af00ceff3eec21512a99ea52cba3b2c4349cf82a3d2a0f5ba371652e470356a85e091f8f4d0fbe49def SHA512 e07f03100d3893d783bd88cb56a90e356cf3c1f71d7ffc8835d124d6751170b5093497a27fcfb0d75b6fd072520e63925527658f948cfab58824c40b09300672
 MISC metadata.xml 344 BLAKE2B 8fa3285bd3abb697a5a009ccd4f912287d5fe401d1f45b087cfd28587494943593c11da05de0493c3c05f590b78966e926c69231146e8b9a414ee92959a81c09 SHA512 2b6b7c412feffa4bdfab820b2cafd5fc842f2e56b045642f3c9c0ed371817917714e7f20015ba57710a366cc622a4d7883f2d40e86f7128da2aaf19a2a1f5551
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
index 1fbd65d357d0..f2c3d64f44a8 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.12.1.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
index 1fbd65d357d0..f2c3d64f44a8 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.13.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ml/ocaml-data-notation/Manifest b/dev-ml/ocaml-data-notation/Manifest
index 5405b159765c..3e78a5190e5d 100644
--- a/dev-ml/ocaml-data-notation/Manifest
+++ b/dev-ml/ocaml-data-notation/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-data-notation-0.0.11.tar.gz 63968 BLAKE2B bc01d71c6d98b5fa9aa2bbc5889e203f23b08e1e7b0c5bb5cd94170ad1be962aefb847ff6c263a52f93ec938a6ab2d2ebe7877b0c27e8018d8f05b170b13b67d SHA512 010c6105b0745c4dbf426186915078cd71d02d56e19ca01089a37f803c9d81c02a22e64184b9b4a42d44450834527a050ff20430f8c2d8a972610717f4c653d7
-EBUILD ocaml-data-notation-0.0.11-r1.ebuild 627 BLAKE2B c07a963464e6380a6365b5f6fbe69ad44a8d74d86685d6ac2be4802ff21ec223bb12662706c51740941191ec2cbf9816b3113c75c96efe903beb41518368ce8a SHA512 05087d6b305addc81e0259543b7d96543f0d91d788812ec4482e4d0799b8b61a2ba3413d51e84d72cc06e38e24773c1e79919f6e1137ea5eeb35909136db7c59
+EBUILD ocaml-data-notation-0.0.11-r1.ebuild 632 BLAKE2B c9bf8f64127beb3a815d17482f8e242bec5d9e037cf5da3bc22506b4170c4e4f65bf037c3a20d51d55c996c1c0865fcc0342b2dd2f5fb62cb44ba1e25ca1bf17 SHA512 4dc93949590437e5c85c6c0ec934589ed71ddfb94c5e21a5d1145a4a68d63631fd4ce16844eb74595d8e94aa97f211b2d5815c50a973e56aed79dc72d9f3d4f5
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
index 25ea764e42db..625122a633ef 100644
--- a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-r1.ebuild
+++ b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11-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=5
@@ -13,7 +13,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1310/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-ml/type-conv-108.07.01:=
diff --git a/dev-ml/ocaml-expect/Manifest b/dev-ml/ocaml-expect/Manifest
index 89f01367e9f1..846f697d93a0 100644
--- a/dev-ml/ocaml-expect/Manifest
+++ b/dev-ml/ocaml-expect/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-expect-0.0.5.tar.gz 63245 BLAKE2B 8435db55e74f4e245c38f75a686b91b9389e1050a515f674e86308fb270a1090827af40fa9890982ab60ab3e3c5df494accf1a54c232c06c274b36a9a8a2b1f4 SHA512 fbb2ae41c12e57db4440e67d80740380d4cd7bab0f8fdf59d3b69ff91eb6e35a82ca718cf32ad2c791ae76be8a08174a5b3a95e8910351413cc98afd3105a63c
-EBUILD ocaml-expect-0.0.5.ebuild 602 BLAKE2B 0187a7cef1d2ee57a823f0e423ff5f2c755ce064ebafd0459edf0fc586c8f801db9fe9495a0341c07805c2364853768129460748cae5a4645f0ff3602f99ee6f SHA512 d503a0c102af116f0737dc02ba12038fd38e6079202f31698b759365e833947b44cb681521290960dd4cfdb0e626e05c26247c23c59eec349e178f12ef8ec7e1
+EBUILD ocaml-expect-0.0.5.ebuild 607 BLAKE2B 061b4b73599800af7a332b382ca570586737e13b39765f258ca4c1e9199cf94ce062fb4d28a32c152e1b19e3d1070e6d0d05bb843424f005f078a17d4509c879 SHA512 cceb77b9d8471629f77189fc9c42454c9c067dcabee71eaf413a5a4df07cf027c777ba1672dde1cd9699618ae968a2b34215eaf5ee61741d08708ac4e8258eb6
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
index e0303e74f70a..7fe5e81a48f6 100644
--- a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
+++ b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1372/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 16fa593aac54..05c88814072b 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -4,6 +4,6 @@ DIST sqlite3-ocaml-4.1.2.tar.gz 76879 BLAKE2B be02c4df79f78b69e859fc465242e3e513
 DIST sqlite3-ocaml-4.1.3.tar.gz 76989 BLAKE2B d5f5e5c91faaf7308c47431d2f5292952e5c6ddf8854897aa2d54946b312bd3321f4ec6ecca7455778707b082e7af676ac50ab5b16686176623058c082973cc6 SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b
 EBUILD ocaml-sqlite3-4.1.2.ebuild 664 BLAKE2B 0fecb384ef075f5868f85fb7ea50e2bd3533554814da3b83a10a00b72f766eb6305cc8120dc9f5ebe77c9827c6ee2889635f9ec53a7b42c32062c4a8affe6c86 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e
 EBUILD ocaml-sqlite3-4.1.3.ebuild 664 BLAKE2B 0fecb384ef075f5868f85fb7ea50e2bd3533554814da3b83a10a00b72f766eb6305cc8120dc9f5ebe77c9827c6ee2889635f9ec53a7b42c32062c4a8affe6c86 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e
-EBUILD ocaml-sqlite3-4.2.0.ebuild 714 BLAKE2B 71b18be5c20de9dc931229b7f9008fd3ce5eae10ddfa459a6728422d3b58f3ea661f84a20a35d42969419b7b37577f3d9b0709a685e36e6d960435d09c550005 SHA512 5a55efb3d24ecf3ad693b02d73fe7abac298676e56e41e1ab38fc44f9163988e1162493651fb36b367dda9463e6231ffcda5a3644b8a6bc36a248911b25c539f
-EBUILD ocaml-sqlite3-4.3.0.ebuild 714 BLAKE2B 71b18be5c20de9dc931229b7f9008fd3ce5eae10ddfa459a6728422d3b58f3ea661f84a20a35d42969419b7b37577f3d9b0709a685e36e6d960435d09c550005 SHA512 5a55efb3d24ecf3ad693b02d73fe7abac298676e56e41e1ab38fc44f9163988e1162493651fb36b367dda9463e6231ffcda5a3644b8a6bc36a248911b25c539f
+EBUILD ocaml-sqlite3-4.2.0.ebuild 719 BLAKE2B 32b03d9381ac55d89fb8049ef35626206c5b2179936fc55bf51a20d57d13236401844055932b4cdebd0ccb8c2bb2681fa908fbcb5b51f5b1d80aa52a47721591 SHA512 2da2e5c41a95b4e556cc94b209dd11ad9a8e0669fb83de041281abc48b01fdd29af0d6e919b9002e5308259819f3d4dab72903560257a15516a7d99a53ba888a
+EBUILD ocaml-sqlite3-4.3.0.ebuild 719 BLAKE2B 32b03d9381ac55d89fb8049ef35626206c5b2179936fc55bf51a20d57d13236401844055932b4cdebd0ccb8c2bb2681fa908fbcb5b51f5b1d80aa52a47721591 SHA512 2da2e5c41a95b4e556cc94b209dd11ad9a8e0669fb83de041281abc48b01fdd29af0d6e919b9002e5308259819f3d4dab72903560257a15516a7d99a53ba888a
 MISC metadata.xml 407 BLAKE2B 6babd01c3c9382ec5c49be3d2eef86537509fa3c7be168c0be67bfa418964edbf1afea23bb83ce4f761b7abf9097fe913cb161195330c1887ff7fd8ea8ae3e9c SHA512 d25e7f93b44c178b2035f4ab292cd9d2dbddc904b57ac9a02be971e7bf057e0ee070e9a7baa88f36bc32c404e8e64a7b2e87b6c66b2ca2d070ef9ec4b122d2a0
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
index fdedc5618e38..ba15673a0eb3 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.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=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-db/sqlite-3.3.3"
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
index fdedc5618e38..ba15673a0eb3 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.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=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-db/sqlite-3.3.3"
diff --git a/dev-ml/ocamlify/Manifest b/dev-ml/ocamlify/Manifest
index bd48dc092a44..af8b73c006e4 100644
--- a/dev-ml/ocamlify/Manifest
+++ b/dev-ml/ocamlify/Manifest
@@ -1,3 +1,3 @@
 DIST ocamlify-0.0.2.tar.gz 53184 BLAKE2B fff11edce964a0552f9a7f130872f393e764a9413ac526d643dd575969a47cbc6a0f9c5040c0fcd3e5beb11c42a8a3a35fe55898eab176b11c659bdd74729b90 SHA512 e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e
-EBUILD ocamlify-0.0.2.ebuild 495 BLAKE2B 7025ddcf9f3cc1d9221d6ca5c3d1b87a6ad556bfd677508f807fbe55d998b560d7dc871268941fd9fea36003fbf8ae55a3faba30cb9d085c63ceda76d618d2c2 SHA512 5564a1c6624c3965a5ae2986a2df4824fb189363631fdbddabfe65961389f43b1bd6ee123550b3e835be2061a29542ae1ec50ec5581e99c0e09c234fe0082012
+EBUILD ocamlify-0.0.2.ebuild 500 BLAKE2B a4ff4a45975e46134a0854d53870b851d0603594e92a25af8cfbb9b5d3f3815f5a65e27fc36db856e7490be4e79332e871c00be7ec7949609c00dfd398e97d20 SHA512 e306f5dcb70b564b5f0925316c78aead556fcab45f93be395a88d5fbd5ee5f975c358814037f90d5dd2a5ad2f87356bedd1b16f7606ccb90433c9e178e21d92c
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
index c24852cc99df..0f54e07a5cc1 100644
--- a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
+++ b/dev-ml/ocamlify/ocamlify-0.0.2.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=5
@@ -11,7 +11,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1209/${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest
index 0b3d9d4182f9..ad76304272a5 100644
--- a/dev-ml/ocamlmod/Manifest
+++ b/dev-ml/ocamlmod/Manifest
@@ -1,5 +1,5 @@
 DIST ocamlmod-0.0.8.tar.gz 48985 BLAKE2B a153b172b14216b8e69a51c47a25cd796e6bb2adb5d0c45dac49a5bab8e99f0b8511e5e1818abe2bf86ea5280b9b1c19aa21db23ed686387c3414c0df6f2667c SHA512 beb64c109c241965f33a60b4868f5215e6c112742a3be214d3b7a0503b9d29494c0453fa5f2551bbc1975cd4b123d0b917116aeeba968d2a7d2c6fb9651a64f4
 DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537
-EBUILD ocamlmod-0.0.8.ebuild 534 BLAKE2B 7fb48dd801c5384af1bbd989fd891de8fdf99549fee23bbf685da9c15b97463053b7976365e0212a354ead69ca12445c07f1d725e19d4c48bb8f01f2946dd271 SHA512 ee71323579af1ceabfedf823f66bb87b066a1e1cee912234d65776925fed1616b765c3ac5c8c4805f9ef5a7e314aeb907e52151633f1aed56c6de4fcc602b27d
-EBUILD ocamlmod-0.0.9.ebuild 530 BLAKE2B e2a7d299293fc78a8b43654f6daab7c844f03ce97149e67b66482df965912558687d86ce1906c73e6d1d8e8c9856da5d51c5e00e4a5da77dc0a0b2ccd2eaa714 SHA512 a550972d6aa7d57bcf78b881fb4c6d26faad7ed09a1340c7ece6793b5db43fbb7fb4c6798cc9e10ea3d5ffebe61f67bdd9a8302146c95eb0a8d1f197a85fa9cd
+EBUILD ocamlmod-0.0.8.ebuild 539 BLAKE2B 75c0f2563fc1433cd0563b68ed8ea83969b96480df7e80502226bfbecc8f06d5a64a106608a59eb758b149e9a3127a718b96199cdaa47ccd126d867a0e498bfb SHA512 0b53eb50eb1ebc27612656ffea415cca3d990775220da54834bb1e31a978c515d1195b6b2b4c1d625e1bdb589bda328ddc61a6820191f8e572282f17d64a6a24
+EBUILD ocamlmod-0.0.9.ebuild 535 BLAKE2B d21c370acd942a3c4a96a59c7229daaf47ad6cdf301c6416708705b77001a87fe57899c8f1946a232e39ac9ee57a254301e86615b1f87b5dc99fa3e6b3f88762 SHA512 46b855c5625a4bf7ff465ba5e87986f49d89459884f16b43c24dbb3f7434792805d30a8685a621836caddd8cf2909e7bc880a36fd5f4a384164dd448042f608c
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
index 39ca46628855..6a49bd4c7cdb 100644
--- a/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
+++ b/dev-ml/ocamlmod/ocamlmod-0.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
index 79bf89a18978..8133a7a466f3 100644
--- a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
+++ b/dev-ml/ocamlmod/ocamlmod-0.0.9.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=5
@@ -13,7 +13,7 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
index 193a6f959fcd..a87860dde8e5 100644
--- a/dev-ml/octavius/Manifest
+++ b/dev-ml/octavius/Manifest
@@ -1,3 +1,3 @@
 DIST octavius-1.1.0.tar.gz 13767 BLAKE2B ad6f7a252ff853eb26348ce66cfa6ce9afdc4a4655d4f0c79e0f5e1ab354bfed62da396c312ca8b402ebf116a5be70afce7b26810723c2b27be37656bc63406f SHA512 db1f7da7af07d9ff1a4b1c51dbd2861e4dddab13958e7bccdd0c42494fa95f0b4277b222652ef73198f5aeb2ac44de4204459c7d1085810864958da251d5ec09
-EBUILD octavius-1.1.0.ebuild 445 BLAKE2B 2807e306266a4f7735c69b4e1a214f19f22e0b0ccc8eaff0381a29fece94985461e8242663cdd8b589dc08b90cbfc4515c433a1503e4ae243eb4b0c1bd16868a SHA512 82d33b89242592b7de98fc0d3355bdc786440497fc2dbbdc2b50bdf140b38b0ddc15c11bc5b967b9a3c418012d65457cef0d4b03e055c4cfa345886b72cbfcb7
+EBUILD octavius-1.1.0.ebuild 450 BLAKE2B 890d492333ee9bbcb5122a170202d1aaccb58eb49c1b4c69e93d1f21da3d64066afc9550b1e3342b3662c8f2d8318b8b89a7d3a4b198f3e8b80c2264cc88d0b7 SHA512 05466c47a33878bf1d50f3c08a97d0282f55b32aee80bded4724e6f4360dd369a98dd5ce42efcc9c1429bd615b674181ae46b7ee95509bb59eb1d43f699dcbb2
 MISC metadata.xml 330 BLAKE2B 883fc2b191cb8c5e65796e4970bad116b1cf1f438e12b82c5cc0e6ee0f17506a12d075d25d72ffa38d3b4a6cf4d6e23b0e1b39598f972283bf49842883a7aca5 SHA512 e5254aa0b0bbc5c3c8446b92e7fc5cfd63df2a3ff875b1358f6d9e7f9081a49641e43f0273a50c80e4eb46c7a2a067ceab7b9eee4a5a43d7acd50060d8e5aa77
diff --git a/dev-ml/octavius/octavius-1.1.0.ebuild b/dev-ml/octavius/octavius-1.1.0.ebuild
index 51cf160021bc..36135a6e9f15 100644
--- a/dev-ml/octavius/octavius-1.1.0.ebuild
+++ b/dev-ml/octavius/octavius-1.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/ocurl/Manifest b/dev-ml/ocurl/Manifest
index c401bb6cc1d8..0b406fd68f0f 100644
--- a/dev-ml/ocurl/Manifest
+++ b/dev-ml/ocurl/Manifest
@@ -1,7 +1,7 @@
 DIST ocurl-0.6.1.tgz 101147 BLAKE2B db0ff240e58bc72fbbbbbb661ccc8222bf65db70e85632094c59b3edfeef63e6ff3f2b7df73e8b1662a159b4177c38714ff1a553193dd092e9aae336b90d9f9e SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3
 DIST ocurl-0.7.10.tar.gz 108234 BLAKE2B 17b679e331fa266001744522457cc7f4a3656b97b4558fc9e4458c31abd8700fb0f55ce1f9049de7d95a1df41f6543aa36729bc10d9cb688e5e45c50960d5e3d SHA512 7e7adae7d32a39465d578c0e9a0b3b1d4baed76c41428337e9bdc86f7c948297db22c14bc61b58c28d02871a2f3359767e745891690663b63ee1334a839b49c8
 DIST ocurl-0.7.9.tar.gz 108242 BLAKE2B 0402757e9e08b115e322ad007d8b294127584ccd5470eeb3e1db667aba96dc269616e8a2782f1850ac4550533a51e49b58cdb82b077a8fd516f5c83e03fc616d SHA512 daa571279570fa1e4ecfa213b717149f6be3922c3c904a22912d04afcf01651702c8324b4b06cbff1fcc023a1f7663e8b1b1e7f14dc377e043ecf2ac09122877
-EBUILD ocurl-0.6.1.ebuild 677 BLAKE2B 2444888e08fa68892a672f7b3fb529de6fd7394c4b19ad0a962a268a6bc2a782da6ac1f6aedae0a7b6255016b873e8f60647c4a8ecdca824252391dbde7b95d9 SHA512 e98d9a43ab07331c07e058eae797897f0c6c1e2db4fde648d4a000dd0b50c23ca279a6dd87cd2e337381d1b33f02490490be2ba98e28dda249facaa6ca454b25
+EBUILD ocurl-0.6.1.ebuild 682 BLAKE2B ee47f72af70f4bcc288aee5c3f656fa42868b19cb935190d87a6294c5c104f14d67d41413f2faf27b93a4da2a1c563abaf47f2cc2aa911e6cb0bf071c773088a SHA512 d9ce7e15ddbc0cdd8d4316deea67affb3f2d73dcf4b1864f609aadb52ba9d10b8b95737fd771c00e691de57e3d243570f0c352f016b51c6f7dea3f911cd51385
 EBUILD ocurl-0.7.10.ebuild 768 BLAKE2B 1f149546cd5a8f83a1d4d53cda2672d8f32c08d15c5f4e9dd521704175cc36c2852744b4f3058eb500447a49404608d9529a060833fefb32cd4d97c63dd4be75 SHA512 3f59e918a13afe9141041515ee93ee7cbb185918256db46293d8f51d90139226232c1e1f7ac72a4625da9ae18f2ebe8663ec060788953d8cf1bad732c7c400ad
-EBUILD ocurl-0.7.9.ebuild 756 BLAKE2B 861aae62c17b744deb5ee7df5760ffe855d34c2dbfd331d3106ce1a864a72ff24bb3d0200b43de6b9dcb7445b4c29d62b43ac2917bc8778aae7b4c774d1aded3 SHA512 e7f949ddeee19b59e6469c1f5f8aee8e468b45d80192d6cec6a5827042b11803ea84f3f3b468e46079e8f1d00a8522b2f4a3c639e4d80f0425b5a69fcbbc89cb
+EBUILD ocurl-0.7.9.ebuild 761 BLAKE2B eac0a936f2bd14139c71209f5eae4a2f59af87e6559643a19befa4d45b5908c3b24859423a6da666534f83c6226c83be9263db136229898fc88724bc591929bd SHA512 984169a875b0225fa636afc1a552e77dcb8027e2172ad46468aad87d7769b76700602e81234d78816cd7d3e2d5a4fc6b5a42282a2b4d5b6ddaabe716460884bd
 MISC metadata.xml 333 BLAKE2B b04d5d9191d4548642b19478878773126f08a717375402442fde6d862c6d14f1cfa73a9e8bb5d0ec5c6e8786910038a120915e8f597c08f7492c0afcaa562bf1 SHA512 a9c21c73abfa060f261a2a1c234de7c887e2039879560e03e0a1e279116899c7e9237e3e2d3f75c99314c0e62b65139c51711c85ecac0939410c93c73cf0e1ed
diff --git a/dev-ml/ocurl/ocurl-0.6.1.ebuild b/dev-ml/ocurl/ocurl-0.6.1.ebuild
index 1b1d8619146b..39c4fd5cab5f 100644
--- a/dev-ml/ocurl/ocurl-0.6.1.ebuild
+++ b/dev-ml/ocurl/ocurl-0.6.1.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=5
@@ -17,7 +17,7 @@ RDEPEND=">=net-misc/curl-7.9.8
 		>=dev-lang/ocaml-3.12:=[ocamlopt]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-KEYWORDS="amd64 ppc"
+KEYWORDS="amd64 ppc ~x86"
 
 src_compile()
 {
diff --git a/dev-ml/ocurl/ocurl-0.7.9.ebuild b/dev-ml/ocurl/ocurl-0.7.9.ebuild
index 6dafb58c62ca..978bdea229b6 100644
--- a/dev-ml/ocurl/ocurl-0.7.9.ebuild
+++ b/dev-ml/ocurl/ocurl-0.7.9.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=5
@@ -19,7 +19,7 @@ RDEPEND=">=net-misc/curl-7.9.8
 	>=dev-lang/ocaml-3.12:=[ocamlopt]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-KEYWORDS="~amd64 ~arm ~ppc"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 src_compile()
 {
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index fa74146ee149..9ce9dda4bf0b 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -3,7 +3,7 @@ DIST pcre-ocaml-7.3.0.tbz 38126 BLAKE2B a129f263ab623827f491f573141a3c1da033ba85
 DIST pcre-ocaml-7.3.2.tbz 38445 BLAKE2B 1858ce78abc760e99e34e88c590a23b79f20ed2f31abdb991f60a124b2beee140ec3e712990ced3529bf5efb5e38d231190cf9ac0f9ee2d39c1a33687b770266 SHA512 727b129172c8c119fcb0d4ae249a3842109e3b9ab412e674af156e7bcdf0fce0bcb9561cbfe52d99002a668f0e5f145fa54d052b67a5c2eb30a1881ad4217767
 DIST pcre-ocaml-7.3.3.tbz 38412 BLAKE2B 3c9538f5fc8bc6dea0c6ceda3a2b30a48302943d53a83a4876c31dbe600752ac68498a4db9546698424b34bbd55c6c3254d47148233a845376887c30dc6fd429 SHA512 569e323dea83f33212a2aa9482e55f7491c8f83382fad13dfaf9fe624307ca261baf255db7c5837e1c6b5c64445daf05b64b9929cbd6d311d06278826bb788e3
 EBUILD pcre-ocaml-7.2.3.ebuild 734 BLAKE2B f29989e981d1e956c8eaa60ea4e8114b2d67a0f6c7465d09c0ff7307e731ed640f7db963b9a5c6b29cc2e6e568224f34324818f237d97fa9b73cf77c554fe9d5 SHA512 e0bf744183b55432635e2183382e752f40cfbaa4b912f34890bb8367fb903872f6dcfc294431b0d5ce134104fef76e1f123c72ab42bf19cdde336e299e354526
-EBUILD pcre-ocaml-7.3.0.ebuild 843 BLAKE2B 685f784ec0d55f2cc3a0801051c086379f8c9e0484e2e6e8756d05632594cab2aeef6b3fa897abc77d3f1b5409185d75812399bab3b0e05a4e43e1fcf83c2d61 SHA512 78dbddf6b05da6d0fe3ad3433978f0b9ac8756f9f6af2b01f9d8c0e1f50538e66d72606b49aba75108efd4d529f94f5155b77480fc7e94c91c59d1cf6bd90954
-EBUILD pcre-ocaml-7.3.2.ebuild 843 BLAKE2B 685f784ec0d55f2cc3a0801051c086379f8c9e0484e2e6e8756d05632594cab2aeef6b3fa897abc77d3f1b5409185d75812399bab3b0e05a4e43e1fcf83c2d61 SHA512 78dbddf6b05da6d0fe3ad3433978f0b9ac8756f9f6af2b01f9d8c0e1f50538e66d72606b49aba75108efd4d529f94f5155b77480fc7e94c91c59d1cf6bd90954
-EBUILD pcre-ocaml-7.3.3.ebuild 843 BLAKE2B 685f784ec0d55f2cc3a0801051c086379f8c9e0484e2e6e8756d05632594cab2aeef6b3fa897abc77d3f1b5409185d75812399bab3b0e05a4e43e1fcf83c2d61 SHA512 78dbddf6b05da6d0fe3ad3433978f0b9ac8756f9f6af2b01f9d8c0e1f50538e66d72606b49aba75108efd4d529f94f5155b77480fc7e94c91c59d1cf6bd90954
+EBUILD pcre-ocaml-7.3.0.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
+EBUILD pcre-ocaml-7.3.2.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
+EBUILD pcre-ocaml-7.3.3.ebuild 848 BLAKE2B 484f8a42f6ca1b2cbdf6b96a4fb4d3b24f7d39641e899808b7ad5c126659358b999b9e8866cb5cc0719753ccc8dbed1b4f01a1595c881cccf6646a5312630119 SHA512 f4f0657a24f3ecaf1ee21baf02c5e9990441fa753564d9c08c2efd1d3ea59682242694b978ff20fbd3d68f5f3c8bd4be409c974883c638ec337e156b4feb6065
 MISC metadata.xml 401 BLAKE2B 553c398cedf3cfca51af5f3e36c34d6ec28fce6b853f7c94257e513871cdf52ef1c1166d2651fd9c91b6180f461e9d72956c3dbdf959338504da741e5fd6593f SHA512 969fce8d8d459aaa46fe1d498c8485b074af03ea2ff4d66cd2013c7f45733255ee37b674da5af0fb8f11c2d6350e2871463a3b3f7167488775ce6c2e17304be0
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
index 869d45b107cf..7f1a5f8b9512 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
index 869d45b107cf..7f1a5f8b9512 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
index 869d45b107cf..7f1a5f8b9512 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
diff --git a/dev-ml/ppx_ast/Manifest b/dev-ml/ppx_ast/Manifest
index d624b38a5b0e..f73988e54749 100644
--- a/dev-ml/ppx_ast/Manifest
+++ b/dev-ml/ppx_ast/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_ast-0.9.1.tar.gz 86802 BLAKE2B 5974cbea0b2566e83d8fb4192aa7e7f802aa7b6fa02b8f638ea12ac5c617fdca1f4426e0ee3fc761c46fe0ddf2e26d4ed402eb8c21fd84ce513a60996047ca28 SHA512 4a5a9fb47282877763ecf9638e67bcd1b57110c1acfcf446703ed335b9fa5aaa1521c55a75fce6025f91e715f9c4522b695444dde4d3ffa7feed79560e399ad7
-EBUILD ppx_ast-0.9.1.ebuild 517 BLAKE2B a95c251515f9b46f19dc476aff3f2be0310f54934c635eefd1c6ba44972df20a9b810f8260af716b10cb4588ae873fd9e43d519d5d67312eba0d90204b5aa28f SHA512 5ed94aee500688abfc5d97b88f7eac2e3e71881e8be7da4e9c2bdd8769377aa885221e62abfdfb6b626ae8909da4a6bbba899623e0de7a9b47dc8a10e5fe5156
+EBUILD ppx_ast-0.9.1.ebuild 522 BLAKE2B 6740a54881d877ff4854786735a5bbce28641dfb7908e90b9859ab85ee9598f76b5b3b3bfd4920ab18c604e3419ffcbf939675028459ade87f97d078d8f3c2bb SHA512 e3fa3c5a3bdeeb30a16453d53c0c23faaa470680462e2b14c7613600352846c613b998f7486a2b8bd23cce243083dd362aeeee082fd5571c84eeeb1129595789
 MISC metadata.xml 330 BLAKE2B 45bd8a24597b6cb2c9e2c3afc981fb807ee8c74dfb21b95d176e782e1634b69eee9865dd326ae9f1b42c0423a95331dc479635e2e81dbe8f7f2d1089449b01bb SHA512 178a89117b6a953b7d730c223c63d241c7d7b83ef28f7ec53cd6bd77bbb22eea8417e1d5b0ece7cbcb716b7ca329dd160e9078368138579068eaf1702a018738
diff --git a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild b/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
index 9cc608f4feed..acc14d99d440 100644
--- a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
+++ b/dev-ml/ppx_ast/ppx_ast-0.9.1.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://github.com/janestreet/ppx_ast/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
index 0c5dcfe27027..bb727e7cec12 100644
--- a/dev-ml/ppx_base/Manifest
+++ b/dev-ml/ppx_base/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_base-0.9.0.tar.gz 5255 BLAKE2B ba5d1670ba0da8c13c30dab65885cb9d406d7259ca57841867f4b2c7720f8202fb34074b5bc8f03cb0858427c79e61d4a33098c846c61ebcc98d40799ced9274 SHA512 660f6b210eb6d7bd33c279ffa8bbf01c21b9db5d7827cf6fded8c52e8d4f2f5468a76c2eab86c2b868ac859bbc81db7189c71ccc1701bf57030f82d8eda4339e
-EBUILD ppx_base-0.9.0.ebuild 630 BLAKE2B 27c1ddb8c745b4a115ae59e9e342369eae6e8b65a2b69a02ab6306cbf7e625dc0ed70ac23336523c97dcdeae602b04cf72ffd85419276412a2072aaf889771f1 SHA512 a3c5a260f0955dcd077ba74f5fd7d9285b4a28c8773c5aa0d6d4e8995e613469c99149715fe49060c7deb981a05a401a9dd8982aa5c617a13209d3aa5a1b2cf1
+EBUILD ppx_base-0.9.0.ebuild 635 BLAKE2B 7c0da2099b0fb19f7eed2f360b81a86a037792692993df5bdbc9a4cae1d3c6904d5e7f63d737315bbd30e24934a271890a1b4e8f3f61ae07dfa344affe8fcfb7 SHA512 a7643e1e9196b7a1022b88be184897eed4958c5b418d214ab8f4d72b24f12577426e750e9ad411265c09d263d2ca3a8bd23989cad92812abc57bc5165dc25261
 MISC metadata.xml 331 BLAKE2B 029e624c079e865462849ea5700728cd16396d0552f43065bdd1fd3b77c2dba8fabe3c74669538872df54a78935b408ab8ba356bcf6d53a45a7d78c7294fc125 SHA512 82e7894984449057906d667340e5aca625be82c641e2924072e48a2f7335a4c400317e9cbad5d2397f984a0a942819cb9bea42a5101c76c32e5ba8b9fbc93d49
diff --git a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild b/dev-ml/ppx_base/ppx_base-0.9.0.ebuild
index aac278c71193..fba5ad20e4ae 100644
--- a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild
+++ b/dev-ml/ppx_base/ppx_base-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 338e43884eb5..1d434f906b87 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe
-EBUILD ppx_compare-0.9.0-r1.ebuild 598 BLAKE2B 9b17cf21d6ae9cd2cee29af45900bc4673459952100ab5a7be431e9fda932b9c0ba56e32f659b90f67f2e19d89ec22b2be3a45c7827884522e9ab80f4da258d3 SHA512 01a3077b1838e41dbc7eaecd5dc8592d999a1b0476b0136c75df22973ce4baace0b8fcd72ba92e27ad87f7287e30cf3b40d73ec137faf306b6f4f2d64bfccc62
+EBUILD ppx_compare-0.9.0-r1.ebuild 603 BLAKE2B 2a649d2d33fc23a391ef4ed979e5785dc1e1e6bade572d2946d170c3ede8441e2061f543c6f01e9d068c1c83ba76d46a9827e18d03045f7ca6fe1678b94cdc75 SHA512 4c042cf01de3d80cdb34ab804d0337d1f85b00fb64e4b7b0d9d45cfa4c181758b300c1c8a85a56b8d0393f530adff8c403a0398508957bd49a3b782d6f37fa5a
 MISC metadata.xml 334 BLAKE2B 32f4e66b9c595698fb862c6fb5ca680ebf14010feee47972823365f5984dda4c0474fec5e430c97fed26bf2fd167b0981f06f1476f47ade78e190ceae76c0e16 SHA512 655c5cf4ec2e1d8e14c3c7e72e964e6bb1ddd1a620675ec140cd63b2c4b70cda83234aeae10d4b8c6cd41386688f3bbe3bde4c83585437d74be4f0f629be3ea1
diff --git a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild b/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild
index b1de7abe2612..078afb1a0109 100644
--- a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_compare/ppx_compare-0.9.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_core/Manifest b/dev-ml/ppx_core/Manifest
index b065f336ac8c..7cab7faf9717 100644
--- a/dev-ml/ppx_core/Manifest
+++ b/dev-ml/ppx_core/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_core-0.9.0.tar.gz 44525 BLAKE2B a2d67d6ba07217446af11f0e7030197f8894fd271b9eebefefa03a01ccb8692b1d866accf192926ea9193d639e1c551b085875baf877eb396d5a75c847378ec6 SHA512 04b0e096aa545c27f040feeea8745078e0fb9dbe4816ade6d3f39b6690da669c6c786334381dbccd74dfd46514ae88c6475b14db8c3216167a6acfea79601e06
-EBUILD ppx_core-0.9.0-r1.ebuild 595 BLAKE2B db039d3aceb716f112029c4cadc102433dae91bd688386edc58238f4c46db5b07b0e4d5f802a4d417710f3353aeb017989b6a49b9aaf859e7870df1087fec002 SHA512 9a06c9e19f01ef6ffff4f3f186e6654f1946230f12256409e421ad0f1acc9e9a81d5835465d274f4c0fafc28db010ee57c3ade3bd25d3623975974ce63deef8f
+EBUILD ppx_core-0.9.0-r1.ebuild 600 BLAKE2B b6e77ccba23ad1f64c69813d9f23b05e9d3d64768e17d5eed725c62cad9a71b9a2a64706fd7c8ef0711cb3fd9809868af6d3df3a18d8dda5429a60d7efc0498a SHA512 9b17fa080088dc0249c1bc57018879fdbe185ea5179c574de57a0804a3e5e94a6cad9dde55da8e59110d89788c10de15e3b9bc768499e867e7213fd2b6b85d1a
 MISC metadata.xml 331 BLAKE2B e4aa2a3e3782eea408bc2b4b5a32f19e48e100b22dd79a955e59d38fe1a399940400a7eda2ea327f2c93830f645f090ddc81b50a54fc922262d92c88320dce88 SHA512 a8a8a4542c5ab077b314a3dbc586e013529424e5a39b03eee87aadb713ef9df2be408907a8d1482c08b96f9deb646e027b1815359ff4a4b3aa33ca6b9d68310f
diff --git a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild b/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
index 18dc742c243d..b7479abd2f4f 100644
--- a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_core/ppx_core-0.9.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_core/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
index 91d39d683527..3158d90a9ba2 100644
--- a/dev-ml/ppx_derivers/Manifest
+++ b/dev-ml/ppx_derivers/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_derivers-1.0.tar.gz 1467 BLAKE2B 94946c5d04e314bfbe146534fb19e88a16670dc3f5d47c15496142dd9a256ebbe4387f24a9fe31b1aee804d064bea0a9136685372399a38ac82dedafe677934a SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85
-EBUILD ppx_derivers-1.0.ebuild 421 BLAKE2B c2decab87d0ba1df4c4aba28f108a405f64b63c55e0784df9afa1da42e7bac57242b6510909ccd37cd6c526b652e6d96a0172df0e73c981e1b9519cb9b481d50 SHA512 8ceb8235aababe1a94ae92b9c8509871ecd5d5e5005e0a8c9c3c4a9283ef1ef971e0b44ed9b78040c4a362637f7c239d7b07c63f73670db7845b87ba80d50388
+EBUILD ppx_derivers-1.0.ebuild 426 BLAKE2B 91552788b46b1a766bbf3b4ab91f911329a9a02665f0ebc045e480bd6da9accb939672ad08a54d8ab2d494e852d5189208444c43e9f41b74d3dc51cf6e1ea7fe SHA512 9c8aaf21a446b609d4223390c3f3caa77425f96c177a2869e74615295ffee80e28d1efe75b0186b65c5c30162a9bdb28bae009ba9d38080ebc48fbcf30deeb63
 MISC metadata.xml 329 BLAKE2B ad849b6394c08527d905d42a74e19606ebf2454b26f4da643ce463e87f803fe09a60cedad0453374b046b0166ba5ca23abc65add6729f4bc382ba83d509e6e6a SHA512 534d8265ad0bf37d4ef37219869b5f98c23537140fe035b5a987b2e0c3e84414d7ce2c6c789c4108722cbcacb6168453a3da31308e62eef9ae2de56dc87708c0
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
index 33c357da29ff..b991aaed688e 100644
--- a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index afc2ebb0fc8c..0db4a3fa5402 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d
-EBUILD ppx_deriving-4.2-r1.ebuild 1193 BLAKE2B 9830def7ad6bb2a409ae4d2d66385db4243c2ceb09a8ac6300549a9a32969d4e5a448d0afe91c5c01274ac1b768a896d4b3124c750b62d0b4b3375c54ebe518e SHA512 e73a956a55e57e2153c119241d89a5b2d68517629c39a13f9cff23df68df818a4b950525a15b4993f8d89910c9c003b8c5592ac82ac70fd86b0c1b448f47236e
+EBUILD ppx_deriving-4.2-r1.ebuild 1198 BLAKE2B 95abf43c17bc7f804c0480fa11cb4203f70531d806781a1b585c7fee3f8f74a79da76427770b38f80973033f3176504961e6011354b90b7094e879ee48f1852d SHA512 6bdc1b8190f7d5b02e01db5123665bd7f8bb83ed38e72cc964a4590f686cb6533450aba2ad5a1873ed6629d193fa2ee56e89f16038a2180def522b4df5b4a4cc
 MISC metadata.xml 334 BLAKE2B b7a3e0e2b9b25814835b3e4b609e647b27feeb7cfbf2c508ea044a6be5a30bcf77a4c0bed155673788000dd60be25e9ad00a04ff2fb83b707290ad5d34c5c5be SHA512 4669e54f280de3e751ce8130d3df889fac540c201dfea25cbf116b8e47b682b8d3d48f13e238b684c13fcaed224d5271708dc441e924e05760fe427e6efc392c
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
index e0d5d36b4b65..0849fdefe983 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.2-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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc +ocamlopt test"
 
 DEPEND="
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
index 6e272e5654d2..cd7b443c0dfe 100644
--- a/dev-ml/ppx_driver/Manifest
+++ b/dev-ml/ppx_driver/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
-EBUILD ppx_driver-0.9.1-r1.ebuild 579 BLAKE2B d2111e5f245f988407e88d6106c01c7d2abe75e2cdb0c4494e168f22781587abd15970cb333d30c10534cf8662e8c3dda8ba3a1d5c18575e81cb76bf38f146e5 SHA512 54aaa692b1dee2b5c85dd39ea1a007660020e99031065ee917069459704e93cad48d5f93b46b14fb6b5300481cbc6c191d030312aeba2b7f827e2c5246364377
+EBUILD ppx_driver-0.9.1-r1.ebuild 584 BLAKE2B fb729e4ae41008ce616f784cee3a81048c46df5e27050b4118937b7fe71b738cb75813c06db95e161dcd43c587b8659d43e8927c59b9b9057e51ae826925824a SHA512 13c48ae64e7d2c8f2c5e39125873eb573d2aace46ad87989e11bde24d16b3bc4ca47a340322adec8a22834f74495e2f4dd7e6e1436932bdaa45e469f7f46ef91
 MISC metadata.xml 333 BLAKE2B 968ad46caa7f80948178a2f41ddb2a6ded0315f9865c953b99a523d3ff44a75017cac2064aaa1276767509c38bb0e0fd577cfe2a60b1467651f45c1909027995 SHA512 1cfb21c42adf5c94fb02f4621ed9e77acc832ba7c0d7bebee338ff5f617431e5a0a682945a22cd58143fa5cf61758c70694a6f2697a6b1a49107029e31fe738f
diff --git a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild b/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
index 42893f75110f..c950b017789c 100644
--- a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
+++ b/dev-ml/ppx_driver/ppx_driver-0.9.1-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
index 932c6f50d6a2..34251ac706dd 100644
--- a/dev-ml/ppx_enumerate/Manifest
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_enumerate-0.9.0.tar.gz 10967 BLAKE2B a5e742c5009c16d07cb23d7fba8cd4d41cd3f2ec543f47fce65c3731bb81b140a601ec492c0f5f8a5a62c2ac64f41a8093a7e5c96b251ad3b85944aab19c167c SHA512 46e979528af75313fcbfee4d1437156ded90d46f7608271a77ad41bb7e087e2ea4f61f534624b23679c4edf812d2fcfe26b9b634c3fcb691e2da2388ae04950c
-EBUILD ppx_enumerate-0.9.0.ebuild 593 BLAKE2B a87353aa949cb8a6c7f06f1c5dfff28ff084466e978811cfd8ef3a5eaa24120f17aaeda1b5b63ff3ffd4fcdc4481006443f2f9b95ec45c8a637473d9c68acfd0 SHA512 e75a19caa3d12c12707a1108e1e53d4428a65b90e2ec577dbeeba5865f3c64f9cb6f51eecda05bf02804a1a96960cf8d808c191c394caccf607d763ddd73f8fc
+EBUILD ppx_enumerate-0.9.0.ebuild 598 BLAKE2B 2bdb21355e0fbf93fc52a837a304a67ea2588aa1737d8ca5f26623f7cf4c6a425975bc74a4deae78b6e61e9628b52f5cdc73dfb39c5089ba97470fb85993ad63 SHA512 f9127b765f4fc1b644dbedd46167330af272ab1d4647e9b5043de00e9eebbd235ad1f2d97f36267ae6905f7863ad2cefc01a3d7a80e809686f0f756a140d189d
 MISC metadata.xml 336 BLAKE2B 64c8bbddf558b85b7b5ff52b397bad940b6b4ec15e715eee80f439c7b76345de667e678591a1b3eaf71aef7e06345d505a4c58a31e28e3bd9bd20f6a3325e934 SHA512 8796eaa23dc9980baa55b64388baee0faf19dc4d7b596ad355a3cd126f57b7e93f0ad2d4acdee4e186f0952872151e77fc402abf4388b94b6f1cee8e2c51e056
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild
index 64a8a340f0fd..45aac67b0624 100644
--- a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
index a951eba83947..7af70e784aa6 100644
--- a/dev-ml/ppx_hash/Manifest
+++ b/dev-ml/ppx_hash/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_hash-0.9.0.tar.gz 26942 BLAKE2B 589b9fe1ced89c0dbbc9d3472e21c278a9d1d29c1ceaa3a19ae853727cb4fc446e67deb8b63274ccfbd95fbfa49a5e8cba764bf2a3ae26bb994c9fb16f2b9f32 SHA512 401a87f5cc357ad50fc23f2450b84d6113cd79c1d2506f6e95476795fde0f3240ca252fc3bfe083f9ee1d0511ea3909481387ecf597edef6f90f9756a5a97096
-EBUILD ppx_hash-0.9.0.ebuild 676 BLAKE2B e7053012298ce82bd6993163d485474cb456e95b271a365b8794307bc50c3d7f8c97e99adc5c7b06e83da66b9ca967483ab47e24d669c4b24201eb38225f105d SHA512 f800faffc74e6f47a5baf0ee9e30f8f81354c606791d51108fc1f6193598f2ad84375dfa14da85316c7eee478c1acceb2b9c6a46ed10af512c5b58a1fc1a650d
+EBUILD ppx_hash-0.9.0.ebuild 681 BLAKE2B d14ce12eeca5d14a1c6bb9bfaa06b5337af64bccd943e7eb7572c9b91011b7d49ad2977c16e81272e151e5575a5d163099ac1159af22d5e7c76b5ff3d34a2f68 SHA512 33f1de12502e0d160d7c1ac5939c943c8402edf41afd3243e96649d8d4ea37310f1c0153b9ff2137c27ccbf077e3dfdd9b89466e75b1b73ba2826b8efc28de26
 MISC metadata.xml 331 BLAKE2B 37282f7cb8d7e5e713a0676ca770c81f60e2abb040028e428a348732c2a87506994ce57504725c12ab1bdd18edb67581d761c1bc4e83e742f976df6d6505b967 SHA512 d4452d613af60b217afaeae854ddfe6445db514079ae519f7cfe90ee3cd2d584ce1b42fc6716433b288e642f31c80fb7f9da63965cd7d0f2d835842dae1c9775
diff --git a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild
index 24bf49cf6ef5..cf6dba57d056 100644
--- a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild
+++ b/dev-ml/ppx_hash/ppx_hash-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index f5688ece4585..99442da70b22 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_js_style-0.9.0.tar.gz 8182 BLAKE2B e2c4bffb07882d49f3839b2a402e2617b9e19147a0d4ff4c7aa4fb4a350d2208eccd76ec64828c4d56edce8f811c462396aa805ca3440b93ba22790d59c8dd23 SHA512 9790223a2d8f6db090cfa4d7ff3d3d1c8a22b07863dd3c5674216836b23cfdb3b014ebc092e173ddfe725ccf73fc7830a8a88effab1df9d80875f918b9558051
-EBUILD ppx_js_style-0.9.0.ebuild 577 BLAKE2B 03439178931956d485f883aff8dcdc211d4c15bc658c56a06ed3fa6e6387191d72d575c81fe71d102c774bddd642e609f7906fefe758ff6114154d93e6129e10 SHA512 45f214b9cf35557407585a27290b0b7734bb183ef25f4b1febefe5d6fafb1e2abbbabb95723a7d5c4e195a4c3e4e0920b0d56494fa50f130a35d6c7c8a99c828
+EBUILD ppx_js_style-0.9.0.ebuild 582 BLAKE2B 53c693c0bfdf52c14b48e4e60bc5ea791ff7c416b4bb60e45aed57ef15624e07fb2a60a2caaeaca0461d3093fdbdb3678540587654b5669bce40e92f90213d09 SHA512 c6a9d80217ae323e284be7244f38955495a852168de81c5e9137d1a470f2e8ab5b2e670c37bf88fcc8f7953a56b4fba17d7854bfcad101bd5964055d3f2f528d
 MISC metadata.xml 335 BLAKE2B 0d29994d7d7ca3c159264f75ba89f9774d8c59be7aa27f44bc18d1a0d21d6ed909e2f66f9c22931f463ba5ddf2d4144f986cfbc9d3a357eb8a0135eb339c268a SHA512 a8b814146208b31af8c1b4ba22b9eeb9461ab218b192910eafb0cd3ff6b2c734e9c14d7b4d52845e5338e7def081674d3c9fabbf7bd085648f9e9800a933bc5c
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild
index 068cc117ca64..4e4459887d20 100644
--- a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_metaquot/Manifest b/dev-ml/ppx_metaquot/Manifest
index ceb323fd3029..729a63b9275b 100644
--- a/dev-ml/ppx_metaquot/Manifest
+++ b/dev-ml/ppx_metaquot/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_metaquot-0.9.0.tar.gz 6801 BLAKE2B b5629da4c2460ed064e614e0051bd104fd731526498ffd085a75039672c186f314918c4c355a9dacfee7982c06b338950de0a670b27bd061e19b688a21693c08 SHA512 7645f02f964f2a33836f947a725384f95c7724dcd88c031aa3dd2d255127a21d473e19ff77cb917f845930ab44541a4698becf56721cc1a0a0eee5912947cd22
-EBUILD ppx_metaquot-0.9.0.ebuild 589 BLAKE2B cde7f8795cddb7f46f36fd14e7b33babc4b33a07f50e2d602ff69450596c0b04524957591165b456c14c294756d22de138aef5f3dbc1c305c4c8d298eab12c01 SHA512 556ab9b9f108a6523fb93249f6874a3f80fb3bcdf942bbad35b2ec324fd3291c081d76c9f20dcf8313b24fe8a294b8165691d4db53eaa5d00119145cda74f52e
+EBUILD ppx_metaquot-0.9.0.ebuild 594 BLAKE2B f71b7eb1e1bb1603f15582c62e35ea6da4f9d9bcddb4f875e324f3e4fd080bfc1415a86bc8e1baa3e10917d8333cc16d5bfbd12e27cff776801d15cef2dc2a69 SHA512 78cc5d4fd248e0a277e61b34e0c85fbb700f5cedf4eabe331995a185a13747fe9fe66457edac74c97367d6d519359a939f547fa9dd0b08b0d1b5c5afbc1c2d1d
 MISC metadata.xml 335 BLAKE2B ff4e6872b981bae944a92b8741855871ac32fa926c976a012d48c8984c54bcfb9984fde268aea58c3efede44bdfd4476efb50b8b9972d06b563180ca1b7ebfb8 SHA512 a4d14e881ec67436fa519f5a937bd9a496d88647a0ef4ce1748c8d04092b30aa08b8b670f07a1ef0e2df27200a56442b6fd03d252c4e83997dc261d1cb526dc7
diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
index 940de0b51a71..2cf71db77f80 100644
--- a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index a29b78c9e5a1..3ff880aab1ae 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c
-EBUILD ppx_optcomp-0.9.0-r3.ebuild 521 BLAKE2B 9216d8faae7215a962f2342baaeee3d5a41b5672b63b246f3e9cbf97678aeb857934f57177cf0312ef151e61d062ee675d50b57594c35ad0a434c113174c29b8 SHA512 a2765bddde18f213157d4f5ee6662251df24c85a698dc2740dd7ab735cc1eac322a8ce3ed8856705cda2c961e0ae550d04e77764e9a70eda359517684adcc2e1
+EBUILD ppx_optcomp-0.9.0-r3.ebuild 526 BLAKE2B 78ff4bbfdf7781a0ba8a6b6a5fd0b6f2b432c3f247d056a34a3ad4a2fd11fcb139b3d6ad46e166896f492fda9367fcbc0cc8180d5bbbac243cfa75e7ba5c4b99 SHA512 e61daab3a1868d7348ff05977bef647f6be54c4883789265f38dccfb3b8d9311b3c3599c59fa374ee8945454baf91634fa859ed060e04cb98457543aabdde967
 MISC metadata.xml 334 BLAKE2B 40536899fd47128486c8f676fe1963c6e2de64f1e6017de8945f46325c62118db6642abd6488068fca163006fe31fd5bf684768feb62ddbae7ef75cea119342b SHA512 65cf194ca0b988ab6f13026930011318c27efdeae8dde0bf54e0262334d290b540a9f19cf4476cc7f2a6920c89bb501d20ad9cba8acb1cc10a01f9a124b43236
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
index 44140740f37b..698b92bbb14c 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.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://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index e4762de3b223..8a622b6f08aa 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845
-EBUILD ppx_sexp_conv-0.9.0-r1.ebuild 667 BLAKE2B 9bcfebef9769033c4bd76a63ab6ed0b0aa1ab765a7e3c702052e9f3bf7397f51015e302ddaabdc2090140278b28cf49c193894b49c52e8f1729fe539cbc9aab2 SHA512 77043ae97c4d80b18c5e66d557c2140fb77a8912760e60baba095c478d4c21c01cba234176985b15aa1b9d8ae378dc7f2e19c3254487aa75d770b1ebdbd84224
+EBUILD ppx_sexp_conv-0.9.0-r1.ebuild 672 BLAKE2B b69d608e4a8ed118085afff45f91d08621b302d08a87b06f2dd6fffb75f799f58352906c3e65519aa3f3f66348f151c1fbb0c289877e24b018f35809b932da1c SHA512 e5eb7f825efaecb7d4dc53e854e3d97eab0b89cd08c2cb9640b19082cb7d2e7aadf8a27a7a3de610ad4216a642fbb908c9249dd4aa7e8f2f57f19b30bdadca83
 MISC metadata.xml 336 BLAKE2B 44d3e80050093eb93baf425568ea0f4bc55c86931b0ed6422945c60cfdd10ebd6fe37998c94ed60e844ddccb876353f51e63385f783512fb8950e67b66c88d34 SHA512 88ef4d5c81b2b79d53153e588c8ddf456cfc53bfe22c8532669e2c9ace9bd43c322a0d28df32c6f293c455027f4386f554bc50a27d55b605f8785e67a7a7e1e0
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
index a3f4d5c1d5dd..9dedc0888a68 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index cc7e266e6ba7..e7a8d37c97e2 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,6 +1,6 @@
 AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
 DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
-EBUILD ppx_tools-5.0.4.03.0.ebuild 808 BLAKE2B e3d975e05bcec61d012ccc94651e7613b2552f5004800b20fde67ce0db980ae75563d54d109d32392ec1a11221be51276b5383d0764cab4bca9cf34b39af1e2b SHA512 0ac1bb42288129bc1060b0bbb230a4a4becd88a439105936ac9c1dc2f7d4dff5305b76893fc25394bf3bd5bf58f306214cb1d3bf8c9a62c022518607ee0e4d67
-EBUILD ppx_tools-5.0.4.05.0.ebuild 711 BLAKE2B 2b1112f5b7da003fb6d3806e324bb459b1e573b9d56a2ee3ee002a78eccc3739e3b5c0c939bd7948a36676daa82dbfe05fee1d5145fe3768a234919e8c6d38e7 SHA512 298f93f131a3194c0fdfd4cbbf75a4f148290273d579816f398a0551cde42ff48620d0ecc02d5c0ac0ee349a91d867ceca2c6eef5a9f030527ec03329cb5ca36
+EBUILD ppx_tools-5.0.4.03.0.ebuild 813 BLAKE2B 1f5897d4905c89e741e5fca93d922e81113a5ce26e376c9eb95fc298ae77c15308af7133645e895d473ba75259760f1f509ec205a2e074fa17c710b336de703d SHA512 8cce9af5162c38603b538a91c35b82163ea96c4fa49f01eb6d71d970f80d62cee549d7abc38a367f2e7ac40b7c961f3e58d5759c318f4157580f781f49fc30b0
+EBUILD ppx_tools-5.0.4.05.0.ebuild 716 BLAKE2B dcd835e06c7349df3bb49c16c14378e5b90de9ece37c478b66b5bd35f116c66d65981aa12322505e48c60dc07ef393c5181e3609db26302850bfa5fb53cb33fa SHA512 991090e274d2897d872bb706e2295d9964a1f8182947617683d7d054ac80501586dc4e2239add6c18effce80c6f78f0022ab28f46d942b51ec975cf5188ad1df
 MISC metadata.xml 343 BLAKE2B 74fea15b992b811ea11c6b9e536dbf79bbd72329f5d62b200e7d320816f6470969b92f06a0d0243a24e4063d3190e3c1a2c656b8a8209fbe86332741d7a0da7b SHA512 af6d8ea7cea8aee25e51afdd9b2f6a8353467a67089121d3dfddef55ae48b31f8f3e539cea90455d0044dba784ca21b6af4be8eb55a455c97827b7277ac37aff
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
index b77cef7d6d73..3b440d54aeb0 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]"
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
index 2ec6b114e829..28e7b0d5bb50 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
diff --git a/dev-ml/ppx_traverse_builtins/Manifest b/dev-ml/ppx_traverse_builtins/Manifest
index 0591f8c1fd23..1470699f6066 100644
--- a/dev-ml/ppx_traverse_builtins/Manifest
+++ b/dev-ml/ppx_traverse_builtins/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_traverse_builtins-0.9.0.tar.gz 6328 BLAKE2B 1e111d97876fb97826a04dfddbd1289e4b64ca93cb09e2f8692fcd5c1b87eb09259938b31662ed712d3e3926cd3b8edecf967d85ce9846805c74b28a4359e02a SHA512 c8d77138f8fcd4d440870eb9126f5aca2d9fa917fac6bd9aa7f6dd4fb3e75f5860efbdc312ffc23b375808c33e1527726318918bf7bee61f470ef3a2cb40f6ba
-EBUILD ppx_traverse_builtins-0.9.0.ebuild 468 BLAKE2B cd63302914b2bb67d252a580e4919eaf14fa7c6af8c0b33a368087b720315b459300a52658332244f1124d0e86c609b687888e4904b947e3e3beaa8e6713d334 SHA512 5fbe262bebdab202a13924dd7fde820cc9a814c8c25ff588ffba845758956d8c1b28b90240fca712bfe43151a590ca11ea70bc517678f5448e1c544ed0ba0bc3
+EBUILD ppx_traverse_builtins-0.9.0.ebuild 473 BLAKE2B db026b980369efc4ca5549653a0ee251fc5ca06441cc0eecd717e5bf5eb7eb932ff94b3bd56f6c0fad03b99024d43543a4db0b983e10d20c0e62b02b35da3ee4 SHA512 70918525a322d61ee9f0f58532f311fb7cfbf60375d2b9b1a5e0daa430983378aaef13d2c1b6ae85e70b69bbb0c5133ddf9762dcc92d9aacdf811c60918b0651
 MISC metadata.xml 344 BLAKE2B b264bdddf539519b33824f51a4db6478fe054d7b1d9d2c0590f3f93bd1230cb54392bcafc3da5164ec14e8aaf3ad9fcfb43cd547bb0e363d4d8014f57f588a85 SHA512 3ea69d826091c43f6b73d688cac7c96aec0bcab05f3281bbe31bb3342247d1a8dc19fa081edbb84ca62114081d46dedbd7042ef3ae3b9520f1d5b70a2ec9cd6d
diff --git a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
index e8b3da61b587..07f2a2aa57fd 100644
--- a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
+++ b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_traverse_builtins/archive/v${PV}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
index 31ad3eeaa6b8..18a727eba4d8 100644
--- a/dev-ml/ppx_type_conv/Manifest
+++ b/dev-ml/ppx_type_conv/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_type_conv-0.9.0.tar.gz 14651 BLAKE2B 50b4ffb85062eb306bbadb3b641f9ca0318e95c614482302c4b3e001eeeb14137c4d0050abb8cf5c6e57a5fd8afe70b16a3455b4080e6f85981c88765c8ba945 SHA512 71af29d7e882652a5e101e1fc3610adb4faaba30068161b4b391e3ce7419af7feffd289070c1707cc961c593eda7b7f325609e8c98543c1168400cfafea31472
-EBUILD ppx_type_conv-0.9.0.ebuild 586 BLAKE2B 6b3c5f786aebf920b2f73b722a5687012549b76ca7881c26982a508d5e4e5cfcfbb73f6dbc967d6ad8831562c53585d2ab57ca24ca0f082d6e272c8b5c048c6d SHA512 cdf41562a3dd68d8927180420717aa7f27db39d990947d4fe89a60d69e73c898743f051c686092c10cb1401b0afd7b0273b6753df81129ad95a5378ef6653533
+EBUILD ppx_type_conv-0.9.0.ebuild 591 BLAKE2B b73ad16e007701fb5c9cf80f34ab0fd3fcdb65026a88a7f87cb57564c1c4a978e9fa090fdee3ed7da7416d45d52dec2f5d9641d1a3a1e5d3d7c7c64683474958 SHA512 d96ac4e0fb282c57a8a7aaada5da41b1d877fdc27383fd77e883b3852a893c0a803872a19e65c36f79ca73eed3e1bbde124144b3990af397cac79c80479cd553
 MISC metadata.xml 336 BLAKE2B dfe795b5d1d6d958e36285ef798f50ee962fa9ad8d090bd072b03a5c7cc09d08178f817948760348e8b4ff0eba0ba36067adf6926624febd2e58e18d277ce792 SHA512 63a68b119fabc900de432fb9e5a5ec06ecb8b89a980fc3fd6eb8303ac2278f8af08b4995a04d9de487cca41c6e8f6ba95786b976d70ad3108c121d61cc5ca7e0
diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
index b88f55d56fa1..879332244f97 100644
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 08fa16fb737b..05a48506e181 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,5 @@
 DIST sexplib-0.9.2.tar.gz 75035 BLAKE2B c08e4285cc36fe259d5145d43c847bc466e0b4d9897c58708ce39e6b04d52c84cc5c7603f296edaf6c0752c846d9cb9b03c9610eb5d3fd9bc1b1ad67b4a046cd SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d
 DIST sexplib-0.9.3.tar.gz 75074 BLAKE2B 60ddb336f8ff334f995399e63a12d9ab5403ed27bf62259d13159eed0a5c6b246673406ca9ed9f542cdc4e53460a5136f56fe75127ea199448e85dd55cf53ff3 SHA512 32c471b3ef2b2595fed7fa748b7bc7059491651442dec0bca5a60b93458d78b0950e4386a973c9c856ba25f3f839d6747ab9e2e88b1927f9907e8107b63b706d
-EBUILD sexplib-0.9.2.ebuild 510 BLAKE2B 223ebd90852feb232125453be8a4e5bf751637aab1233409f7b1cd79b06d26be2e265da62b03de41d3e434e170d07d47404cd0a76ccfe34e3d5367a5157819d1 SHA512 3b6e46b353170e08673138a2d94f00159e050fe9f24e1b8af0f1915091092aac61419d0d701d7f7413a256e8a8200d72591a8f52da352ec4dbab5f92abd7c550
-EBUILD sexplib-0.9.3.ebuild 510 BLAKE2B 223ebd90852feb232125453be8a4e5bf751637aab1233409f7b1cd79b06d26be2e265da62b03de41d3e434e170d07d47404cd0a76ccfe34e3d5367a5157819d1 SHA512 3b6e46b353170e08673138a2d94f00159e050fe9f24e1b8af0f1915091092aac61419d0d701d7f7413a256e8a8200d72591a8f52da352ec4dbab5f92abd7c550
+EBUILD sexplib-0.9.2.ebuild 515 BLAKE2B a4ef4e8164a6aefffdcdbce59d6fd43887c94e9ca08fe4f3c88ad218aa804b62d0c7f5a49cec86ae92db1aef69bb6f64692a2dfce8f5abcd18fae92fea1ad6e1 SHA512 067410c18c17bec06a6091b8d8dfdf84f05bc3b853cab8283833311a4cc4ba16aec12dd168d4eab2c4f38ffc657f2f575d015ad21f0de2d802f35aa38c3a78f9
+EBUILD sexplib-0.9.3.ebuild 515 BLAKE2B a4ef4e8164a6aefffdcdbce59d6fd43887c94e9ca08fe4f3c88ad218aa804b62d0c7f5a49cec86ae92db1aef69bb6f64692a2dfce8f5abcd18fae92fea1ad6e1 SHA512 067410c18c17bec06a6091b8d8dfdf84f05bc3b853cab8283833311a4cc4ba16aec12dd168d4eab2c4f38ffc657f2f575d015ad21f0de2d802f35aa38c3a78f9
 MISC metadata.xml 403 BLAKE2B be9cb43de9b7b996cb66a91749407505e7cbb169d510564949155c4d13bd60397d1b46b13e6cc0dbe47b43b6dad5dca73027a4d41100fb759bde076a69b5c1ff SHA512 eca3cf17735fd16c06a64d309bf510f0ef43c3ac7ef2dd5af29a8c12142830bb266600bcff5ed174232028139239a9d6cb3c85e07c6cc63471eed026a3536a12
diff --git a/dev-ml/sexplib/sexplib-0.9.2.ebuild b/dev-ml/sexplib/sexplib-0.9.2.ebuild
index 0def0f6d5dfb..a5ed48014b30 100644
--- a/dev-ml/sexplib/sexplib-0.9.2.ebuild
+++ b/dev-ml/sexplib/sexplib-0.9.2.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://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/sexplib/sexplib-0.9.3.ebuild b/dev-ml/sexplib/sexplib-0.9.3.ebuild
index 0def0f6d5dfb..a5ed48014b30 100644
--- a/dev-ml/sexplib/sexplib-0.9.3.ebuild
+++ b/dev-ml/sexplib/sexplib-0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 9545c759ebb1..48c2b7632ab4 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -1,5 +1,5 @@
 DIST stdio-0.9.0.tar.gz 9264 BLAKE2B 1f3d7748ed07672eaad7c747c8925fb9e5204d59c05e8ee8674d689dcc44b9ae9d2da8420cfa05e8e0a58bded343cba979ff42f5f8fdae5392a1868591269f32 SHA512 a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d
 DIST stdio-0.9.1.tar.gz 9281 BLAKE2B fa3a5a3877aa2ab19155d865eea03458b742224de11857f9f2c1219eef3f0fbd6562cf0eafc90c59dab03053db0dcae27c19a73da4f3a73e3b6d6a9407868f3d SHA512 bfef782562af7fae790b8baf02bf5d5edae2ccff29531080a608fd9224710c7d0a1a346c3480b6eaf4d7be1a280e19d9380a4dd9072de6d68e48ac419d275716
-EBUILD stdio-0.9.0-r1.ebuild 491 BLAKE2B 96b69eaf53465528aa9cee16d0176a94d2ffa777a256774abbe38f2bf336047e82f7042aef7beb88e64f2a269dc582408a42870721a69c6caf002ed119d05e8c SHA512 29ca6d9be20f7fbaf814e598a7e355e967a53cb3d7a6b5952ad20f7d0e9148b1b2ba9facc1a993531950d891c2dde990d42d8ef66328d9e2af2c02f0c869ebfc
-EBUILD stdio-0.9.1.ebuild 491 BLAKE2B 96b69eaf53465528aa9cee16d0176a94d2ffa777a256774abbe38f2bf336047e82f7042aef7beb88e64f2a269dc582408a42870721a69c6caf002ed119d05e8c SHA512 29ca6d9be20f7fbaf814e598a7e355e967a53cb3d7a6b5952ad20f7d0e9148b1b2ba9facc1a993531950d891c2dde990d42d8ef66328d9e2af2c02f0c869ebfc
+EBUILD stdio-0.9.0-r1.ebuild 496 BLAKE2B efe13301c96808e53d7aee567d4f1b0877d0f0998d5619085a8bbd12b3626313cd9fce6bcde4655256b0a1749eacab9596cabeb8782a4667ef3d4076b6bc69b6 SHA512 662d185d044a7c93cb4ac1abef097ea7cb72d387667d07ece5a612ec0aa12df52a2d884c14e5b17a03060276a3d3fc4a4dd03b33ea54a841ab14183df4729c37
+EBUILD stdio-0.9.1.ebuild 496 BLAKE2B efe13301c96808e53d7aee567d4f1b0877d0f0998d5619085a8bbd12b3626313cd9fce6bcde4655256b0a1749eacab9596cabeb8782a4667ef3d4076b6bc69b6 SHA512 662d185d044a7c93cb4ac1abef097ea7cb72d387667d07ece5a612ec0aa12df52a2d884c14e5b17a03060276a3d3fc4a4dd03b33ea54a841ab14183df4729c37
 MISC metadata.xml 328 BLAKE2B 59ba640c2bd42d030e6ee4a92407877fab5dbd4b61706e6174902c17f9f580969aff31363e9bbcf9c627d54770afb0bffa3f66bd438ed9c1a58ba431948c829f SHA512 fdcaa73b9349a28b81f0bc9d4872edcfea9ae2b1194c0d1102a462aa5e2591d8d7af56b6946731ddadce713ddf8d8f7a0083d955922213eec4da42ee68e5e137
diff --git a/dev-ml/stdio/stdio-0.9.0-r1.ebuild b/dev-ml/stdio/stdio-0.9.0-r1.ebuild
index 7e8b8d66be2b..ea3350ffe129 100644
--- a/dev-ml/stdio/stdio-0.9.0-r1.ebuild
+++ b/dev-ml/stdio/stdio-0.9.0-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/base:= dev-ml/sexplib:="
diff --git a/dev-ml/stdio/stdio-0.9.1.ebuild b/dev-ml/stdio/stdio-0.9.1.ebuild
index 7e8b8d66be2b..ea3350ffe129 100644
--- a/dev-ml/stdio/stdio-0.9.1.ebuild
+++ b/dev-ml/stdio/stdio-0.9.1.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://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-ml/base:= dev-ml/sexplib:="
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
index 283b274257d9..e2115e515f43 100644
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
+++ b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl DES encryption module"
 
 LICENSE="DES"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-perl/Crypt-CBC )"
diff --git a/dev-perl/Crypt-DES/Manifest b/dev-perl/Crypt-DES/Manifest
index 33e5f8ec982d..44e74d8101a7 100644
--- a/dev-perl/Crypt-DES/Manifest
+++ b/dev-perl/Crypt-DES/Manifest
@@ -1,4 +1,4 @@
 DIST Crypt-DES-2.07.tar.gz 16720 BLAKE2B d90b919ab493a7f37cd1506b86c459d68087e0dd153e16d0343b8b90fb44d19f57686aacb1c0dd34a3bb48c2d11ae1f910e7e131a3b05b38781d54d2e4d2c05d SHA512 95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678
-EBUILD Crypt-DES-2.70.0-r1.ebuild 476 BLAKE2B 5f4a5712442d834ba6693a4aadbc378211116aa2bf6506e0dfe8b4af9706291d3411663826d755b92f9891d1cb5a23fea0dc4fcbf0dbd9c8a86e93e0c8bd138e SHA512 9500c3834cd9b7f42532bb0f282ddc72ee167cc7d5c6999b20aa694c755991993cf0631a2cf6f26ab9f05f45cf6eb32e804c456247fde3f50df6b4882c68e047
+EBUILD Crypt-DES-2.70.0-r1.ebuild 469 BLAKE2B 8b184f993aee8ca5dd64ff5583f264edead4a9d827f602721a9241fc085c29218b4f8d45b0a325b60e1af9994675a666e269fe343d922c5e3ce0659f47b5a1c7 SHA512 55e9c6e03431e9958a21ba876903e2ae6c7c5827f1776bca3d255ac24159cc40da53932ac9cd13da11d22dce0c637128c095ac3bed777b70ad244971016f4ee8
 EBUILD Crypt-DES-2.70.0.ebuild 434 BLAKE2B 711b654034fc6c354de52610e9d2f2b46eb5d92a5b015e96c6e1eb1d269a707d27898587f53f5c82f15a9938212143cfc3417a60badd69c72dfe318d03a7c471 SHA512 1cb7c7774449f054d1a81c76ecba7e1d48ab4cfde70738878a533e20213aaec8d30896177b302348432f73ac0d555a27c8e376603ac467160a8f531e14340ca7
 MISC metadata.xml 390 BLAKE2B e0ed7568ad13c3f2d6a8cdbd8dbab2105b0f7e61c1494a81018b8ccee85aac9d308258564b133246dc0a071be9d940956d982a38723cae45e8ed7d229a05edce SHA512 3a19fdc685de7f63552843b4436bb4e0aeb722cae6dcd036a8009117883516a2ed4c506775cb15bdad9f66995e6faf88fc2fa835db846d41450f43fa8a7a80ba
diff --git a/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
deleted file mode 100644
index a5fbf45ae47c..000000000000
--- a/dev-perl/IPC-Run/IPC-Run-0.940.0.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
-
-MODULE_AUTHOR=TODDR
-MODULE_VERSION=0.94
-inherit perl-module
-
-DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/IO-Tty-1.80.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-
-SRC_TEST="do parallel"
-
-src_test() {
-	perl_rm_files t/97_meta.t t/98_pod_coverage.t t/98_pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 000a96f28ea7..83bbb00c6df2 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,5 +1,3 @@
-DIST IPC-Run-0.94.tar.gz 121394 BLAKE2B a0d56f71d31eed6666e4ed5ecc5c20afd1188ef9f179960642c23b3b0bfade8d3f639cecc2f0f0e827b2760051b928a4a1cfc6351ee53026948350bb27cd8e3c SHA512 c42fb5e0a5085698bec3f970ba642c00ad947629bd30c1485ebd28e8e24db4273fa6439e0abeddbc602be66e4ebfcaaa7e8d3982ac8b82c3c6a8a431c170f721
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
-EBUILD IPC-Run-0.940.0.ebuild 598 BLAKE2B 08cd64ad80b7402b173aaef278c01e8b97ed739e704bd68074debd1d2a77118db8e6f14fcbbdcc0cf2d35e3a23c80783d78e7420e4a2b89e2631880f65307bec SHA512 602aec39f3cd7a14fdf95923a14c152156620af2becbaa47fd2f0ac0b490438d7b1728161c90b6a0de52b0a3f619cda5df70c9ef0e9e65eeda1d1d32f36ffa53
 EBUILD IPC-Run-0.960.0.ebuild 598 BLAKE2B 0d56f8cea39d19971dea7245d348c423b94295cd26c3abad3558ab3fd2fbe6c8662b28fbf751c576c3bbfbf6166cc5ab19f61191c123ff402502a697b49707df SHA512 d26209c898e4d5785b2c461a71b5fcaea18ae11ba5c8c85305e75d0dfe611336c4f6d1b1a3f983f3c42f69d5c7bd35d4ec432746fe956e99019aaa16da4899d2
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 18721071713c..ec7f23120fbf 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/SVN-Simple/Manifest b/dev-perl/SVN-Simple/Manifest
deleted file mode 100644
index e70e03e70a42..000000000000
--- a/dev-perl/SVN-Simple/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SVN-Simple-0.28.tar.gz 4952 BLAKE2B 6df01aacac3c9dedad1b5c94765583c36969109fa726400b920543b746b9df45e6174de722b38a598d608d258fa06bee6eaac02b70056bdcc97e9f54d14dae20 SHA512 ab64a4f005a8047a0c58bf0fcae27559f7400faab8192fecbc62be2348e1d00538281f4174e4085dfbb8395d8d8c050363508322d01438b58802f74830ecc1b9
-EBUILD SVN-Simple-0.280.0-r1.ebuild 413 BLAKE2B 7b8d08520cbfb7ffc21df3a181799a89776fa1b25c0b7b03d451e4d384f3288af8477ecf93d0abffea9babecf97101487dec6572032558730e78fea4eeb7779f SHA512 521057114c0524596a671e10b38be3c5b8018cb3b0de3b9d826574419a84bcf3152a7f42da21345653f73efec3ed60798912c379af3ca6983743b2507f7e9757
-MISC metadata.xml 464 BLAKE2B 99c785ee96d633856a17655cc2d0ce6a4b988b454957685ff11f0738c5be0075e27a2b6234318cb2536399a3f59b282da7cd4d592d4bae9c2eb00c0d5d0e86de SHA512 d04504e496a131fcd72250a65002cc8e24aad501fdf276fd459fd74ba736ab3586b514bc77cc177445a3008b6926b501fbb09dd2dff32d9b8eb320056d281035
diff --git a/dev-perl/SVN-Simple/SVN-Simple-0.280.0-r1.ebuild b/dev-perl/SVN-Simple/SVN-Simple-0.280.0-r1.ebuild
deleted file mode 100644
index a354f24fe8f4..000000000000
--- a/dev-perl/SVN-Simple/SVN-Simple-0.280.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CLKAO
-MODULE_VERSION=0.28
-inherit perl-module
-
-DESCRIPTION="SVN::Simple::Edit - Simple interface to SVN::Delta::Editor"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-vcs/subversion-0.31[perl]"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/SVN-Simple/metadata.xml b/dev-perl/SVN-Simple/metadata.xml
deleted file mode 100644
index 9a82b1ca9019..000000000000
--- a/dev-perl/SVN-Simple/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">SVN-Simple</remote-id>
-    <remote-id type="cpan-module">SVN::Simple::Edit</remote-id>
-    <remote-id type="cpan-module">SVN::Simple::Editor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0fccebcca3f7..3e6727a81cdb 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest
index 0b4841e1a818..f8864f094add 100644
--- a/dev-php/PEAR-Cache_Lite/Manifest
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -1,5 +1,7 @@
 DIST Cache_Lite-1.7.16.tgz 32997 BLAKE2B a717ab816f2206f50a725c2424559d450c111f929c3c1ab48492737e557b8aef2ac79a0473f73ee337c501cde61dfb5d5a9b621d1bd984d288f5852c7452c86b SHA512 d2682ccc5e748d7233f79e51a8c0fae0fe77cec56730d0832e4c1f468227ee431b8e29b582b82f36a6274d50a0bbd12a9870bfeacb7c6943ad3002131aab455b
 DIST Cache_Lite-1.8.0.tgz 33424 BLAKE2B f0211bbfa12aef58bfec0eea0dd96712799a353bf2df3af8f1b63fdaa4e27714a8fce10a74bc87aeb55cbb9c76de494ffc6136489f7afd1e7f64febc444d27bd SHA512 7ff7d1d1f054e1711dbaf5e9c402414c6f2e89e09a25a0b81f207288da3bba373b4e9e2c8a92b638d502d064581b7eade73f66672beaf2e3725957a6dc45c03c
+DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
 EBUILD PEAR-Cache_Lite-1.7.16.ebuild 276 BLAKE2B f991980e20d925ecdaa65ae0a87e942f44631ac2ad144efad7418376fbcd763b9e7e4dae6c2c1ff20f8ceb5f8da6242cd4654c7dea5c80169bff28f3735301d7 SHA512 d0d6f99e49362e4a40918dcf90f6e3dc22f8da87031946a4dcb9b386c2cdde5a9495121fef81d399ec6571f510008190528c1b79e67d673c89075bae39f3aff3
 EBUILD PEAR-Cache_Lite-1.8.0-r1.ebuild 485 BLAKE2B 4e9c67dbf9108d6f62733bd217ffb5359199a9e750593619cfa24b917c03884648e1bc432d7436972457ac46296e9fe0c1ff98583b6e1879eace389453110a51 SHA512 c63a8c215953bdb63207bdf66fe81f1da388e89611afa7c610263704608c68455c9f94410121871346f148bf1d704f9b948ed94031eeaf6d6713adb2888207f3
+EBUILD PEAR-Cache_Lite-1.8.2.ebuild 454 BLAKE2B 651c607566bf6a53a69c61876412c2287900f9b4024359aeac09d2e39cb6f002b19415b356a19714e99858cb3f9069559f6884de73a22863e6841b835728b006 SHA512 bda54e2579320ae0da19aefc45136b7a1351adca14518eac5ea74b78fd44fc939ff7c4749d6a959a2d06c5e64dbca92cea156e765341697d1d9b3f33b2cf492b
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
new file mode 100644
index 000000000000..04b0fff79130
--- /dev/null
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+DESCRIPTION="Fast and safe little cache system"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
+DEPEND="test? ( ${RDEPEND} )"
+DOCS=( README.md TODO docs/technical docs/examples )
+
+src_test() {
+	peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-Console_Getargs/Manifest b/dev-php/PEAR-Console_Getargs/Manifest
index 5d817d2fa63d..bbbfb523f35d 100644
--- a/dev-php/PEAR-Console_Getargs/Manifest
+++ b/dev-php/PEAR-Console_Getargs/Manifest
@@ -1,4 +1,3 @@
-AUX new-reference-fix.patch 741 BLAKE2B a67770fe868c63a1461dd5e79752a767ff7a1f228e19b8362dc5204804b7af5b78fe4d3f2b698babc2eaf6c26243d958f175bddd083b9cb5df47eb7b42f06749 SHA512 dc3f89ae5a4ec4e81df7ca47ae28c0a9d9b21a8623b836431e5b4222dea28d43ee254e7debd4a4aec584f23e081df69978d44aade04daef1fb09d6b40c0a035f
-DIST Console_Getargs-1.3.5.tgz 18207 BLAKE2B d68ea1220700d43a9d7a0844d8659f9e95b377f9a9c609501d0b325083013ac220367c98b545917066e952a8c304703dddf920cdb80c129f222873934895822e SHA512 2e79bfc3947dbce928ae592d825ea16414de147a10f7c41a896d9a557c40a1e83842e39de6e6a78918d91235da73307f84b837a3d049b36cacd202c4b8aa7fd6
-EBUILD PEAR-Console_Getargs-1.3.5-r1.ebuild 363 BLAKE2B aef14fdbc92a87b7312c921044df978a1ba3fa8a9ab90ff5286e62f1b68017a588a278adf6d02b6df53dcb802219875a3e55e32fe0a2160d2048139f2221ad94 SHA512 71cf43f3582410d896ff45afd4c4b4558963a0b8244d8afc36ddcd26daf4c61d75bb17f16b94e959b6877b6351cdd005b4c45a3b7a2343d1bf1647e6aaa9be4c
+DIST Console_Getargs-1.4.0.tgz 18267 BLAKE2B c0aab73414a0b6dec9818faa2eae4a4f54d70168d089bb64497599e88f4b8ff86e4195e3705a75bece25f6c7d1054759b846be75f7fc749f1d50b4447ad9ec50 SHA512 927777f48599f64e2cdb05b80a473741718493e9efc20988f2993e6b092852f1432e2e9732c1470f7d580fc7e4000d563b7915a94305fe572b7f6dc27da0858e
+EBUILD PEAR-Console_Getargs-1.4.0.ebuild 364 BLAKE2B dc45652e41be48b28ac977a7e4229c1b32287fd927e9408cc28c2709e7f18fe244363b081eb30e3db31f79778304fbb5b6cec097b4caa81ede8b8d4142a21158 SHA512 e7a30f133d1eb61f9ec5e77aec78bf0aa6765be0906e4b98ee79fd5c173b298f370152df67059af9e6dec137ec73451b6b01e66a621756da8a9c5c7440f0985b
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.3.5-r1.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.3.5-r1.ebuild
deleted file mode 100644
index 991a8089f5af..000000000000
--- a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit php-pear-r2
-
-DESCRIPTION="A command-line arguments parser"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-src_prepare() {
-	eapply "${FILESDIR}/new-reference-fix.patch"
-	eapply_user
-}
diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
new file mode 100644
index 000000000000..58692f2f12eb
--- /dev/null
+++ b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="A command-line arguments parser"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+	phpunit tests/ || die
+}
diff --git a/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch b/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch
deleted file mode 100644
index a69aa2b9bde5..000000000000
--- a/dev-php/PEAR-Console_Getargs/files/new-reference-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c769f79831c43f1cad0b4f8831276da93d28f479 Mon Sep 17 00:00:00 2001
-From: Daniel O'Connor <daniel.oconnor@gmail.com>
-Date: Sun, 6 Nov 2011 13:25:04 +1030
-Subject: [PATCH] &new vs new
-
----
- Console/Getargs.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Console/Getargs.php b/Console/Getargs.php
-index 8ba21c6..c6826ea 100644
---- a/Console/Getargs.php
-+++ b/Console/Getargs.php
-@@ -224,7 +224,7 @@ class Console_Getargs
-     function &factory($config = array(), $arguments = null)
-     {
-         // Create the options object.
--        $obj = & new Console_Getargs_Options();
-+        $obj = new Console_Getargs_Options();
- 
-         // Try to set up the arguments.
-         $err = $obj->init($config, $arguments);
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
index 6ef98fc7ba5e..8082f561e2c0 100644
--- a/dev-php/PEAR-Console_Table/Manifest
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -1,5 +1,3 @@
-DIST Console_Table-1.1.6.tgz 9534 BLAKE2B 830abf95d495edf505f36069047a566c86dc2ae8d4a5c518348bd974bb57bd0bba353b2c750d88111520ffa2ea06fd6cc085e79591fff71a158636cafd8c1a04 SHA512 b5fdceb13c45fc050c1df72b10abd258f5fa5426822cccfb36046c0d4950fdf9431765949190a17aa4f881fbba9884208059c650394696268f443217581e361b
 DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11
-EBUILD PEAR-Console_Table-1.1.6.ebuild 292 BLAKE2B d10a74834f87e565524712d7e4b4495a67ebf505522b80c74f31d66956552e22790f8ddc31f44b6dd8f56a9ce117adbd4d7507f108046afe80da81855444f004 SHA512 538f68889bee9d045ff9c3526ab1c1f65162056764ddeb5a07f6e72df4106f8513756b49897867b9b729a6bbd78f7e9ff030028c129bd78ab786eb5b36c82988
-EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 398 BLAKE2B 9f45ad77c2742d9513672cdb1983e586f20a0ff2a3129ea48d5e613f661bb6baf369b00505ed647a663ab271e711a688ee2dd160098cbe4fa1cf2abf9c353873 SHA512 1c303638a737ec66ceb511b8bd17ab4b2fb79b9ae0b97bfc123e581af0bbddaccbff9de75a6c167e191c6835fe1d413b17ae6af96fb8b2d278b06364c5ee5a13
+EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 390 BLAKE2B 1e6b4a96a56fd39abc2fa6c4f5c4019febb0eb66e0f9682b8d17185a1984b1708000954a3b6cea049fa667c261790ffc18bfeeba4ba03595386572ed8581c4f5 SHA512 b98c6d04e5ade6bcb5622c78b9909d7703c754eee25b945d58cb172efa713efe0c380b7daca3cf35ff105dc5a521cba2f00342e1aab13e7b942b391a3e298605
 MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.1.6.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.1.6.ebuild
deleted file mode 100644
index 45b34535e282..000000000000
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-DESCRIPTION="Class that makes it easy to build console style tables"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
index e3fb66073a4a..3d67e12ea658 100644
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Class that makes it easy to build console style tables"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
index cdce1a03ca8f..dae3495d57cd 100644
--- a/dev-php/PEAR-Crypt_CHAP/Manifest
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -1,4 +1,5 @@
+AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
-EBUILD PEAR-Crypt_CHAP-1.5.0-r1.ebuild 523 BLAKE2B b264c855a10df6726a4bf80bc32e647ca9efa06161fe19bf8bb0033363bffae0f34ae52a9b1532494b05f9da4eef812eccd83c1017ef5c2ab2133912a42c20d8 SHA512 1fddcdb2e2936835b364fdc43d2fae01e4f46cc56c6ea0459f2968406cb2c3fd5acceb2c073a79a8dc4490e29b87e6e08c4abd364ecdce223337ee81cfef29dc
+EBUILD PEAR-Crypt_CHAP-1.5.0-r2.ebuild 578 BLAKE2B 397e14424dd7d9700eb56e68430d88266480a14b4ece8f33d84f5f817d9469d1c4c896f5f141b87899b7e8c2adea204cb7b12133d3f073893bef4a818b98aa2a SHA512 d571ec79d93bea2af048fe988a66b43a1833b97abc75526fbd4954e45725185307ebde18f491009ebe9a10bab5d5a490c291b82f2232e2f578f67b9401728440
 EBUILD PEAR-Crypt_CHAP-1.5.0.ebuild 502 BLAKE2B 914123179113a9e307e561f5671c80cd21860a80128b84225a243ad6b232ada1c8e3922030655d879c707bb6aa79d8db326c7b87c79a98cbec0a03c406c9462f SHA512 71aadc63de5776543fdb9f43c6e0ae5fe1a75c3128460c3759e7805d3349711821a587c61ed0097b714103c9713d5903e21e9ba7ff5e89ce23d17bee08874344
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild
deleted file mode 100644
index f924f90e41a2..000000000000
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="Generating CHAP packets"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RDEPEND="dev-lang/php:*[crypt,hash]"
-DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
-
-src_install() {
-	php-pear-r2_src_install
-	insinto /usr/share/php/Crypt
-	doins CHAP.php
-}
-
-src_test() {
-	pear run-tests tests/Crypt_CHAP.phpt || die
-}
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..b07a5c6270e9
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Generating CHAP packets"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+RDEPEND="dev-lang/php:*[crypt,hash]"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/CHAP-1.5.0-constructor.patch" )
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/Crypt
+	doins CHAP.php
+}
+
+src_test() {
+	pear run-tests tests/Crypt_CHAP.phpt || die
+}
diff --git a/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch
new file mode 100644
index 000000000000..6fa92898e106
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch
@@ -0,0 +1,65 @@
+diff -aurN a/CHAP.php b/CHAP.php
+--- a/CHAP.php	1970-01-01 04:13:08.000000000 -0500
++++ b/CHAP.php	2018-02-13 13:04:49.812389739 -0500
+@@ -78,7 +78,19 @@
+      * @var  integer
+      */
+     var $chapid = 1;
+-    
++
++    /**
++     * Constructor
++     *
++     * Generates a random challenge
++     * @return void
++     */
++    function __construct()
++    {
++        parent::__construct();
++        $this->generateChallenge();
++    }
++
+     /**
+      * Constructor
+      *
+@@ -160,7 +172,19 @@
+      * @var  bool
+      */
+     var $flags = 1;
+-    
++
++    /**
++     * Constructor
++     *
++     * Loads the hash extension
++     * @return void
++     */
++    function __construct()
++    {
++        parent::__construct();
++        $this->loadExtension('hash');        
++    }
++
+     /**
+      * Constructor
+      *
+@@ -412,6 +436,19 @@
+     /**
+      * Constructor
+      *
++     * Generates the 16 Bytes peer and authentication challenge
++     * @return void
++     */
++    function __construct()
++    {
++	parent::__construct();
++        $this->generateChallenge('peerChallenge', 16);
++        $this->generateChallenge('authChallenge', 16);
++    }
++
++    /**
++     * Constructor
++     *
+      * Generates the 16 Bytes peer and authentication challenge
+      * @return void
+      */
diff --git a/dev-php/PEAR-Crypt_HMAC/Manifest b/dev-php/PEAR-Crypt_HMAC/Manifest
index c08de7e697a1..71a0cedc7460 100644
--- a/dev-php/PEAR-Crypt_HMAC/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC/Manifest
@@ -1,3 +1,4 @@
+AUX HMAC-1.0.1.patch 1501 BLAKE2B 2ee57e59c9d4ec6807c3daecc488a39102280c71da62baf9c3cf90a0af8e08c29e6d6be2593f148f4c4808b5d68fd0b681b511eeefd53bd91123959114651474 SHA512 19c968acbe449436f0bde2bbf9b379d9f04e76adf3283504b2fd396c94f19f5767a89a8fa23e23622b6fc3178be9c995b826d5540d994ca31e30f22a835f8c83
 DIST Crypt_HMAC-1.0.1.tgz 2149 BLAKE2B a95f145101cbd9f089948ac62d47b9a449a8cac328636987b49903c07c714c007309b294dd3a16fb5f5cf5bacf00c6e502fd8e29584803c99bff2bf61c5dec0a SHA512 5fb873d9d2e14f18f729e102b0295aaafef53bb150322f4a75d87f6d5ffd3e8829d424ee7285950d92c3408756b40b9ac7fe5123a73cefb341e4224f049bcb18
-EBUILD PEAR-Crypt_HMAC-1.0.1-r1.ebuild 282 BLAKE2B 0c1381ad3324bd2ff4cd98bd710d84a7cb4fbe523fe469d8823a4c1b1885cf2475d6d9b69bcc3b736385387b7f9e96f00f1fde6e0af7ac050d693f9d596379f7 SHA512 59bffb24e35de8eea3e0db77e6ba63b42f439fc3c6a0fce8145fbd65bb1664d78b4b01fd87abced920ecf146282922a02602cbfe6aa208863d828bb2ad129658
+EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 531 BLAKE2B f17c22933aa6828a389d490839d7301749accaaf04731eed61839ad0528ef5495013ffa26a37f5507a6c0cc61974aecbd79970555c24bff4f46a5123ff2f5bf0 SHA512 363518b34f69265cc3a9723751d9204188b021a609cfc07fa36ed1fe6ad668049f0f36c96939eae2076778224a9c2d18193151480b9a7ce83b31391ea05f7d8e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r1.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r1.ebuild
deleted file mode 100644
index 670e25e74bdd..000000000000
--- a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Calculates RFC 2104 compliant hashes"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5fba6c704025
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Calculates RFC 2104 compliant hashes"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/HMAC-1.0.1.patch" )
+
+src_test(){
+	ln -s . Crypt || die
+	peardev run-tests tests || die
+}
+
+src_install(){
+	insinto /usr/share/php/Crypt
+	doins HMAC.php
+	php-pear-r2_install_packagexml
+}
diff --git a/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch b/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch
new file mode 100644
index 000000000000..efa9d96bdedf
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch
@@ -0,0 +1,57 @@
+diff -aurN a/HMAC.php b/HMAC.php
+--- a/HMAC.php	2005-02-20 14:24:14.000000000 -0500
++++ b/HMAC.php	2018-02-13 14:03:59.421976960 -0500
+@@ -68,8 +68,21 @@
+     * @access private
+     */
+     var $_pack;
+-    
+-    
++
++    /**
++    * Constructor
++    * Pass method as first parameter
++    *
++    * @param string $key  Key to use for hash
++    * @param string $func  Hash function used for the calculation
++    * @return void
++    * @access public
++    */
++    function __construct($key, $func = 'md5')
++    {
++        $this->Crypt_HMAC($key, $func);
++    }
++
+     /**
+     * Constructor
+     * Pass method as first parameter
+diff -aurN a/tests/HMAC_001.phpt b/tests/HMAC_001.phpt
+--- a/tests/HMAC_001.phpt	1969-12-31 19:00:00.000000000 -0500
++++ b/tests/HMAC_001.phpt	2018-02-13 14:00:47.899812172 -0500
+@@ -0,0 +1,26 @@
++--TEST--
++RFC 2104 Test Vectors
++--DESCRIPTION--
++This test file implements the three test vectors as described in
++RFC 2104 (https://www.ietf.org/rfc/rfc2104.txt)
++--FILE--
++<?php
++	require_once 'Crypt/HMAC.php';
++
++	$key = str_repeat(chr(0x0b), 16);
++	$crypt = new Crypt_HMAC($key, 'md5');
++	echo $crypt->hash('Hi There')."\n";
++
++	$key = 'Jefe';
++	$crypt->setKey($key);
++	echo $crypt->hash('what do ya want for nothing?')."\n";
++
++	$key = str_repeat(chr(0xaa), 16);
++	$data = str_repeat(chr(0xdd), 50);
++	$crypt->setKey($key);
++	echo $crypt->hash($data)."\n";
++?>
++--EXPECT--
++9294727a3638bb1c13f48ef8158bfc9d
++750c783e6ab0b503eaa86e310a5db738
++56be34521d144c88dbb8c733f0e8b3f6
diff --git a/dev-php/PEAR-Crypt_HMAC2/Manifest b/dev-php/PEAR-Crypt_HMAC2/Manifest
index c428acf08e60..5cd20323f7c7 100644
--- a/dev-php/PEAR-Crypt_HMAC2/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC2/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt_HMAC2-1.0.0.tgz 8129 BLAKE2B 5e0754b683c1e930af42591a066b137e8ec4633eac10897361d923c84a3d70d327d224909c982b08d3d38ad5c810eb2a94c7d9bcdc41fddc44555e83587e2fca SHA512 0c3bd71ba8c2bf086ca703732fb3ee2471797ea486dbc863acbb5d07426395a65b8c794473ac4b1c1b85e954e27b79361116bee0a36f4b78edd780ea6c06bfca
-EBUILD PEAR-Crypt_HMAC2-1.0.0.ebuild 730 BLAKE2B f5002a321c798f1238763c7152a7af319891b55ec5c35f0afa588b2bd93e2f74e23806a7a0f61ec7c9647bc950cf2872f4f1f50813646b22465c0d0a93bcfdb5 SHA512 ce432ad9d6b8c49422a5820ba094bd500d9b2a2d83e0665a81974d063af24c270ca4b9be4f1a10b744e6db112f092c95bc54c6a1bccd019d7b9a4c3093d91af0
+EBUILD PEAR-Crypt_HMAC2-1.0.0-r1.ebuild 701 BLAKE2B 89ceed915cf75c0af45f9448168166a64ac588426ea99d38ba6bab1deaa2e5db297fa2cf1c47453395328ecf63154683cc8187fc93ea16c110a4bb9bd1c850e4 SHA512 06bec85713241c64e516230763518c64c426808276af4d3344a2dd0e91ffb4c0a1ccc93c733e04186b058324841c169cf0360853c29acddf3b4d3220934cf9e0
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..2647980b40b1
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Implementation of Hashed Message Authentication Code for PHP5"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR dev-php/phpunit )"
+HTML_DOCS=( docs/intro.xml )
+
+src_test() {
+	phpunit tests || die
+}
+
+pkg_postinst() {
+	if ! has_version "dev-lang/php[hash]" ; then
+		elog "${PN} can use the hash extension when enabled to extend the range"
+		elog "of cryptographic hash functions beyond the natively implemented MD5 and SHA1."
+		elog "Recompile dev-lang/php with USE=\"hash\" if you want these features."
+	fi
+}
diff --git a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild
deleted file mode 100644
index dd721a85f55e..000000000000
--- a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Implementation of Hashed Message Authentication Code for PHP5"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	php-pear-r1_src_install
-
-	#Useless file that often conflicts with other packages
-	rm "${D}/usr/share/php/generate_package_xml.php"
-}
-
-pkg_postinst() {
-	if ! has_version "dev-lang/php[hash]" ; then
-		elog "${PN} can use the hash extension when enabled to extend the range"
-		elog "of cryptographic hash functions beyond the natively implemented MD5 and SHA1."
-		elog "Recompile dev-lang/php with USE=\"hash\" if you want these features."
-	fi
-}
diff --git a/dev-php/PEAR-Math_BigInteger/Manifest b/dev-php/PEAR-Math_BigInteger/Manifest
index 004cc3a2fb4c..801949516906 100644
--- a/dev-php/PEAR-Math_BigInteger/Manifest
+++ b/dev-php/PEAR-Math_BigInteger/Manifest
@@ -1,3 +1,3 @@
 DIST Math_BigInteger-1.0.3.tgz 28009 BLAKE2B 21bce67edff73b791322e364d15a1da2c57e9559aa4684b435fe6a8f17a14ce30b81d8ade0fc46d995a1c8f61843ec239ba1c09394adfa9cf77ccf448ecf3d72 SHA512 c8d6d638a6093b39e0f95e55d4d7488ddda1ad512504a97ce62a78ffae969b0d90925d6252b26230e5664f84b0a6b70fb456a678fbb291ca1a068cc7c539f415
-EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 638 BLAKE2B 7cada4ec328278114aaec0cefe409ecadbdbaa626969faf3d3a597a780f8d28513d975ae79ecdcb2fe846ee77602c920c167fb4e11398660446e050a998b2c2a SHA512 d39e4dcd5afb0ee50394fea579993e497bb5c2438ad2bafdca29bf012cfbdda7db7286e698ec483e26da990b9cfe421dcf0d310eebffc3eacc90db6a5c35002e
+EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 630 BLAKE2B f3fd228601f6fb3aff5f66a38b67ba24508cb88a195038f43f8ffeae115f4dcafd5113753ee08a1dbb6f3c5b411908df597d1ba66f3530c1ebeea7d42aa323aa SHA512 7089699cec70aa1ed93350bd3997086c230973510967181b6a8404df4b16224f405981517a82308931e8617a08faff0d8551bc97de7c17676f269c69c700b286
 MISC metadata.xml 383 BLAKE2B fe5d5ba08fd329fb70f87a71af8c7e496a439c956de7222679c06a910c9bcf853cf454d65f5b560f378b7236e2e9e4365006e03256fcd7af69e39040e9155ee4 SHA512 b6c4d19556a70c765b60a6c9c8ef2389fab9ae7a07f9d6d4ad032e1c87b87396de7428a6e4b4f4980c8423ec12db9febfc487a32b5239a3ac948569e2aca451d
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
index 5aad8825179c..bf5089085a38 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.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
@@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest
index 5b575cfcc126..128d620fab61 100644
--- a/dev-php/PEAR-Net_DNS2/Manifest
+++ b/dev-php/PEAR-Net_DNS2/Manifest
@@ -1,5 +1,3 @@
-DIST Net_DNS2-1.3.1.tgz 78432 BLAKE2B 6336e4b04d0d1242dc9670dac70fb75d956df0cf3aa901ec0703995793e7581087662fd3eca8b44c35697c3c785c5ab725abf400a86ee46463c0008fdbd1eb34 SHA512 46a0f9a25be93b2eb61e204cc91006525ef57bca81f31df3e0cb1d79323ee95ad11acca5d8997c94457897cf318597028bfdc44a8f1c7faeaa3d64f9f4bd3046
-DIST Net_DNS2-1.4.3.tgz 82572 BLAKE2B 2c6f041a7afefa00709a2b36f3b25cd286bebf7f7db7466096062de2bfd98fefae9cb9a40327710c7f3b5a9c0532d45c7d4b576884d365a3b797047e78333d5b SHA512 bede82612326674cc3a42c643a69255e33a06117ba14435c03d5c3ec0bd089fbe94df91e354624c626b750185341219f00e647312c5f1301515e1ecf8f781377
-EBUILD PEAR-Net_DNS2-1.3.1.ebuild 316 BLAKE2B e194bb3054f5f82ef264160bb8c86ca515013477005c370253dc923d00ccb96d22862c5329f74bd6f5d057ce924127e528848fa6250f7822fb1dfde28247c643 SHA512 28271730b915a0c554bdc30ea1eda42d3b5cb7a4f7a0c1d16ba5b41ec669a961995a8e0321107c40043002fe87351e79eda3bf9101ee4fd6c09c0dc51dbddf79
-EBUILD PEAR-Net_DNS2-1.4.3.ebuild 362 BLAKE2B dd250940898e423bfac249c535c4afd142fa077486e0eb5d45e55321362b338ab50978828ad8f27bd84cac45a980986729f55415abba5704b9ea9c296136a6d2 SHA512 a6eaf8554f666a774996d757e5c9452b5e8384d37f995f60d806639aa1539cbe2ae3ae0d648014a4de87910e635f4c880a6f0d3bef394bcca1420fbf7416aa8b
+DIST Net_DNS2-1.4.4.tgz 83242 BLAKE2B 107e57406fcc308e3f83c71df0425081ba3d6638f457877e5ed42bfea8abed65ee520e228a379b71cc1462960e995d9c6592ad03afad78b36191f03d1f1513d6 SHA512 fa9df14585b3e41b13f4b52521b8fc05b239c39bccd4baf776dc632913777962dc527b9ff5de2337c9c0d78c6908d555d14167991dfe368426aee57a415f7e78
+EBUILD PEAR-Net_DNS2-1.4.4.ebuild 362 BLAKE2B 0b208e032ffb7a9b9deb45839b1e840f43df0961066bc3d9111894652d7168dbe260b2537b5df05bb96acd8e30b8b6d8c755e63278faf2fa652cb35c5c478436 SHA512 bec210587978a1523cbe6f9c4cb24e14dc870ac9d22921177524d7c4c333bbf4add241b5de24c2e5bef9ae0f61d827615c6bfbda0554a5da2b222811426420fe
 MISC metadata.xml 310 BLAKE2B c5dac87062361446d899a645418ae14a5fdb979f958087c4c2ef4cbe3afca4a37586a58bbeeede802af76f7f2d1c654eebb64eb17be4393359fffd1335faf2ef SHA512 897094fc61846e1417e87ea8c9d76f824babb9ffa1fab3ffb5a63f2ab1c24842ebcf360a33c971a172fde70017a179e23c2677d5eef5939c01bb132fb1aa1e4a
diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.3.1.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.3.1.ebuild
deleted file mode 100644
index fffa384a6373..000000000000
--- a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.3.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[sockets]"
diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.3.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.3.ebuild
deleted file mode 100644
index 1749a470363f..000000000000
--- a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit php-pear-r2
-
-DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]"
-
-DOCS=( README.md )
diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild
new file mode 100644
index 000000000000..a4f4682ca495
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]"
+
+DOCS=( README.md )
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index becb0a16e933..726714dcbd07 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -1,5 +1,5 @@
-DIST Numbers_Words-0.16.4.tgz 58379 BLAKE2B a9f9e9a69238e6a0f180b3e1b4e98ba84961c0ccaec5e058ba2b975b54dcb44c08f031aa56c06765fd100929699f6c7ee412483aadbd4343e7bae59dcae3f3a6 SHA512 f07c5bf170a74be170c87c217b8561066938669d319cb6ca683c564e2f8a5917109c97ea51c7de740023605e77c78d34d9d864e187edfbab158af11e19bc3155
 DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c
-EBUILD PEAR-Numbers_Words-0.16.4.ebuild 281 BLAKE2B 61007aab307eb273c8f60fc106d219cdc162ff6429efe831053fb62c65ca83380007017c5e7ccb6d171e9ce9099d1bfa101b30798f6c91a920c364e0f074462f SHA512 b9ba4d77d0f6a355cf2925bffc47bc5090959bf41e115a6e9becaeebcd6de6b60b244c2f2e8cad1bfc595ab97b0a65b1efad9d199805fc3bcf989c88149d81ae
-EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 701 BLAKE2B 6b956b297cb01fec18089d6ea4282cf9d312611310e4b449771479d3796dab095a0ef777ef2ef7c60e3d5e184e93145ce5a9177af10dc821186781fa3a0e1c32 SHA512 19e847cfd6d8d5ba41195a2a405078a236e05fd211f7b06572b0e19615acc266252bfe6e46b2c50003c367216ea83a8db24be7dd518a2a70b406e44de2c9effb
+DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 693 BLAKE2B da455a771cb21432817ec07278bb70d4a0b28a2a6e5504fe72bb7798c8e44d32d649328212a2142c0c72b27b3664ca8c72e467f9ca66ed92efca9b491ae59b56 SHA512 6e5aa3dd6b57dc5bdc7496653c7fb67b021b44f4edc5abc0b7117131f02276c35b1bb5c86834aaed9c2acef88ff1f115ad8ea2ec1ab296bc5922f1299677ab5c
+EBUILD PEAR-Numbers_Words-0.18.2.ebuild 524 BLAKE2B 4893944d79623821e224e776465ecf3fb4b7ffad8f8daa2f83bda944db5f73b92ab37be4c99c79688d5373292ffdb04ec35e9f370f250eaa6fb06838f25002b0 SHA512 bf1a293ff03272cf384c39272c54b6a7b69a8bdaff111b74dd584fa49f88617af1fd902a7125d63367ba6eed1a346e3a2f2f37c4d29c8ab9dafe9966b3331f45
 MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.4.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.4.ebuild
deleted file mode 100644
index 10d6aef8f218..000000000000
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.16.4.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides methods for spelling numerals in words"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index ff49aada8250..64d5353b4d13 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-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
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
new file mode 100644
index 000000000000..0b83ebeaf12f
--- /dev/null
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides methods for spelling numerals in words"
+HOMEPAGE="http://pear.php.net/package/Numbers_Words"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-php/PEAR-Math_BigInteger"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+DOCS=( ChangeLog README )
+
+src_test() {
+	phpunit tests || die 'test suite failed'
+}
diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
index c6fc40630957..e2e7f4c7a4fb 100644
--- a/dev-php/PEAR-Text_Wiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -1,3 +1,3 @@
-DIST PEAR-Text_Wiki-1.2.2.tar.gz 82036 BLAKE2B 898d62c448352fb7e6d4877852ce45200ac676a5f6fb18987ab602428ef495f23ef37f6f1fb0538a644f3679e0dbbfdceec65698a7282d2ab2807d0f8126d102 SHA512 c799245d297349ed73f81997ce1c38f24b7dde18bd7535089275c467deed284de9daff6b4fbfb5728771b227e05dee42a00366e655715a1cc0baa807fea02320
-EBUILD PEAR-Text_Wiki-1.2.2.ebuild 474 BLAKE2B 97e70c98ed8f9be7cba07998e537f2f607dd06ec6a0b8c3527f96c70dc2e0deba4c61dc7cd3b948c8f47986305bc5a0f277cbccfb21c3d022cd76e34a64fb8b0 SHA512 7133912f96f9f350ea09219fea2b6e4ab106db4800d0997adcaad273dbb2bc2b00c3dced8fc4da53781469a764e12b9d2d8bd9e6aa5ce34870f57f2b1877424c
+DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
+EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 763 BLAKE2B 73b4d3a410e24afdf0008fde5b7fce25c63075db2f33eba44f6581d161569ca0ae3b2d407ce5ad8e72899920e0b0b6717efc6b3751134ce9f3f18967969d7a5d SHA512 57592893c62bea481e5b58d82c41cd73f5bce078e353fdf28334941aea3c47a10d660455ae94e2eb6def445388a6ababa9c705f527c7b61f95e8ef6efa9304f6
 MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild
deleted file mode 100644
index 0495e750dc24..000000000000
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
-LICENSE="LGPL-2.1 PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-# Pull from github as pear.php.net is not updated
-SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/${PEAR_PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
new file mode 100644
index 000000000000..cf72e330dc7e
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+# Pull from github as pear.php.net is not updated
+SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> ${PEAR_P}.tar.gz"
+
+DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )"
+
+src_test() {
+	peardev run-tests tests || die
+	phpunit tests/*.php || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/.packagexml
+	newins package.xml "${PEAR_P}.xml"
+}
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
index 27c079d8fa70..8117060a6f95 100644
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
@@ -1,3 +1,4 @@
-DIST Text_Wiki_Mediawiki-0.2.0.tgz 17022 BLAKE2B e43d7452f28ebd8d730f69d947ed19bc47eeb2a40b5b7a99be1868d0bf8daa57b91fe7bd27adad49334999ce181f4254bfbe3b7f091d6dd34ac603a2108a6582 SHA512 032d1fb229b4e2ab65f60c90cc5a234b441093837c9d7170477f04e591a15c9a891baf9f45171275f152a358616124729db7edc97def2c72cfddf498b48f17a4
-EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0-r1.ebuild 320 BLAKE2B 884a32c72df9232ac9eb3fc8b23d99d4e62d58aac6d262a7c1cfba2a2d81cb2112aea23a72db27845c5e937165854fb797d3a2dbe52735c1bd4356f9282d045e SHA512 e2d2ae0ffaf76ba0289113c98c3cc1b1692106f671ead8cfb4e8176aa5fe6d5d79dad78d5d33a68348e416d01514578ff1a634170c79de3bee1751d9cae874e6
+AUX 0.2.0-constructor.patch 1554 BLAKE2B 0c8686ac4e11faecc21ef17524e005b580aa887694653318558676f513bddaa3fc33b3efd6763f458ec10fa52559045c8c2d9a9362b2bf66a61d03e5cf855bdb SHA512 7202a7e15bda9dce52dc52c6807abf7f0fb1c5957d2c74c9442c92286aeaf044e2eab1cd062df66345a109a5f574e136bfc2b0d309bdc78f3d099a08b2d667f8
+DIST Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz 22941 BLAKE2B d208b4df7e01a2b28e44ada0226be0f183fe6ffefe742f9b6cb4f2b366f915ae46d950d574a8357cbec273f41792f17a639f5512613628ee60ed137d909be9dd SHA512 aef4d18a4a0b9f41dc4bad701a90a2e7d674851b63206db9dd87cf87d6705991c8221e41cdbb8d2572a950520ce87db96105a009e4189e48b8e7f5df0f460ee5
+EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild 762 BLAKE2B f354a9a3bbd91418c06b70c16e8b0a86811a76cfdf7a59ceaf1fac48132da497ad3a71b00e82234ba9bc74dc3fa50faa419f2ec050a5fa23db5baf62a2a6f880 SHA512 521bd3cc516ed6ddd3c7163479504900c51e4ce4cf548bfb64fc84abb1dc1984bb067d425b6946c86cdfe19d897d481f694c8333120e273e5e670d9a57433050
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0-r1.ebuild b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0-r1.ebuild
deleted file mode 100644
index dec63b8381ac..000000000000
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Mediawiki parser for Text_Wiki"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-RDEPEND=">=dev-php/PEAR-Text_Wiki-1.1.0"
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
new file mode 100644
index 000000000000..ad7c16118923
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+SRC_URI="https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010fb97b825d66345143e4dc.tar.gz -> ${PEAR_P}.tar.gz"
+DESCRIPTION="Mediawiki parser for Text_Wiki"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RDEPEND=">=dev-php/PEAR-Text_Wiki-1.2.2_p20170904"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+PATCHES=( "${FILESDIR}/0.2.0-constructor.patch" )
+
+src_test() {
+	phpunit tests/Text_Wiki_Parse_Mediawiki_Test.php || die
+}
+
+src_install() {
+	php-pear-r2_src_install
+	insinto /usr/share/php/.packagexml
+	newins package.xml "${PEAR_P}.xml"
+}
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch b/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch
new file mode 100644
index 000000000000..edd8e3572de0
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch
@@ -0,0 +1,36 @@
+diff -aurN a/Text/Wiki/Mediawiki.php b/Text/Wiki/Mediawiki.php
+--- a/Text/Wiki/Mediawiki.php	2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Mediawiki.php	2018-02-14 13:36:18.777893414 -0500
+@@ -87,7 +87,7 @@
+      * @param array $rules The set of rules to load for this object.
+      */
+     function __construct($rules = null) {
+-        parent::Text_Wiki($rules);
++        parent::__construct($rules);
+         $this->addPath('parse', $this->fixPath(dirname(__FILE__)).'Parse/Mediawiki');
+     }
+ }
+diff -aurN a/Text/Wiki/Parse/Mediawiki/Url.php b/Text/Wiki/Parse/Mediawiki/Url.php
+--- a/Text/Wiki/Parse/Mediawiki/Url.php	2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Parse/Mediawiki/Url.php	2018-02-14 13:40:21.974024459 -0500
+@@ -87,7 +87,7 @@
+     */
+     function __construct(&$obj)
+     {
+-        parent::Text_Wiki_Parse($obj);
++        parent::__construct($obj);
+         
+         // convert the list of recognized schemes to a regex-safe string,
+         // where the pattern delim is a slash
+diff -aurN a/Text/Wiki/Parse/Mediawiki/Wikilink.php b/Text/Wiki/Parse/Mediawiki/Wikilink.php
+--- a/Text/Wiki/Parse/Mediawiki/Wikilink.php	2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Parse/Mediawiki/Wikilink.php	2018-02-14 13:40:46.030542359 -0500
+@@ -99,7 +99,7 @@
+     function __construct(&$obj)
+     {
+         $default = $this->conf;
+-        parent::Text_Wiki_Parse($obj);
++        parent::__construct($obj);
+ 
+         // override config options for image if specified
+         if (in_array('Image', $this->wiki->disable)) {
diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
index 671bb6825302..a69ffa26ee17 100644
--- a/dev-php/PEAR-Validate/Manifest
+++ b/dev-php/PEAR-Validate/Manifest
@@ -1,3 +1,5 @@
+AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
 DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 549 BLAKE2B 6d7ba004da69f7dbb3b61e1e4f1cf82ce93e4114bb053c749b85206bb1743a1e516c4b2e3bf3416e82533e4fe94af7e423eefb639848c892b18998a66c6c71a6 SHA512 5e54805118a4b2f3d40d79a91e62d3ea5731ca0cb2690363921a7d189629f8b6ffb0c4612b44ba2a733dfa6d147a31804c70e0d28ad1e38084399a07f872e5a2
 EBUILD PEAR-Validate-0.8.5.ebuild 290 BLAKE2B fa9926af4fc63048b70691fea65f6e29f8452b11b169c86824c356a8d413b82587656aca2eba1732675166c42b8fc65e80ed93b89d7aca9aac25097954f58395 SHA512 7fa9c4dc4f9f0e052923c492f4f431c7f74411beba76b3bb3e5c87c6b82ca22bad7664b2b2def9f64c221c7618dce4ee690e0fb7a73ef11c55d337f8cbec96d2
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..e8e5e342cc58
--- /dev/null
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="Validation class"
+LICENSE="BSD"
+SLOT="0"
+IUSE="minimal test"
+
+DEPEND="test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )"
+RDEPEND="!minimal? ( dev-php/PEAR-Date )"
+PATCHES=( "${FILESDIR}/0.8.5-fix-test-php7.patch" )
+HTML_DOCS=( docs/Example_Locale.php docs/sample_multiple.php )
+
+src_test() {
+	peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch
new file mode 100644
index 000000000000..069c5467d049
--- /dev/null
+++ b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch
@@ -0,0 +1,19 @@
+From a22b5cf2c7e4b4cf366c311150721961d9b456ea Mon Sep 17 00:00:00 2001
+From: Christian Weiske <cweiske@cweiske.de>
+Date: Thu, 16 Jul 2015 00:38:55 +0200
+Subject: [PATCH] Make tests run on PHP 7
+
+diff --git a/Validate.php b/Validate.php
+index a8f621c..ea6cfa7 100644
+--- a/Validate.php
++++ b/Validate.php
+@@ -583,7 +583,8 @@ function email($email, $options = null)
+         if ($use_rfc822? Validate::__emailRFC822($email, $options) :
+                 preg_match($regex, $email)) {
+             if ($check_domain && function_exists('checkdnsrr')) {
+-                $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop(explode('@', $email)));
++                $parts = explode('@', $email);
++                $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop($parts));
+                 if (checkdnsrr($domain, 'MX') || checkdnsrr($domain, 'A')) {
+                     return true;
+                 }
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
index 868b894ac2d5..af2a0288e810 100644
--- a/dev-php/PEAR-VersionControl_SVN/Manifest
+++ b/dev-php/PEAR-VersionControl_SVN/Manifest
@@ -1,3 +1,4 @@
 DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86
+EBUILD PEAR-VersionControl_SVN-0.5.2-r1.ebuild 586 BLAKE2B fe71070981e12a7151c32e16d4f4d08259dd4fbb79b4b70f43eb18a39763e4cd3de7c734cabf4759f6eda80de2f0711d62466607332b2a128c1077db84efd767 SHA512 12ce42b63818dc4bfd2960ee83c640767ca70fb782853aa1783e160699b793bec7d3d3f69a39e812d0a8dd0c3182b77fce0e9678b3c2061bcf896aea23eeb004
 EBUILD PEAR-VersionControl_SVN-0.5.2.ebuild 569 BLAKE2B 071f00ded3f1ce5eb099beffe4f54ea69b7b29331a58bcf5e7ddb42175936192a23db5906f418109444b35cce55bbf24113cdbb40827d1c2b3221b5874fbb470 SHA512 e256c1a7fb6e061825708c0140042d465f2acf822be27c117ade573973928b67a3f91ea89402cd61442e74c95d8bfb961401cdeffb44c8a38480464bf3993c25
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..7fea8919316e
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+RDEPEND=""
+
+src_prepare() {
+	einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
+	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
+	sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
+	default
+}
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
new file mode 100644
index 000000000000..0cdafb6e72cf
--- /dev/null
+++ b/dev-php/phar-io-manifest/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
+DIST phar-io-manifest-1.0.1.tar.gz 21403 BLAKE2B 0f18d94d127ec54914cb60756fd3e75c2d13ec593b7101735e385e4515abf4da0f03ef94d0bbbfaee02f348309525504f5e99e150a68b0d0fcd2129ccade4541 SHA512 3e4dd7ddd6de0a9f70595d0d8a6721782d2584526d3d4649cf0338ab36f106798daf4b7dcbf5bd972893a1569b622e4217212e5812b14e4bf3f698504f4d2228
+EBUILD phar-io-manifest-1.0.1.ebuild 690 BLAKE2B b6bd099ec1e2f0a60c2f2290bcfa2a8bdb95e48d6caa396f027a715f2b7a3d527a8e49520e79baac0c3781160819ea864c336e3169877f99a1c01ba7aa7fc253 SHA512 1bd0b6cdb2d85a41191defdf180fac23d4004ad21080553165b4519479b7b810011cf10cd8c0c19881b6eaf5f5290eed9d6b66445933ccdb4b8b1423eb92b692
+MISC metadata.xml 320 BLAKE2B 2a537b76317bec0310e9c6912562d75b512f00dae3ae411aff048a15e7b0986328699427135dedeb990f3f64f3b4b012e139349c5c082a7ba4c6447ce7b68143 SHA512 7ddc7f302bdafae9be276682a0c57125beeb45a9b96afd3fa1662cb699b95c96c36151ab91027e890c33054bd735ae250667292552ea20397587e6f547ad5aa6
diff --git a/dev-php/phar-io-manifest/files/autoload.php b/dev-php/phar-io-manifest/files/autoload.php
new file mode 100644
index 000000000000..f604d8b1f924
--- /dev/null
+++ b/dev-php/phar-io-manifest/files/autoload.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once 'Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+   [
+		'phario\\manifest\\manifestdocumentmapper' => '/ManifestDocumentMapper.php',
+		'phario\\manifest\\manifestloader' => '/ManifestLoader.php',
+		'phario\\manifest\\manifestserializer' => '/ManifestSerializer.php',
+		'phario\\manifest\\exception' => '/exceptions/Exception.php',
+		'phario\\manifest\\invalidapplicationnameexception' => '/exceptions/InvalidApplicationNameException.php',
+		'phario\\manifest\\invalidemailexception' => '/exceptions/InvalidEmailException.php',
+		'phario\\manifest\\invalidurlexception' => '/exceptions/InvalidUrlException.php',
+		'phario\\manifest\\manifestdocumentexception' => '/exceptions/ManifestDocumentException.php',
+		'phario\\manifest\\manifestdocumentmapperexception' => '/exceptions/ManifestDocumentMapperException.php',
+		'phario\\manifest\\manifestelementexception' => '/exceptions/ManifestElementException.php',
+		'phario\\manifest\\manifestloaderexception' => '/exceptions/ManifestLoaderException.php',
+		'phario\\manifest\\application' => '/values/Application.php',
+		'phario\\manifest\\applicationname' => '/values/ApplicationName.php',
+		'phario\\manifest\\author' => '/values/Author.php',
+		'phario\\manifest\\authorcollection' => '/values/AuthorCollection.php',
+		'phario\\manifest\\authorcollectioniterator' => '/values/AuthorCollectionIterator.php',
+		'phario\\manifest\\bundledcomponent' => '/values/BundledComponent.php',
+		'phario\\manifest\\bundledcomponentcollection' => '/values/BundledComponentCollection.php',
+		'phario\\manifest\\bundledcomponentcollectioniterator' => '/values/BundledComponentCollectionIterator.php',
+		'phario\\manifest\\copyrightinformation' => '/values/CopyrightInformation.php',
+		'phario\\manifest\\email' => '/values/Email.php',
+		'phario\\manifest\\extension' => '/values/Extension.php',
+		'phario\\manifest\\library' => '/values/Library.php',
+		'phario\\manifest\\license' => '/values/License.php',
+		'phario\\manifest\\manifest' => '/values/Manifest.php',
+		'phario\\manifest\\phpextensionrequirement' => '/values/PhpExtensionRequirement.php',
+		'phario\\manifest\\phpversionrequirement' => '/values/PhpVersionRequirement.php',
+		'phario\\manifest\\requirement' => '/values/Requirement.php',
+		'phario\\manifest\\requirementcollection' => '/values/RequirementCollection.php',
+		'phario\\manifest\\requirementcollectioniterator' => '/values/RequirementCollectionIterator.php',
+		'phario\\manifest\\type' => '/values/Type.php',
+		'phario\\manifest\\url' => '/values/Url.php',
+		'phario\\manifest\\authorelement' => '/xml/AuthorElement.php',
+		'phario\\manifest\\authorelementcollection' => '/xml/AuthorElementCollection.php',
+		'phario\\manifest\\bundleselement' => '/xml/BundlesElement.php',
+		'phario\\manifest\\componentelement' => '/xml/ComponentElement.php',
+		'phario\\manifest\\componentelementcollection' => '/xml/ComponentElementCollection.php',
+		'phario\\manifest\\containselement' => '/xml/ContainsElement.php',
+		'phario\\manifest\\copyrightelement' => '/xml/CopyrightElement.php',
+		'phario\\manifest\\elementcollection' => '/xml/ElementCollection.php',
+		'phario\\manifest\\extelement' => '/xml/ExtElement.php',
+		'phario\\manifest\\extelementcollection' => '/xml/ExtElementCollection.php',
+		'phario\\manifest\\extensionelement' => '/xml/ExtensionElement.php',
+		'phario\\manifest\\licenseelement' => '/xml/LicenseElement.php',
+		'phario\\manifest\\manifestdocument' => '/xml/ManifestDocument.php',
+		'phario\\manifest\\manifestdocumentloadingexception' => '/xml/ManifestDocumentLoadingException.php',
+		'phario\\manifest\\manifestelement' => '/xml/ManifestElement.php',
+		'phario\\manifest\\phpelement' => '/xml/PhpElement.php',
+		'phario\\manifest\\requireselement' => '/xml/RequiresElement.php',
+	],
+	__DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/PharIo/Version/autoload.php'
+]);
diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml
new file mode 100644
index 000000000000..622fae9de476
--- /dev/null
+++ b/dev-php/phar-io-manifest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">phar-io/manifest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
new file mode 100644
index 000000000000..c70be9f4ebe4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples"
+
+S="${WORKDIR}/manifest-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	dev-php/phar-io-version
+	dev-lang/php:*[phar]"
+
+src_install() {
+	insinto /usr/share/php/PharIo/Manifest
+	doins -r src/*
+	doins "${FILESDIR}/autoload.php"
+	dodoc README.md
+	use examples && dodoc -r examples
+}
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
new file mode 100644
index 000000000000..dfda2a28e7e5
--- /dev/null
+++ b/dev-php/phar-io-version/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
+DIST phar-io-version-1.0.1.tar.gz 8686 BLAKE2B 2cb7208f24ebce981b1b487170d8f07fd43c6dc53782e2797c3172736255e29863aa832d8e63f59e9f941fc154a1e3ebc6452437641f92521f84ddfdf2d3e6ec SHA512 c3bd6e7426bbac99c2b7028d86429f954daafebb7aea3c969305035ce5fc98c3d718f34efbf36658442bb4f60518dbb8217c314f2a3afd429e037120cc7428d9
+EBUILD phar-io-version-1.0.1.ebuild 608 BLAKE2B 59c9d1d45bef023a078b225e84ad17a3a32d199899c81088b354d0a394055438b7530ec80585e35f59bd5ba98969d84c1767ec6299e7b2b0386c04220a296259 SHA512 c2f2592d011a7d051c5cd4a1734dbd421e64107451122f0e5d83b1211bb931ed15a54fdbed88b0e596de0458c9d1a065fcf573492e6e49affb5061ed7aa2b9b5
+MISC metadata.xml 319 BLAKE2B 7b19dcdee79f5b221681a56499a5b1a088bb6b8bb1b98d4c38a0d9c65212f26cc9fc8e830ed60eb077b9804b9d9d8cf3033ef809ebbb4de14b23507d8ca9e1c3 SHA512 c229ce6bba2b1abd6e744e26e8d9f4653ee53567d6eee13fb2b2b485db84963a121349fd9a26c5c89c63e52545605903a3d066bce5aed1ab17ed75d57bf96b11
diff --git a/dev-php/phar-io-version/files/autoload.php b/dev-php/phar-io-version/files/autoload.php
new file mode 100644
index 000000000000..0036ced557a9
--- /dev/null
+++ b/dev-php/phar-io-version/files/autoload.php
@@ -0,0 +1,6 @@
+<?php
+/* Autoloader for dev-php/phar-io-version */
+
+require_once 'Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addPsr4('PharIo\\Version\\', __DIR__);
diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml
new file mode 100644
index 000000000000..49b1640723c4
--- /dev/null
+++ b/dev-php/phar-io-version/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">phar-io/version</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
new file mode 100644
index 000000000000..6a4c90ec3d51
--- /dev/null
+++ b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for handling version information and constraints"
+HOMEPAGE="https://github.com/phar-io/version"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/version-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	dev-lang/php:*"
+
+src_install() {
+	insinto /usr/share/php/PharIo/Version
+	doins src/*.php
+	doins "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-python/ImageHash/ImageHash-4.0.ebuild b/dev-python/ImageHash/ImageHash-4.0.ebuild
new file mode 100644
index 000000000000..b3fefa3afbfa
--- /dev/null
+++ b/dev-python/ImageHash/ImageHash-4.0.ebuild
@@ -0,0 +1,30 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Image Hashing library"
+HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index 3d933c141f28..da0ff0aaad7f 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -1,5 +1,7 @@
 DIST ImageHash-3.4.tar.gz 290881 BLAKE2B d5c7ccb997ded4fb4927906bb52464140d1a175d4dee9d4ef6981b8c0f5cd092535dd796ccccb5ca28ad168273c34b19c12fbc09e7c90a2a853f9fbcebec7d03 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba
 DIST ImageHash-3.7.tar.gz 294629 BLAKE2B bf2fa6cd102c24d82a83b61b6d648013eaa1a78d99df37c9b918dbcc070136bac8edcead016bee831d34b0f35ff51eeebf0cbdbe45e6ac8e5783b93d766b4d94 SHA512 e0da65d9d2a42ffce5c8b95017fd79bd002f48a963b956836695118e89bbb2ff936629a743248b4189439de155a0ec5f54a34d7cf7b803ae581b45f7bc02b500
+DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e0afbb4e35b147f9be3e95cb0aea81eaa42fcce989427d99d8ebdcc143ce04f432520f54958d64c731042d22e8 SHA512 31265e85574cf330339d10c789d06ed0a0ff25aaa30c8ad5f2d39db3d3b40bf5b2001ff78f1e1622058d03f3a7203d2043d2a553adf6d8fe3337c44a4f605d2e
 EBUILD ImageHash-3.4.ebuild 681 BLAKE2B 7af31a04e155f3437c54b135c55f09fb97e4e62d75c0b8c317357e2006cc46f3c1dc1a152d1982b28943a0fd444d6abbf71c0a65d55a50470b2a8e043058288d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4
 EBUILD ImageHash-3.7.ebuild 681 BLAKE2B 7af31a04e155f3437c54b135c55f09fb97e4e62d75c0b8c317357e2006cc46f3c1dc1a152d1982b28943a0fd444d6abbf71c0a65d55a50470b2a8e043058288d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4
+EBUILD ImageHash-4.0.ebuild 681 BLAKE2B 5bab586e088313993f5e0e98eca0efae3a9db150331d5c24a7f3aa4f1e054cec66f35a4c0a9748cc26e57c94e245bad3b85c8479eb0444c2edc76015e50bd13e SHA512 2adcd962c15b911943f615d1db2b93e0a473d1cbf59423902343a4547640ebfead00c39e9b113d8baf278d93d92558db029ea2fed446c18845891808d4d9afc7
 MISC metadata.xml 706 BLAKE2B ab0d81756c67a0937dc22a79c3bcb3ccbd0f90362ba3dd3a41c96ad92ba3861cd8b08dea737781be5aba843928018cc8853f45580a1d8385e771f38146bb0d0a SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e95ba7f763bb..34fca316363a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index adb51b08a9ba..5deb69972fbe 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,8 @@
 DIST boto3-1.4.7.tar.gz 217171 BLAKE2B 900c5c4249df9d0c3b5d157835f66be5e7cd3e2f4b934047340614ef729d30a5952f2996f1638626a10f9e5e55cb05d4792241b6f7da9c5157da9caeb464acac SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3
+DIST boto3-1.5.27.tar.gz 221841 BLAKE2B b604bb3f20f6ea5d6fd9de8ea63258cd4fdb36fb7cdbd6ca2e194f177dd37da3609928be47fc620ab42db6955aff373c757ea0f80896be947aa714bd6da487f8 SHA512 c38d11fc1e1d65cfaf9bbe00da210c4713fec9232320387efc11663470fc333a622877eddd1c60216496cb6fb399f0964cf51bed67209c4c7ec17af03972350f
 DIST boto3-1.5.6.tar.gz 218891 BLAKE2B e2f9b567d8c4daad21895a6e8eff7e004229d96715e648c0f62705d5b3db1520e98e1b93d88650e8be98517e971258c0fae92ba09622f86081bb1a1665937645 SHA512 15eacfdf059634ad86a5c41b0ca237e24a6602b0cf9c897fc3d89b02dbebc93043c338d0e1d89d47bb619521943807829f67a384f450987ad5c85b34d1c76d81
 EBUILD boto3-1.4.7.ebuild 1413 BLAKE2B b9305754545fc6818476a70e19ea68883c01f9ff56613616836d5950b96ed2c15cdfb84657a4e38e6d168c3f3704bbbc8d58eded87d673ae3075d97527cbc047 SHA512 57902ff38cc3bc44cbcbcd83a9265fe360bed5992a27367f3e5ab00fce7ce0e469fb41db6c65d593ab070c57d3f86f56338adca5a04d4febd81927fa57c26b07
-EBUILD boto3-1.5.6.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
-EBUILD boto3-9999.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
+EBUILD boto3-1.5.27.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
+EBUILD boto3-1.5.6.ebuild 1462 BLAKE2B b8d8823f63c92d74f94dd291eff7a321c66fc66fe5394138916819799274c10938397f39b1a2ba128ae5b85e940fe11ed0a8926768602217a3b6b4610ca6edb8 SHA512 7b7825edacd6f96522f8a93a924cec93ec56312b863b062cdcefb146f0f742d4ca0f46bcd9d274e01ad140ec6262de64789bc7ca5e3c51a4f96c587ffe70a368
+EBUILD boto3-9999.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
 MISC metadata.xml 433 BLAKE2B a94a845e402ed0f6d4e9756babc64f07bd3d1c8600198f6fb77a6fc36a593904baa5cfbb833607cfdc74551b6429c05ad6e7b9947373b05a9fef43df6abb55f5 SHA512 b85e30e557a6bc3432c4bfb53e882f6652de9a68ec1e2ca157bfe27234e2c79f9a68195234e0dc631e3ee19a5331e547af40d09ea1d3acd095bf35eb108af3d5
diff --git a/dev-python/boto3/boto3-1.5.27.ebuild b/dev-python/boto3/boto3-1.5.27.ebuild
new file mode 100644
index 000000000000..76025bdf9594
--- /dev/null
+++ b/dev-python/boto3/boto3-1.5.27.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/boto3-1.5.6.ebuild b/dev-python/boto3/boto3-1.5.6.ebuild
index 837af95fa1ea..26a90923fb50 100644
--- a/dev-python/boto3/boto3-1.5.6.ebuild
+++ b/dev-python/boto3/boto3-1.5.6.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,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 837af95fa1ea..76025bdf9594 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-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
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
@@ -37,7 +37,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5787b2388bd8..beb3685a48f2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.7.39.tar.gz 3838231 BLAKE2B 53355a6f0fca131db8ae41ff7e0b5405dc2a4c1a0630743ec34e0fabe60468d27ea9d36b67dc3b8757c3f524eabf3fef1e55d3eb0df1f4c5bd229448f8dfc3d4 SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22
 DIST botocore-1.8.20.tar.gz 4173990 BLAKE2B ce9813c77b440fdfd123593aeb9f5c47bec877981dad5089b83633deebab3bf4aed76c13ac73f571eeb8349406b3f04e6c33634a865e076ffdca266cf418b80c SHA512 0b822bff75ef26c7e996e354a5c06cb50eb13d7e58f65297adcf023a81084c8b98500c08b906dcfd346e2dadcdde33d472d6d51c3e081af8667c5adcdd2deffd
+DIST botocore-1.8.41.tar.gz 4196554 BLAKE2B 8f74b8f53fb98ea0fbadebb1739799eb30fb52748377175e0682292f4868910a5fab187c9065434e67d783eee0bb119555daa55020f1b909370749dfdf1dbc87 SHA512 d8bb3eb704268410646c0290fde829a3f69fc9c587b31afb43649efe345f626dc902be0ba7939239bb93871138aeb7587671dcb91ac40f4241c90b2238219d30
 EBUILD botocore-1.7.39.ebuild 1344 BLAKE2B 1f0cfff06a615aa3abb56213721dba88a548bb336715e21b67f1d4f367b2bfbcc7c1a5415123fc8b392a9828cb49d1f97defb7f89620e89aef0088845223b425 SHA512 d6b49f170d12c9611f292cd1370d7506bd95eb1f88d0ae0a44111c81619393e00456eebe7de733de1bf988bd43eeced819554fcaac5f89cedad14d6a55cdc40f
 EBUILD botocore-1.8.20.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
-EBUILD botocore-9999.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
+EBUILD botocore-1.8.41.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
+EBUILD botocore-9999.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
 MISC metadata.xml 482 BLAKE2B 32f49cb53c6116989ba95b90ce5e6967b870e6fbce0125597f81a97d119b0d0206458e9683f3714f8708bad8b8e3a17bdfae49ed737ce9e8ddab37cedb19ad74 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59
diff --git a/dev-python/botocore/botocore-1.8.41.ebuild b/dev-python/botocore/botocore-1.8.41.ebuild
new file mode 100644
index 000000000000..89ab97de7bc5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.8.41.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 7f976cb95e55..89ab97de7bc5 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-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
@@ -37,8 +37,9 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 71bf220f8ffc..1f2a36bd5c9b 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,6 +1,8 @@
 DIST bpython-0.16.tar.gz 201898 BLAKE2B 907f6a506d2b52db01e7b84c615574a7daad36f630646a345c963e432cc394330339390b6afc2585845b19d6c00d9c0b95e06b9d3b0fe85fe20daad3f5cf208a SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b
+DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
 DIST bpython-0.17.tar.gz 214230 BLAKE2B dc26de037eb5698c04afb74472fe9483e1398f4f40b7da21520f2e7e2ba6e510bcbf200938d520d95b976a6fbeb31af7b1b1f828a022835edbe40d381c82797d SHA512 17c25f4ed69eb7cff27ba0a488434623a7105c60bbf1e6f608c91babf240741ab7a7097ad347f897cd5f39f2fedb944fd69d8dbfbc66da6b910e1a14ace6fd1f
 EBUILD bpython-0.16-r1.ebuild 1487 BLAKE2B 0f53fba5e2f027ebda8071aaab20bee2ee93d40630d57d591f6b4a6479bb2475b57664e99a8a7c87849400a303260b9aeb7ebd7ec0342a3d847e2e0675b695d4 SHA512 21e61a4b6d34837c71b40b3248d48c37a547f966d28f429ae6742c173589808afc27b28441287e0c40312bab5a3a56fec25223de70ceb9d949f49c544bed0563
 EBUILD bpython-0.16.ebuild 1483 BLAKE2B 25d5ab30d26946e42d2cf2345af7b37a9dc8d63267fe23d6fcdb977c3fce5d714eb7665f438c001b2bcfa877effda64d2f33179c20b7144570fe5ee83b8e4f13 SHA512 cd22c5d6ad08bc534255b5a58d9593fa75505b4b05064b520cb6653ff224a56e76e0e2bf37f55de4ea2254d2dbbf744a90b40f02c82978393feece634217bcab
+EBUILD bpython-0.17.1.ebuild 1487 BLAKE2B 8033a7c64ed187d0324d9f50452d1941c69a8b839b20b310412cbff7d9cec6c4a9e226d9f9023e85decdfcabb4f3788d242b8bd6836f1e33e3389616bcbdfd81 SHA512 e78faad5793a9f8b9aaa1be1ef27bc4ca94aa1d88dc727087edc59e3e7083c3a52948902b5c6c97784a0841fa115366c0d73e41fa729eca07c5ad5aebff18cb9
 EBUILD bpython-0.17.ebuild 1487 BLAKE2B 8033a7c64ed187d0324d9f50452d1941c69a8b839b20b310412cbff7d9cec6c4a9e226d9f9023e85decdfcabb4f3788d242b8bd6836f1e33e3389616bcbdfd81 SHA512 e78faad5793a9f8b9aaa1be1ef27bc4ca94aa1d88dc727087edc59e3e7083c3a52948902b5c6c97784a0841fa115366c0d73e41fa729eca07c5ad5aebff18cb9
 MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
new file mode 100644
index 000000000000..6905eb544957
--- /dev/null
+++ b/dev-python/bpython/bpython-0.17.1.ebuild
@@ -0,0 +1,55 @@
+# 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="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index db9b0342cbad..27b84bf3b1d3 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,3 @@
-DIST configshell-fb-1.1.22.tar.gz 34383 BLAKE2B 2b2f09308552fddc381a931e5e6e6989c8418c99df534ba9ae6ff2631c8953a6ab817a71feb0d1bfc1644fb88f115a413794e88549fe3255828696deef46a340 SHA512 be6fa988ec42014da7e33c5610c2075c04ac7024e64f1c5665a0178d1390356505d69f93d58cc43b602bd26cb4ca28d085b55feafbce90a5dfb57ab26438eea8
-DIST configshell-fb-1.1.23.tar.gz 56112 BLAKE2B 7873d5a7ac856aa3c268595063af14db312a1506abe9cd64e69745dba4cf1ebaa0bb098228100c76bed649921e0d5ec614e56631f288eb56f786eba367e3366a SHA512 f657c885889d8714817e6b726aabe13909bc74410d00cdd5aa6c6fba773da3eddfeb7c08699292406d0c1f58bb0417da41fdfeadeff8de5107c52d953bb9e468
-EBUILD configshell-fb-1.1.22.ebuild 731 BLAKE2B b0b4c52ee93046eb8bec88d8365c8580e9c828f3674dbafc461e68e1e83352ca56b383f26d8fc85522206114b3bd0cf3efc19d1ea2c8d0f68c46d8c60eff29ac SHA512 5ea64151bdde030d5704022ad73c08143642d22bd6a79326fff14e7af28ed3f5be5c381276f2a86eebb127a5d761872d5aa59a815118bf14835ca3be45018e26
-EBUILD configshell-fb-1.1.23.ebuild 604 BLAKE2B fc39bc40628d41c3c096f54cbae2b79d768d2fd9af1718b1054d9f61e187a5f2573f93c80a2653383565b7d4e9a8003a0f3edfa16c5cfb8e25751c9e2a9f1e37 SHA512 20ef1369e9c4eeae235c552fb654acfd3506c536b4bc1772c88332a36a12dd7f122f0da2caa9ba24880824e664d0f19fedd35c8715338ce3a5cbf4713edef6c0
+DIST configshell-fb-1.1.24.tar.gz 56946 BLAKE2B ddda3313bb41a346d08006f1d3c1cdc708a940ab9fb2e0042896947b89e32cca872fc8a19a392eeebbc6403f042aadcef2c78962c069e9c1ed10a2f5d4bb102f SHA512 34aabe6fa5c2f00112748e35fe3859fae09baac5ef13b9aa80e6f00908290a0d724119aa3b2ce86da8bb171c60860304e650aeb16bc678354a7464bd0b5c9b48
+EBUILD configshell-fb-1.1.24.ebuild 604 BLAKE2B 5382789cd15282e826bd891d87ddacb7619b997683a6ad78350b5bc47333695e9db2b6ac707ed15968f2d02a082250845834c09ec46996a8f3f76fecb77c9a01 SHA512 6783a060de90a9e85f6985c89f600ecb38df5022d2d0cb987c3e16cec3c50ca056e3a955d8ff2f715ef4dcdab92440ce0e5340d8c821069df4c2094ab8e02fba
 MISC metadata.xml 838 BLAKE2B c01894aaf7273e4cc585fe62e73598d371ce2b924259928afe1a0ae2c955250413150a41e2f857fd75c92e9b7106cf557f7320d8af59b5767a1382f46d619b4f SHA512 426228139c7da514e5debf7e6b393af66c78b38d3cc36135866e05e0751aed60c44ffd230e1d8a2c06cce44b173444c9f88f0a2175c6a5a96636ec730a53a5de
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
deleted file mode 100644
index a9d5765390a5..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	!dev-python/configshell"
-
-S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild
deleted file mode 100644
index 818f1a60a00b..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.23.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	!dev-python/configshell"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
new file mode 100644
index 000000000000..16152005bc40
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
@@ -0,0 +1,22 @@
+# 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="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	!dev-python/configshell"
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index ddac156c42c3..257d89ebbe45 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,5 +1,7 @@
 DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e587896d58f87b15aefe9d29a90530ced591a2c6814dd37b91274910ed131fe031846071311bc6cc07c11d1f9cdda9e4602 SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
+DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
 EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3dc366597b21d528c1642d251400710a9dcd45f0bac1cd7e1faafa4506b358bc4d723d5c87d1db05dddec74eede59fa3a SHA512 a7bd731d00b142fdd0dcc90c8c2b3e87ad4766ca4725cf10d2418b13de82e87df1931cb76fa40e1808fe0a8d1be3012e855e126f0b398f5aaa308118a67a9c0a
 EBUILD dbus-python-1.2.4.ebuild 2229 BLAKE2B 306760812025ff7684666d7d585b6c72391ac3f5bf0b3562784b0b90394950fba905033bfc12d68f09136aa98178c65a704e9e125df0491a0d2fc98fe90cb3e1 SHA512 591ea483d5f3ba0dcd818b04bd2f8a6282e98e84a83e7631f75b38b06249e6b4820d40affb4990940a6d5c968dd94bb155c232fca47e65ceb63545027d467b3f
+EBUILD dbus-python-1.2.6.ebuild 2259 BLAKE2B 0a844ba8e2215dde83e8ea7286c619981aac5dbf43ce710c4832e8a99f691efc15e13c9587ce4f3166f7aa0e0916fbf199d556b87f62f063eb679b2032981c7b SHA512 65c46dae5970b6883897d8dc56ba6bd939abbb1af581dd7b9d93b9ee58ae4193ee01a294958c017a59bea6c182006220f7241e72df0455f41b39418834a7e1e5
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.6.ebuild b/dev-python/dbus-python/dbus-python-1.2.6.ebuild
new file mode 100644
index 000000000000..169ee6c62d28
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.6.ebuild
@@ -0,0 +1,90 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools eutils python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="doc examples test"
+# API docs generated with epydoc, which is python2-only
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.108:=
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-python/docutils[python_targets_python2_7?]
+		=dev-python/epydoc-3*[python_targets_python2_7?] )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		local PYTHON_CONFIG
+		python_export PYTHON_CONFIG
+
+		# epydoc is python2-only, bug #447642
+		local apidocs=--disable-api-docs
+		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
+
+		econf \
+			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+			--disable-html-docs \
+			${apidocs} \
+			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
+			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
+		# configure assumes that ${PYTHON}-config executable exists :/
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		default
+		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
+	}
+	python_foreach_impl run_in_build_dir installing
+	prune_libtool_files --modules
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3ba027ac1834..c518754bebb3 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,7 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-EBUILD docker-py-2.4.2.ebuild 1585 BLAKE2B bc50c495e887bded0ad49dff9d3cf315eb463986811bf970dc5f1700f090c94507082596348fdd65a16e3bdbe411606f80841f504c82cfd8fbf36002afbaab7d SHA512 c9b91f286226af040062ec2be6d30e2960460b3fcf7d06ab0ce38d6364166477b638d29a3fdbf6f99ccd8085627c7fab318689d74b378c9b6acf45c9bf9071a7
-EBUILD docker-py-2.7.0.ebuild 1539 BLAKE2B 3b21eaf5ea0aabce9827d91557f387f45607a483102b2a10b9694d3718cfe7eb5ba8d31698bded9463d2875bc7afe6f8065e97e66023af8dc3036489d1cff068 SHA512 bb20cdf4d7a9111b3f12e45888084c189a632a360c71fe36865d50e6f57b1901f6a86d46b19e978e101fad92495d36dadfb1037819a90fce680a61fe07723603
+DIST docker-py-3.0.1.tar.gz 199081 BLAKE2B cb0c6a56da33b43c3f2c50bd16fb7306d08c770aee42c626a36d8fc5a0a4ff6d1851ef452e6585a587ed72ef27c4c6f45c7452ab3f0f994c959795721ef8aae1 SHA512 2d4f362c1a93b004f41d8338e801280827d646cbbd98d87c6fbab3fd443a3aa7ab43e9db7ad8197d50ee735d7d264e17991f5af7d5a2483c3630ca139ae21e19
+EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
+EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
+EBUILD docker-py-3.0.1.ebuild 1539 BLAKE2B 657219c2cb376e7c78e7ee5baf47a53df484afc9c913caeec55f7f593f2036010bda43cc1b4d56893807dbcde3b1d13f02de050c20c28185cbe6f8a05117f13f SHA512 457e8b341448c5d27b6788314489acb0236be60c59916eefe5db1adc13b78c9aea7625fe7f0d3062ea51f3239e08c8399c2d14b96b44d18573257c7f22efbd4a
 MISC metadata.xml 515 BLAKE2B 4283ac75c4a68d8704d1368b1f6c953beb6cd271cca4620944e6d254e00fddb130efc1b02a707a05b17d927da792a0544d9f9c834789b334beb516a7bba2e1ac SHA512 5bd90d9576f2e9995f6c69c931236ed41deaf9f817137c29c3a7c476d12a68350e8df5f36a4021a1d6f41c534cf737575f462fc09af90ad2cba47fdb4ff0bb8c
diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild
index be34ebbd5bbe..da2a393fa746 100644
--- a/dev-python/docker-py/docker-py-2.4.2.ebuild
+++ b/dev-python/docker-py/docker-py-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
index 009498461e88..df541cde5208 100644
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.7.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/docker-py/docker-py-3.0.1.ebuild b/dev-python/docker-py/docker-py-3.0.1.ebuild
new file mode 100644
index 000000000000..faef0a4c69fc
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.0.1.ebuild
@@ -0,0 +1,55 @@
+# 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="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 56ec466d252c..416a37b70f88 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,4 +1,3 @@
-AUX dugong-3.7-test-html-escape.patch 1765 BLAKE2B b0fda0d85a1978e351e83b235d3f6866dc8193364d6ff5a77b0555a6952324d21e008af27953fb57b01cefac375b734aa0c4a88796f60588a4e1e9dda3cd727c SHA512 8a341199805baef25e4d8316e7a5f290b5e33c97b53a53f19da03eb55035feed2ba7709e3429ac69c906af86c63dbc21835c3ccef4aa713ffd09b3d1643b7f3d
 DIST dugong-3.7.1.tar.bz2 194243 BLAKE2B a7514f4b515fcd519f5c11b834d44d16cd395d9eada659dd1913bd07a9a072e19f6737a3d702d9ef2a63160eb5452f146a4b04e744610b8f51c9403a648aef9b SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c
 EBUILD dugong-3.7.1.ebuild 778 BLAKE2B 6009fb01fa66fd5cc61370abba8decddb266daa4cc3b46e3c462bad1ddee1e952a1e7a2465f8b83c543676e184019b113a4c9fed8d8ac2ac0d820ff876422d92 SHA512 be73a4ab89970d3fcfe2b651950eadab8ca3c7fc3652acdad632bb71874cb0faa3f673678c5f6f62a9175a5c73c391635ddadf2082371bc24b4429b09caeec73
 MISC metadata.xml 386 BLAKE2B 8a2dc259255a5fe345b1f1e04b1708bc34f7c31351b01b90a856b93604fef92be88bc75f7120dac1fb4f86f9aace962729a2d91e13094e5ee59b9c464280628f SHA512 9ac2081eb11077d2d9d7318410053fca1855abc8fe288bc18de829c1874e38c649620c56e2a7eb9fe29e41bed8dcb7c3327a2203c60511ab233a58d93f542db2
diff --git a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch b/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
deleted file mode 100644
index ba2ee587d0c9..000000000000
--- a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Zac Medico <zmedico@gentoo.org>
-# Date 1494468556 25200
-# Branch test-quote-html
-# Node ID b8a28438442ec12cd4067fd3240d9afc8e6998da
-# Parent  a986296769f3fc4daa0f29fe28b857f43d05634d
-Use html.escape for python3.6 compat
-
-https://bitbucket.org/nikratio/python-dugong/pull-requests/3
-
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -24,7 +24,7 @@
- from dugong import (HTTPConnection, BodyFollowing, CaseInsensitiveDict, _join,
-                     ConnectionClosed)
- import dugong
--from http.server import BaseHTTPRequestHandler, _quote_html
-+from http.server import BaseHTTPRequestHandler
- from io import TextIOWrapper
- from base64 import b64encode
- import http.client
-@@ -34,6 +34,7 @@
- import ssl
- import re
- import os
-+import html
- import hashlib
- import threading
- import socketserver
-@@ -1163,9 +1164,12 @@
-             message = shortmsg
-         explain = longmsg
-         self.log_error("code %d, message %s", code, message)
--        # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201)
--        content = (self.error_message_format % {'code': code, 'message': _quote_html(message),
--                                               'explain': explain}).encode('utf-8', 'replace')
-+        # HTML encode to prevent Cross Site Scripting attacks (see bug #1100201)
-+        content = (self.error_message_format % {
-+            'code': code,
-+            'message': html.escape(message, quote=False),
-+            'explain': explain
-+        }).encode('utf-8', 'replace')
-         self.send_response(code, message)
-         self.send_header("Content-Type", self.error_content_type)
-         self.send_header("Content-Length", str(len(content)))
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 9f04e01ac1af..50a4919e83a8 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,5 +1,9 @@
 DIST ebuildtester-0.1.2.tar.gz 5598 BLAKE2B 5ee20592858758d769106f67558ac233a4ac2577dfb2d5ea7b892d6eb03ca00728e8f77a751d942270820235909537a987459875879d5b04fe98b816a436331a SHA512 0c2ac0547fc5b318023fc4e7cc85169f93d834433538d201c25a220c936b5315132bc0e53b76defd1082678a26da959b152f6a27172cf343d6c45811e3fd15a0
 DIST ebuildtester-0.1.3.tar.gz 8969 BLAKE2B a5da5ea9bf951e6aff6ec084812c97ecc4674f81a134764f923a221a8527f8ffa84aff0dc311d25ac09e4eee56c9e956b55bf68347fd3da42f7a10cb84793100 SHA512 bb272b764f08fe282fd3b0b4e26ee359a82b0f12e5b0f6b15d8da40c70535ab0550279fdec40983eb02d1fc3457b8b432bc3ecc3cc630e8df4aa0fabdf90d8da
+DIST ebuildtester-0.1.4.tar.gz 4606 BLAKE2B 6fb02af5a6aea9a1c4c707686abe643c39e620e8be1ae99c3654a32a49908b64eb4dc85a02374a3cb96159b00814791405ca82c7e2009feb57018b820cf8bb73 SHA512 7067483eee04b63da2c716c317a44268d30f5ed28cb0b43ad76a15d49405495f54788ea5401449543e797325b16f1b70fba80f0243066b083729abc35383a7b5
+DIST ebuildtester-0.1.5.tar.gz 4602 BLAKE2B da79f568be9abdfe6758db8edbf4252730ce25786500a524559613f5c83f32d972b04887b01b9e00f24310f663e9a91a9cbbdc9a9b6d3c588dee3cf57fa13ac8 SHA512 a610bcdbcb4387fa71ed0a38cbccf117e3db4879e8cee4f307fa4f528664e35972c9d3698609c1cfe284db01795047cf13572f0cfb947cd3ca4adea291f100c3
 EBUILD ebuildtester-0.1.2.ebuild 510 BLAKE2B 3c113737b936f191be833436b9574f98c1983465515d574bc2d68ae86e19428fe072353a2eca937f495c4f49ddfbf2f079d0f83f5287859f17d466fe81594b66 SHA512 829b62c014a5bc172b97f26d5144f8023ae83de0ad24062e3d0829589fd6fc8e7d101272d2f1cd0f3b7f966399377a67ce934c2045b0e9b73de182e1f08fd0ad
-EBUILD ebuildtester-0.1.3.ebuild 514 BLAKE2B 07f2a2fa17fb9c4f982155b5511995e7e6e2fa671c03c58840132f9fe3d68b6f59ae4b7c06baf24aeb1595262edd1d40ed1d77e935157bb41e94f7c757f4ba55 SHA512 fbb8c7b7a4a5f4bcb0b48317cac8c9452335c04fd34fee4c2530971d4b4e4bf8be700a4d9566a4fdf04ade428b207841c8f8c36bf2dab21b6da251b667ade559
+EBUILD ebuildtester-0.1.3.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
+EBUILD ebuildtester-0.1.4.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
+EBUILD ebuildtester-0.1.5.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
 MISC metadata.xml 351 BLAKE2B 680dd90aef25bbb5e5f6d038b321c40d41f0f47f7bd9fd912ee074ea436cf934b5ba1a14908a27eaa895712462a5ff657b49702ba83686b82bc3a4fe74d372d3 SHA512 116b97de3d96c37eb2b2bb5ca22d67ba5d52659530905cb129335e1f4142cdb041de39b9391b5d29bc506f6dcbf06b32fb66b5ac9a5cda919953b2ec06a6b15c
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
index c36bac753991..7c7636b4b92d 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="https://github.com/nicolasbock/ebuildtester"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild
new file mode 100644
index 000000000000..7c7636b4b92d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild
@@ -0,0 +1,25 @@
+# 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="A dockerized approach to test a Gentoo package within a clean stage3"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild
new file mode 100644
index 000000000000..7c7636b4b92d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild
@@ -0,0 +1,25 @@
+# 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="A dockerized approach to test a Gentoo package within a clean stage3"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 24cb3e620dbe..246cf8f28539 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,10 +1,13 @@
 DIST elasticsearch-5.3.2.tar.gz 33704368 BLAKE2B 861ca6b37ee71b2a7d3b988287df88620fc88ec6961267c440d1083feadadcf036832f41446135ecb1066c51c3ddd259934562de53b2dad69220a1e4962c3e7c SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00
-DIST elasticsearch-5.6.4.tar.gz 33776770 BLAKE2B c74df8a496c30be315abfd7d1a71f7f8eb75de1a64a7ddd22ff742bd547ec38d417c1ce4002ed6c90b2716837ee0425cf87c910d9f810999e837d118268dcd66 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47
-DIST elasticsearch-6.0.0.tar.gz 28017602 BLAKE2B cea47a17109eb5d46b1d94c3763f19923d97392c4a39a8dffb157b8ce60cf959e4680c2a54c5a9d204db64393f3f22dc52c0de94888753e817d808575ff352fd SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
+DIST elasticsearch-5.6.7.tar.gz 33789994 BLAKE2B 4e5f4e55cb3875adee7528e26187659b5bac7b2def9d22d438f888fb33ce116654b54859d8430b203c14939bd3821240f8ed209ce120388256e9389ab9acd11c SHA512 2c9fbe8d3ccdced6242b5d876cb9a25a3ef1b94f9de0720aa438458b0235082220621afffe7976664bf08b13b4aee157c28a5d519b5594e6d9d7855c24e93056
+DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
+DIST elasticsearch-6.1.3.tar.gz 28454781 BLAKE2B 80c42a64fb533a5b2f0a2c6ea154b129e327acc0d2addc6f1dd5fd949573459ec87118e12b98791642fdfa8e92927d749dd60119adcb398fca56e6e00b0811e2 SHA512 af10cc571ab55f52ab73a86373fa8359214a7866fbb6d2910669e6be897bae30c41c007c3be5803a7f07736041f32cf36425c182a18fab39499321ed9eb4b349
 DIST elasticsearch-py-5.4.0.tar.gz 81286 BLAKE2B d15ef79ee9720b4ed67c5538c66301aba2c7a4baf9a48faef0153b76dbf780749975d664c8e9d52599077738e543d6c5113bde3748e86f239f1b92a272ea934f SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae
-DIST elasticsearch-py-5.5.1.tar.gz 83543 BLAKE2B 067fbc15db359c7b58ee9b2a850ac6418415b90cd1847020a5f2379030e87e20bfdc7f90c6c062bf91fe89fa72b81385133dd03bed531fc3b03e4f7bb5ad9f97 SHA512 ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd
+DIST elasticsearch-py-5.5.2.tar.gz 83415 BLAKE2B 6adf9d5e05c2d097590bc78df9c9a7a948194a4106d718464c04e705380984b51d8f7e04fe9d0eaa6518d6d8767aa064c99512cf827a31e993178ee3c28a8815 SHA512 c5c9583179e87b13c7edf14baeb5a360369f37a953049c3c7e101c379cf895c8fe743d5edaaee6aa0fa4ee6cdab9364c0177097ad780ed3d85ede754088520a3
 DIST elasticsearch-py-6.0.0.tar.gz 83197 BLAKE2B 5ca16c9b881fe6f8c4944e8eec69be0532fe472564b12dbaa40225b29b8a2b88974e35ed2ab733722023da3ed877a2934bb545387ffdcf307d519950a8971880 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444
+DIST elasticsearch-py-6.1.1.tar.gz 83575 BLAKE2B fc7cd690208a401b83fd1b86957dc49b2bd686248f2d78901551c26e67e06f4c7f6175346fd0374ff509477f571a8074ac30aa0e2cca1c73b11b6cdce67bfe33 SHA512 f593865de8879ac42cbbd35dd6bcc1da9513124556dcd3f1d8240e9d2818682136bfac09387c50797f4daada33699a7f5c1591172a7d89c3bd865595a5706c18
 EBUILD elasticsearch-py-5.4.0.ebuild 2656 BLAKE2B ff39bd1fa8148c07781624d47b1c27765b9f8f19ced76bf6815edcc2e8be9ad4ce43d0da49e850e70d246e56f1eddd7ebff3e3e075fd0d7893c12cc9e46a4868 SHA512 5b757f21244c74c522ef2cc6533f788c031d4de915c1658645bcc87020089c196822ba6d5918ca90063f98de9d037abfcbbd737093dc436620e64ad90e4cd03f
-EBUILD elasticsearch-py-5.5.1.ebuild 2654 BLAKE2B 409849cec594d97e2da84196ef1b16f11c05beea137e533c34f0baba9ea31b7b4dd015b106ec2c739e0213bf72ab48407a3d50b55f3afe7efd0c00924e09ac15 SHA512 330d2ebd23ed98ea7f6f1eb8ec748edfc2082bd0adccf151045ee357352597661643deec454517b9074ac4b70ace527a06f70b29537fb52af8e3f6486e4de95e
-EBUILD elasticsearch-py-6.0.0.ebuild 2650 BLAKE2B 8d445beda4af18ebda5dd45a0e395d7d8f51514de8b3f8dd5e386c2652a50b78f3b418b32fa558db4f5445576175ab1292c75489839ef4d0aeb09905a5d66d18 SHA512 d02a0719265c1eade6be53321be073330ec2cd5ce9f6b6b2c6f8863e175de570ae1fc59a025c4363529a9173fde6ee79e903fc7838900cbf4ed60008fb014b87
+EBUILD elasticsearch-py-5.5.2.ebuild 2756 BLAKE2B 88cc27ab8953f922699d4109c925b05b99718ce0e496aa6277ff50cffb6c02bb8da198ceb815ad8accde3dac7f079fcefbd4c2e36a7aec3129ec2b7a6a2159fb SHA512 c9d5ee7aa70ea951f37827d3b92ff44a918e734a3a78b184c71f43175793510575fdfe46113b0293b9d7a8932ced532ce008d5e6807dea2a5ad4e6c31ebcfe00
+EBUILD elasticsearch-py-6.0.0.ebuild 2756 BLAKE2B 6dac845f2db9b7204fcbf17e70a357b0a8939d24b3fa779eb9978f1fc3edfbeafb039ed75da87d216271c161452e46780807d899403c6d3519bd30772db8290b SHA512 b8fe212ef1a44e79f4aa712118b664a80385068cb847d23970eccbacf171cd98e899da148833f434a790d55ee9dcda5ab7cb119bb581e152d79c029de2fd6a32
+EBUILD elasticsearch-py-6.1.1.ebuild 2756 BLAKE2B 4ea4b1ed0c26ac25915a281e755dc21f803b75c60798326c6e5a46b7a6277dcc32e35ff3164eaae2fd67c28ff978a7a8733fa49c5b71a099630cd180ad42b770 SHA512 37321c3206723abbeea13904bed0ce8c03524c2a404c7d6101df2b8485cc787231fb6fe67a5491dd5997f74a154a7b5fd267d873aac0e6ee7202c9b941f27b98
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild
deleted file mode 100644
index e6383930c480..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="5.6.4"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.22[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
new file mode 100644
index 000000000000..faeeca4a8d32
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
@@ -0,0 +1,102 @@
+# 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} pypy )
+ES_VERSION="5.6.7"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
index 3010af4f0e28..db922834ad26 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
@@ -4,17 +4,11 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="6.0.0"
+ES_VERSION="6.0.1"
 
 inherit distutils-r1
 
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
 MY_PN=${PN/-py/}
-
 DESCRIPTION="official Python low-level client for Elasticsearch"
 HOMEPAGE="https://github.com/elastic/elasticsearch-py"
 SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -25,6 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
 RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
 	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
 
@@ -40,6 +38,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
 		virtual/jre:1.8 )"
 
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
@@ -85,10 +94,6 @@ python_test() {
 	pkill -F ${PID}
 }
 
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
 python_install_all() {
 	use doc && HTML_DOCS=( docs/_build/html/. )
 	use examples && dodoc -r example
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
new file mode 100644
index 000000000000..cddd568301b9
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
@@ -0,0 +1,102 @@
+# 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} pypy )
+ES_VERSION="6.1.3"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index e218e18d774e..5a8381a3d55e 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,5 @@
 DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-1.4.0.ebuild 949 BLAKE2B 0e13a933937d9b6094ec30cf555d51aa083db4282bc879f3b89a9a9a8b0934dc00a4372cb58ff4eac3b42d5047d3302822adac2ca39fae4375b66c42f9a83f91 SHA512 481967dfa1f4b684f207c6d6d7297cf0bc41c7fad304841e3bb469c75dc68e02f2ffd90f4a439e1050adb8a41b3330358539262026a177d7e380a765d4fbc954
+EBUILD fixtures-1.4.0.ebuild 948 BLAKE2B b0859c09e359584b56648ed1afc87336fc7ffbdae910b8c59414dbf07d735056139f3869b9ecac049fcd560564d0e5dcc76217075a58eac2cb1454f00efdcaab SHA512 a6a97842f799e9c90b423e85d02d1f68f52b94f275b49fc93f395371d85bd725a3a77091f53e5df81ba778a1aa3b16dc6125ffd7ce3a0e485238b11620023e3c
 EBUILD fixtures-3.0.0.ebuild 952 BLAKE2B 29cd5be0e5c2ff27251f10a353ad68eeb7d68ad04b91e55a80a5287e7be6d838ca3d3abda32a4503c80a71e8bf5ac454f8d2abdbc06aaf136fe4fdbfb144fbe0 SHA512 28ea049e38ec7d76f41f31671676891c6c60394994579730cd0a96ed353ee78e93232a5a5ffd3b4f430f923bebedd97e43850d2c1ae59146215a31c84767c248
 MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 7fa418f9b964..23ac41378893 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 925f604d1228..acb93f5dfa45 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,7 @@
 DIST fonttools-3.0.tar.gz 298992 BLAKE2B 74adad38ea49e95b19a306d7a37cdff60f9983d32f4cce0685135153f1cd9adaf1b344edff57cdb060ec085dfde41d9f096e4eb49d5789494e19e54343c55316 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e
 DIST fonttools-3.20.1.tar.gz 998249 BLAKE2B e6949d421d317cf2ddfe5d77f59b770b6a7ae97d6b3fca319ef36b81291478e66389043e1482d7685ab01a1fea31fa0d2eebb9310e7628f65dbdaf177fd0bbd7 SHA512 62945c6bb38f53d986f5637dc41273aabda53726eea9d0ae558768aab129bd4dd2c8d1632c16059b09f41a7c957a5ad310fac8669e37fa342259ccd290408cb9
 DIST fonttools-3.21.1.tar.gz 1002962 BLAKE2B c60d95b769abda7c973b5226d6ed5f23fe4ef159f7ddbdef8fcb4bda27f173f6a1856c596ef845954d4d555e3c475242bd03abfd37cfd0553ee87f86f733d1d3 SHA512 db06d84e7a2998b317a4166be328bf3e8ed1e168e623993f120c94df1e8ee35e6836b906cb53b15d3abbda7ca84ca4924b708d03b6e2fe96414d4f4007777f4f
-EBUILD fonttools-3.0.ebuild 715 BLAKE2B d975c56505f0e4259687a0a3de8b4d98d9e2d47ac732db0e7127545a73e1748bbca9a48888da2c1cd9a70d223b3a2574d8aa8b4b2e40e6e47249d95e54bfde10 SHA512 5ff43c81e6109df1cab0d27c059c85e20e6fb268b4bad6168fcd88b7a2f317b3ffd3f20ee4634e43e0deadd2cbfdf24936c0099cf4114d8944ac846ca2604822
-EBUILD fonttools-3.20.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
-EBUILD fonttools-3.21.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
+EBUILD fonttools-3.0.ebuild 721 BLAKE2B 795ed9214f81cb968350bddaa894c8c614faa5745531797ed6564eaf2591022e920a0773f95db80ce0896b3413e6685df8a84179da95bb7af7a94fdde2e0f97e SHA512 25263d4a9a2dc606e62e68425708ae4ba4c9b4c37f3f7c3f4a8950adb5145342ab594c5fce718797d2d4aaf56e240eb76fa8ffd3ca24281f4943030a176f3aed
+EBUILD fonttools-3.20.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
+EBUILD fonttools-3.21.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
index 453400fdf8d9..baa1f1be41d2 100644
--- a/dev-python/fonttools/fonttools-3.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.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=5
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/fonttools/fonttools-3.20.1.ebuild b/dev-python/fonttools/fonttools-3.20.1.ebuild
index 1585a70af801..f7f3da947a6c 100644
--- a/dev-python/fonttools/fonttools-3.20.1.ebuild
+++ b/dev-python/fonttools/fonttools-3.20.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/fonttools/fonttools-3.21.1.ebuild b/dev-python/fonttools/fonttools-3.21.1.ebuild
index 1585a70af801..f7f3da947a6c 100644
--- a/dev-python/fonttools/fonttools-3.21.1.ebuild
+++ b/dev-python/fonttools/fonttools-3.21.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index db8ee54cd7bc..47f235891237 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,5 +1,5 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1076 BLAKE2B bacb27cbf0c73d8fbcd64bd068c448c37ce03324445f192478a0100d97866401c64a3b2655cc6ec5dfdbbb4030abf878d22f43af577f9bf7812b80158f81bfde SHA512 bb2712caa805494c2fb755c651abc50ad4063055bbd46347a7330980473f322ea1eebcd4327c3f07240bdbef9dcb8493ba7e173c7c93dcf0bc86f0220525d2c9
-EBUILD git-python-2.1.7.ebuild 878 BLAKE2B 5f70d5b758456cacb9b14ccdd61247983d55d3fbd209b2bc81d41c57f8b12609c32a9d88e5dcab161feae526c94667629e9ccd39f970705418993b7e5a849314 SHA512 da8191a957788003e50595392c91c68479cdde5c6022dbf6d038f078eb532849ecb25781bdebeff283fc1e3ab2244d84ddd698bf668a282413bb5272a37b211e
+EBUILD git-python-2.1.7.ebuild 885 BLAKE2B 2b76aaa1d075a64da66dfd4efaf43da6e16ed8f93a763a6968bd37a7155e97743f4a738e9863467a6e6ac3f1d0c36bf20339c890aa5ac632eed373fb5cb88c2b SHA512 25c45a7292274ece19b6950b619e232b6de241f90c4085ba2a40e389241b5581bcd38cee32b03d95a65cf6ddd72c9738e08191fcae3a24e898a6bf50f93501c4
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index bfa1722cf7ed..ff2076d95fa5 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.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,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # Tests only work with the GitPython repo
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index 543d65f152b9..a7cc3c03d159 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
-DIST gitdb2-2.0.2.tar.gz 393188 BLAKE2B ccd57931b6483bc4d1f142644619f6ac0e4fb852a9a2f58f261513d10f2ed1124e4bf7413190809ede95e79c8b667edbbb084ea8d4df56574310a3c14582b4c3 SHA512 685af97dcb1f352255024b8a382255dacea00aa6312f71d2a16eab00d0204ebf6d46c90d804a4778ea0ef35eae7e5a2f5ae71c16851206fdaf27be8af59499d9
-EBUILD gitdb2-2.0.2.ebuild 1232 BLAKE2B d46119ef2bdef29e69e1c2d9839f06168238caf75a1d732b8851e5cabeaddeffdac3ae50ee7e10737423d0a43c80405a1215b6635b3940ac85e1237f6c12b9fc SHA512 a175742c8e932e8303a1e7410a9d73f616b243b12b8c360a14ec58235faec98cd3b6cac66a5a5415e91babf10251245895045ff9aa6784f2f20f1fac3c4e105e
+DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
+EBUILD gitdb2-2.0.3.ebuild 1239 BLAKE2B 53ae11be8ad5e08ea5652fa80852c778f263477704c524c30f5c8ca5a91867f7e873ce9d4882cc2a26696ede9096a01afeb59237f60b13e52f4f92d9016a4650 SHA512 959c301b90c7bd518da6d3f0ae48595fe675bd24b6451cb38de6e37fa5c9366fba7c753ecfd89dbae85b2000209f3905cccf3646be4d45db46001b6542471a45
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.2.ebuild b/dev-python/gitdb2/gitdb2-2.0.2.ebuild
deleted file mode 100644
index 4aa4893fc037..000000000000
--- a/dev-python/gitdb2/gitdb2-2.0.2.ebuild
+++ /dev/null
@@ -1,56 +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="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.python.org/pypi/gitdb2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	!dev-python/gitdb[${PYTHON_USEDEP}]
-	>=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
new file mode 100644
index 000000000000..9e2c2a240f58
--- /dev/null
+++ b/dev-python/gitdb2/gitdb2-2.0.3.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 distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.python.org/pypi/gitdb2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	!dev-python/gitdb[${PYTHON_USEDEP}]
+	>=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/grafanalib/Manifest b/dev-python/grafanalib/Manifest
new file mode 100644
index 000000000000..3ea0c943d596
--- /dev/null
+++ b/dev-python/grafanalib/Manifest
@@ -0,0 +1,3 @@
+DIST grafanalib-0.4.0.tar.gz 19957 BLAKE2B 27c7a597020ab465d2a7536676d1021472cde25a669135b1efa8b18061e3c932a0262e826f4ab05dd5f5902c620167a82c56e4f534d185d4b330dc3a7f8c0619 SHA512 f061512f89375326d0c44854a123fe4335a6265be0f71b7df4310b21031ca4cc691e5cbe21a5fe32d2e56d72e7c8075e7369674a19887b7b03c0739a39898975
+EBUILD grafanalib-0.4.0.ebuild 602 BLAKE2B 086e3922bca840afd4a36a96dec2ba067fbb148ab916f7a676d417b7da97aa357f452f9fd0af5d2f4f6b4355cebf622d0103f1388243a2c07b8a66bcd81e19dc SHA512 71884f77613c91bc85d8ba586c5f727b40a0c13d6a1a102c2a8084ae8fec3f2d4f7bca322a42b5498a6d2443da63b5d86226250c53ad285128324da027cf8d17
+MISC metadata.xml 341 BLAKE2B a737067da5bc892cd48440b2e6f53be66deb9f6c6310cb2056bbe40f39d35e1c11539d94d1b9291503a5faa60699d1cfb0797c0559f05f2de1c32f79736702f0 SHA512 d2b8ed64cbeec22f532938aa17c94e379b6a97aff993e02872b5eac578b06d877f536bdea7af553fc8d3dfc1041d98e244cfdbd407413ba03c4ec49eafe43a62
diff --git a/dev-python/grafanalib/grafanalib-0.4.0.ebuild b/dev-python/grafanalib/grafanalib-0.4.0.ebuild
new file mode 100644
index 000000000000..a5cdef174422
--- /dev/null
+++ b/dev-python/grafanalib/grafanalib-0.4.0.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=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Library for building Grafana dashboards"
+HOMEPAGE="https://github.com/weaveworks/grafanalib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/grafanalib/metadata.xml b/dev-python/grafanalib/metadata.xml
new file mode 100644
index 000000000000..bd87ee4fb98f
--- /dev/null
+++ b/dev-python/grafanalib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">weaveworks/grafanalib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index e5b857a547fc..c238547aba4f 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -12,6 +12,6 @@ EBUILD httpretty-0.8.0-r1.ebuild 2309 BLAKE2B b10b7c394adb6c2f3a575ca5d73cced907
 EBUILD httpretty-0.8.0.ebuild 1223 BLAKE2B b868e9f107eab4720ddc9b5bf18823691f04c79492cf08534e080553657e6365911efcad3e6f5f506690f9e1bf14bdcb8aac021b802f80b586ff886405b51db7 SHA512 8f3eef3205c7ed4d1165d6c0e389a4c9aad75260330f26828cdb69de83ac4f9db0441a70801b32064c63678ebc1f20aff9863e3714c161a2e7ff5f943d605e91
 EBUILD httpretty-0.8.10.ebuild 2307 BLAKE2B fdceb19536f36f4cd51c923a4b35a6e0905221090faccbd07b95fb54471e7111adbb8e68d45572aee3c7f853959a02eaa1a7c064ce5c5e728ebc563f4869f940 SHA512 ba89125cdbd1c277ae523e6052b9cf4e94cc8c879e755c5d01e30cf074cbe612626b74f07dab7814b0f6bd0f92b625a32526b28e23ecccc05805d3ad1fe94092
 EBUILD httpretty-0.8.12.ebuild 2321 BLAKE2B 48c363fd10a9ad49081276a23490a7869c5b8faa531340af5fa58c9720a9490cd923a71f5a3fa8ac0a4e8f6e635518dbc69c0ddb76d9695f306f2a2c4ac22a53 SHA512 b283fcb17cfc8468035ab28acb5b6cb117634ea14f8557c06f3a0cc6485f87b89f17ca0bae3db6eb019a82583299f2d5c0a65b67e26b9b44964671e25ca36bfe
-EBUILD httpretty-0.8.14.ebuild 2313 BLAKE2B 72c4679d6833c273516dbceb5d5fd839e516d2f43ef0d54c49f7127ef880732c679bb5678d7a002d1217e393c3d712cf9eb8f78f973504b9f3925a23a533680f SHA512 28c889079832baac7452bb4e85f86a87f812a0c5b822c32aa882c792210a4cda06a0361113b7a37113bebdb02f79cd5f5df5d8619f500b1dd8fb2181ba6ca70d
+EBUILD httpretty-0.8.14.ebuild 2320 BLAKE2B 531224d633c62cf995a3fa3be258b96375287af3544df16bc165d8f29d92c7021ced7e026a0f358900f5450cbad3e6bbb964d998b2bd8ebfee9083b5ab3a8bd7 SHA512 3980892e50376218d848940e22b594146e1d6d2ac46d5131ecb5f39fd42cd6c788d5dcf4fd7274ee9ab3656f35ffc6b1551ad4521313cf7bf46ff929a4cafc68
 EBUILD httpretty-0.8.6.ebuild 2330 BLAKE2B ba780538d7ea4656ad5442ce0466e2dde7d1d86c532169b74f1a86f20cf4258fc141ddfac87e16fb4619352b923f52f77dbe82828a873b142fd6d50e7babde3d SHA512 fb4ea0ef4bddd1fbafde0126f91c8efc4024c267a633f0f378143e93ec3b054f93f65ec689713674351b35b43fd3b26e570d3196023c57a5a142100eed258293
 MISC metadata.xml 393 BLAKE2B 904c5889a4cb7ee65cd6e400dd7484aa3e05ff66f5fe8c4822d13aa67be4573a70dc1188304cc1f93821deb98f41fd84218d7fcac2a7fa5b29346bce51303eab SHA512 79c7b3c101043ed36490f7b543f191d79e8fc3b2d9830ea44999e7e8018e6d1fcbe73915fb2f1adff9e6110404467bb98786aa6091fdf751021a995f0ef6f483
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
index 9c545c3eee1c..2645a4b1820d 100644
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.14.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index 38b670290cdc..629ba8c0b19f 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1,3 +1,3 @@
 DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
-EBUILD kitchen-1.2.4.ebuild 465 BLAKE2B c64f5213092e6488547e941636cc417972a81df55c27a0a429c8415685b854757bdbfa86edbdb6ae11290826847590814c6b1ca481fdbc803ff093f8535fb456 SHA512 80f102bc25825bdae53f5805270d4b9ec7e66a40171d20526fe3d3c7eed66b65b2f0140cc71e8e400e38cb739e32940bc71f66485c14fc69571fb4e55ad33d96
+EBUILD kitchen-1.2.4.ebuild 431 BLAKE2B 350d77e735a27b147e2c24bc164c34fda172be9b4c299b75b063ed00ebb815dae23ed6b328b92030cf35e6ccf45310e7650fa0ea2603465002bf72ce039d3384 SHA512 af5cfc91b6029e36a1af5d15fe5f480e05ab8413d0a03e509ad2693d95fcefe51f2c2d88bfdd9d841a3542059907b253473a56f81565e893e164dfe3f5cb7a97
 MISC metadata.xml 394 BLAKE2B 7dc512534576658b0235d756ef866ec734882a11ed3c976751b0c724cf01c9a4ac1fe828bdd63f98ea91d240eeb478f9dcba07ad3017af16cc7e53a7fb7b381a SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index 8420a55ca661..fdf3cb4498c8 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://fedorahosted.org/kitchen/ https://pypi.python.org/pypi/kitchen"
+HOMEPAGE="https://pypi.python.org/pypi/kitchen"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 7d4fb1f9e5c5..491a823e0336 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,5 +2,6 @@ AUX kombu-NA-tests-fix.patch 495 BLAKE2B 08c35788e488b2ae94f643850b649df379bff7c
 DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
 EBUILD kombu-3.0.37.ebuild 3727 BLAKE2B 5a74030b0df42b993eb11940eaeadca125802f2aa15b3958228fa40ba73080ab370ee4e0c2ca58da1ad51e311edf588e6fcf68fbee1050aa528e00294c148b57 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a
+EBUILD kombu-4.1.0-r1.ebuild 2241 BLAKE2B 5ff47a44d0d6a623325a51728b60d8593c396660f294ea71a3396144ab0dbd9e9dc7fdf7d1b6d8e40a24387c406ac86892327078f8066d9eea62c406cbe8e0a5 SHA512 5ee7fcea8dfe8cfbdc54943d9ce3be1e67193a9ee4c9e274d89b0fd02ae51a3f863fbcf21d72bb5ecf8d48bc4cc031b3e2257bad6dc42249859386762bfcf304
 EBUILD kombu-4.1.0.ebuild 2148 BLAKE2B 36c0c8ae345ccfff8db38b2f4d4be1c0f5d64a012263ce87f45c6ddd2818d9ab1fc075f2a491cb878093976b1a33b7f89ce8da9fb5eaecba7090149655d08749 SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3
-MISC metadata.xml 576 BLAKE2B 05dc771ac713703f5d403483255e64d7f8df363b81856af7019c954a819d4b4fb051c5250a588d714d755e9785cfd0bd55502c9355aecb99171539b672072087 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b
+MISC metadata.xml 728 BLAKE2B 4da0d6e3a26ef9e1c091806f4c57c783456e7bd45e1119e8909e4deed6bb0206e2f6f84c53eb437542a593b6f3697cdc30a741016d2c0ae47815bdd56e8c23d9 SHA512 fa21e5537b57b55de995577fcbccd530cf505b9bc37422e7caf6f471a50027100856bca0a9a132ca42dfabd26b42e16306a03e0f3c117fadd51fd28766723201
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..08cdcdd61cc1
--- /dev/null
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# 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="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples mongodb msgpack redis sqs test yaml"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1)
+RDEPEND="
+	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
+	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
+	redis? ( >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	rm t/unit/transport/test_etcd.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index 7c51adae3ca3..b487c812a554 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -12,6 +12,9 @@
 	<use>
 		<flag name="amqplib">Enable amqplib support</flag>
 		<flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
+		<flag name="mongodb">Enables MongoDB backend</flag>
 		<flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
+		<flag name="redis">Enables Redis backend</flag>
+		<flag name="yaml">Enables yaml backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index e140841f694e..d7c9da9d7edf 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,4 @@
-DIST libvirt-python-3.10.0.tar.gz 184402 BLAKE2B f3ae1626dc6fe2afc2eb7754f6872a6696389bc13a3e8f557c6487e83e3ef66104251910fb4841a2f8b1667cec0418b87ad5a7e9ababf76a39a0f4adaec23bc4 SHA512 bbab01d43b1d9e682c5590c1ea1454c8891f2c545b49f48220f4e79ec4b5b01ab1736242a96653256e26fdf644389c4021747117978a9ec4e1084001de9f23f9
-DIST libvirt-python-3.8.0.tar.gz 184346 BLAKE2B 453051621c0e43eb73e0734a2a2651357f363c4f61c1cd6b883841a55e6c2338721b3e116e841a47386e12c8bdb1d36aecf9b8948876256effffd5396584a555 SHA512 40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178
 DIST libvirt-python-4.0.0.tar.gz 185533 BLAKE2B 3f9e3483265b18025bbfc0955c2b0b8276448c41e2d85a49ebc2d42f8dcd77af25a0a11ba04fbe02dba282a946ac3f583866c5d9fcda0d56e7a5f20dc63e7f94 SHA512 3eca33bb04265323ad47a6c8cb04a6848ab2b06bf656a188c7c0a39419e6dcc5c21f16682f6c64647da432c1d7e3ddc4699d848766987baccf806d68b5937d9a
-EBUILD libvirt-python-3.10.0.ebuild 964 BLAKE2B 71ac33288178ce6dce1440f94dd11dc67e8a98aa567af9b230a62bc2936f49525a6893ff007366fdae962d106f7b4403b9f555a7134708be2d4d4b7982121f5d SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b
-EBUILD libvirt-python-3.8.0.ebuild 971 BLAKE2B a39cfbaf5c4d4f07ca0c0ad31963119305c21bb03588672716ee6c382ee501c45593ea0942364d7980efade1e2ac4f12badef737e02988ba566637fdce0ffaac SHA512 be12b7ea11f13b9ca7554d4c577cb82aec98008781868a8ab0f4a7d6632d48f47bc89b4702c349dd7d968a00fb647b515eb4606af35c21a5d1be6f839d25f648
-EBUILD libvirt-python-4.0.0.ebuild 964 BLAKE2B 28b03bf2c512a12d539b1e1cb15793821dd1763ff142e12bb6fece94b41f8bb29f1897c2c88479356f5de8d44ef81c3237730a1736ddfc4e3c243140c523f685 SHA512 dd0e54bab5b1a3cdd5dac84c1b9fe7f0191c9a1b388b0a2495992c798553ef10830b2a168906f9fadbab1a39e8749f486085b535fae981209214080205f2be42
+EBUILD libvirt-python-4.0.0.ebuild 971 BLAKE2B caf77d87ce352223c8c169ed840374c61109b1737c1a7d670d8246bf7d74b5577a90568769d1abfa50511293d3c4f3c3edc6b4497e4df230394adc5267031c5c SHA512 15c3b85fe89d593d0e4438fdc537bde2143fea5bae099293241ff78974df6141a730d6f9e3735593ac7b8a91301efd599a42d07699b81e166fec45e89a265690
 EBUILD libvirt-python-9999.ebuild 965 BLAKE2B 4a1ddf017be6ce4999a1c15edbfe3361e2561ada9845cd5b82e3174a7c2ec3b16de29f6e0bd572fbb251bf06ede220e3b4e1e6496e3d2e49e7bac3d1b4c4c193 SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild
deleted file mode 100644
index c16440985c37..000000000000
--- a/dev-python/libvirt-python/libvirt-python-3.10.0.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
deleted file mode 100644
index f0a6aba3d07a..000000000000
--- a/dev-python/libvirt-python/libvirt-python-3.8.0.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
index 172f3dc38862..5839b78806d7 100644
--- a/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index bd0ae6cbaa4b..ccef16926128 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,4 +1,5 @@
 AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
+EBUILD networkx-1.11-r1.ebuild 1931 BLAKE2B 20597ec1e3661beefaff41d089f2ad720403651543b2cfc8c90f5e1a174f590f07a7147f5e7068e0fdb71c7719767ac6e5f40a5e2f471549e4a5d8c88acdbb38 SHA512 15d2d1450b10ef2429f658d5d94464f1c71ea33e0134e75dd3e9650094571abaca44ad3eeb141aa8aea1f2db3fd06f063f6d9f2e5e96a7b917476eb4aa21d8ca
 EBUILD networkx-1.11.ebuild 1912 BLAKE2B ec8ab770f6d9a19e0196a59e5fc0081333766e3db81d004a0bf9f9378e962a986d33e44170b9b1a51e52e7723c9411e1355ce68e7a6322f7cd058f61e62e4f88 SHA512 c88bdf91975f6e192eb557d1b492ba92f768e191aadfd36f1dda73ef5f420fbe9dfe91c07c0c187134a6019cfe364031670068aaac182de6f9b60e2245715a63
-MISC metadata.xml 1062 BLAKE2B 03559c285540641325a657e55b75d147085ed64c92a9f65709ac0158e662a28468892d6af1b17b286f1f2e51251f2a3462e8eacf3fd05a6b0dc3479d41ac2a06 SHA512 1db48def6b8009291d6d5235323b88f42b865e009a6cb8d9b09c6519f9a55ce71ee61904c95558ad719e35161daa15fc253f0fdad2942a6ba1ac44000ab80a30
+MISC metadata.xml 1131 BLAKE2B 59e8dfa70e76d2084bc9bf4cdaeaeee7844ed7cd58b096d840ca266b10ca5213899717f60e416f336a288ae5fcdfc764c28e3a0376388c290c42f2ca924c9f34 SHA512 d91220a26181e850a8ddb2a4cc31105bc01cac62e88ab9d76757cf0732cd680aa1568a671902790893f08508072fac160093457f3d09b670ea704d38afe49e1c
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index 10664d364e8f..dff6872815b0 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -20,4 +20,7 @@
     <remote-id type="pypi">networkx</remote-id>
     <remote-id type="github">networkx/networkx</remote-id>
   </upstream>
+  <use>
+    <flag name="scipy">Enables scipy backend</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
new file mode 100644
index 000000000000..e94f2e4f4840
--- /dev/null
+++ b/dev-python/networkx/networkx-1.11-r1.ebuild
@@ -0,0 +1,75 @@
+# 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 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples scipy test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	)
+	test? (
+		${COMMON_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		${COMMON_DEPEND}
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/1.11-sphinx-pngmath.patch
+)
+
+python_prepare_all() {
+	# Avoid d'loading of file objects.inv from 2 sites of python docs
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup -2
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	virtx nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index 3cf22c035c5b..13d0e57fa0ad 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,4 +1,6 @@
 AUX py3.patch 699 BLAKE2B f445fb6ee3756f29aed8591583938fdd64eb192c0942e5d5373fd40e725c0316406bcf9187ca128057e11dda1da2594e7b252afd1cfabf6fc8d3429576269da3 SHA512 45072f0fdb3e95b4e7301ccaa9168dbfd11dd0dda651eb6f9dff0352010ec6619e9af3de38d03fe89c93c5794883c4f9d6dcf6bda3a21db64449f0d15b65c336
 DIST nnpy-1.4.1.tar.gz 4826 BLAKE2B 28e976fdde6580e5f0e828f4e68858ca74459899092b448f0f54f89d88cb1dc7e9df9583de76d2e9ee824909c834404cfca92d0a477bfa58573c57e9ddac0cda SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2
+DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
 EBUILD nnpy-1.4.1.ebuild 628 BLAKE2B 143dfa4c7a6e0c7304f9c02f4b89f27408b0bfdcb2bbde8b07073a155c7e1802abac9aea0a20baa29227fc994818e18e5a47699a3699da75b09d33537e2e833d SHA512 b9cabcca60b2fb5ce3de656ba9788da050b00c747a41ff63d49355e982ff4b8e70478cbac45feff219e13d1c610a145d49d3c42812be02eb2df6f572c29266b9
+EBUILD nnpy-1.4.2.ebuild 591 BLAKE2B 51257af61fbb502ee3e072761a1de5b97dba9f4d863b41eef8493518ae3461837dbd97678852ab5dab2220fca589ac8810a2cff07a264a301d0b34aa3b395683 SHA512 a42f9530e247c52be75edd734f96265255282d191190ba49506368de8ee4fc8563ab2a27b73546cbf474b6a9327779a2ae09cefe3da05b38f25cb8fcc6d6f64a
 MISC metadata.xml 432 BLAKE2B 3fa5f82774cdc03df8a39db591bc688e25401a58c302aad0230074916a7e0c97e838552f50569f0f5278d570bf8ae810d242893bf704bb10273890d1def55e5d SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b
diff --git a/dev-python/nnpy/nnpy-1.4.2.ebuild b/dev-python/nnpy/nnpy-1.4.2.ebuild
new file mode 100644
index 000000000000..03f745b7b9fc
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 04469b2fd974..7d9d45d1ac17 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
-EBUILD oslo-db-4.25.1.ebuild 2094 BLAKE2B 5c8e44685dfcca15423e5a36396902c8fbf80c52ab4f914c74b96e5eba158ea4549ffd857a2b52122dcb350d278bcce886884b917ca838c79b4689430c277272 SHA512 a178cb8805eac1a73fbf6e258d3861fedcba16a5207a875e0f840bdd3462845ffffcce482979af4730b508b0a8be3e4fe0c5f117eb1456ba612bc0d6f303d476
+EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild b/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild
new file mode 100644
index 000000000000..58f1aae1ef23
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.2[${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-utils-3.20.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		|| (
+			dev-python/pymysql[${PYTHON_USEDEP}]
+			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
+		)
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-db/oslo-db-4.25.1.ebuild b/dev-python/oslo-db/oslo-db-4.25.1.ebuild
deleted file mode 100644
index baf4e552024a..000000000000
--- a/dev-python/oslo-db/oslo-db-4.25.1.ebuild
+++ /dev/null
@@ -1,62 +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="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.2[${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-utils-3.20.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 9c370abf6bb5..44db7e2ef59d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -5,6 +5,6 @@ DIST paramiko-2.4.0.tar.gz 283484 BLAKE2B b0f7c99d8083aae5f70605cead265c060af299
 EBUILD paramiko-2.1.2.ebuild 1141 BLAKE2B 52ec975ac82f1921d19aa7264583a90bb081da736bafb0e0bb75e14e4b84df19d9759d10716375f659cfcf73c1a0e7a20e90d2cae240988713e215966a482cbc SHA512 db85d4e8c14a284c8f82c58a805362fb85c0bc15da075dd86e456ed4e439b35cee278574de5c8ef0496685c1d769dd103e4772f82bcecd2a8d7c691d5416101d
 EBUILD paramiko-2.2.1.ebuild 1092 BLAKE2B 8e157c06cd2964dfcebf1b01203d2f2db544a4043e5dacb94397d6259b5fc7e287142e764c7f062337d94568b91ef3276425f3348fa7db2eed597d9eb0a940f3 SHA512 697f81342eaee5a53ce0dc9dd49900c0ee8c9fa5d1a01a8b2d33165ea2b1dcaf7e429f049a586738f30b5e121e6d36471b011612e33244e77b7729dbb0a848ca
 EBUILD paramiko-2.3.1.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
-EBUILD paramiko-2.4.0.ebuild 1371 BLAKE2B 2d740ba8958f161d936e476f1fbdfcd95af06830655e4407e040ebf0f747de8abeac0eea5271f39fffb53be80ff6c6d5cc2655c1c676e81df8b62052dcdb56a4 SHA512 3d8a2dd3a9f49b0163358dc9fbb1f5329a2195f4b226b5cdd7866b248c08fd957284cb76dcb8d7fe88d8cfb3592045898278bb304a434f5970531c05091e596d
+EBUILD paramiko-2.4.0.ebuild 1378 BLAKE2B fc864a94c0dc5f3f2abad4c2c8e8ed312d42e0b80b7c32a9108af1bfa62e0684216c5a5717f22cc1b15b09e7e160fbb3f513b98eee46b00c13081a20e4193d74 SHA512 143e260f4d028a030d86d08a84ff9cc591c30fd43a88c0ca9ac3f2182c618e84d1cd2252f1f2532afc743318545b61174f48e7d0e91f2e0c2a2525bdacffe95e
 EBUILD paramiko-9999.ebuild 973 BLAKE2B 8699c5195a985d92b6c00a6c5197e08926fe19dc6328b1a819ea40c0729bbaac0fd6910429ee4e214e253fe2a007af0eb66f2e86cb872ab73dfa084c17e14e79 SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa
 MISC metadata.xml 1236 BLAKE2B 5b1a6c8a5694722970f07206173fd1dec4a69d0be780ab408493c5c5ac96a058cd28ffcd3308390870244792b951e8fa76430fa3b2b081902e204055aadf4b2b SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529
diff --git a/dev-python/paramiko/paramiko-2.4.0.ebuild b/dev-python/paramiko/paramiko-2.4.0.ebuild
index 121705cbb58e..7e1445da7c4e 100644
--- a/dev-python/paramiko/paramiko-2.4.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index b419d1d5519b..f0420df4741e 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,5 +4,5 @@ DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 EBUILD protobuf-python-3.1.0.ebuild 1299 BLAKE2B bd2effe2b42ca7613e7b205ba330a5bcd4aa2834486884d481d5c85e81d1d6d119090a5f215a97d5539a4277b8eb6513128a76533de30104c3592d0f3e8c9543 SHA512 762debb1a599e1fd75f61d17cac6afcd3813b56c543cca50c4a6c63b44c962f9aca3cda7a02b94de2bc21a130245eda91a346d2631c508aba15575347e33bfe8
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
-EBUILD protobuf-python-3.5.1.1.ebuild 1250 BLAKE2B fbf23cf9f8bb98c9d9d094e8828411457ce706f28cde10bb80ecbb4959a10e368c88af3fe585dfdb3700b374caa0bb9f46e1d3ec37877774583ce4cc6575afb2 SHA512 f5a213cbd5fcbc33479b8a77279ff56309399dcb34a58a16ae5e1e78e7c7526885a64a5df10ab05630f2554df3e56d4ce23c68719630ef4e7c89f10c3f283a8b
-MISC metadata.xml 609 BLAKE2B 788caedfdc3ee2ae24ab9f650d5bb0e0a61a3c49bc10fae0c2a4229a99eab9188ae949128c815bf40f9ea2306379dd9f76b1a72ceba06cbf5bb9481d05ffb61c SHA512 8766a0489a3233173a980c7b49b2a8024c582c06f4366f188264ba032d4df5171b14b9b68b98d911dea30e5188a6b80f04cc17cb6d074fdc46eb5588e5ce0f29
+EBUILD protobuf-python-3.5.1.1.ebuild 1249 BLAKE2B cf8be74d8b48d62ea402e5693be48928fcbdc562a3ff0360218a63854a80b995830af2b000f378b78920a75da7e003525934847d92733fc401dd48ffba1867c6 SHA512 460a92a00b948a5048db917ac706d376de759028aa90f0a914a392088369123d544a4b96a58384b7d0416d8e5734c9008ca7d6c3698e3274efab57fe56593109
+MISC metadata.xml 739 BLAKE2B 9bd0e34ef3e26c186b8d78dca05fc1ece8e2b04c3aede5a8d8cedf6f74b2993a280044307ba3e10d169bde5058eb4c01e01e217f417830825f14ad4f3615cdc0 SHA512 3b1fd88b5c06c07e200025243957851dd4512eccf8a0f5c52580d55e5e03088d4c9e478bfc13475a91e8b6eb90b0899a8479f6c94e5ed87f325f3910f0c8cadd
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 133ac2d04ea6..b9347a6d8340 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
+<maintainer type="person">
+	<email>arfrever.fta@gmail.com</email>
+	<name>Arfrever Frehtes Taifersar Arahesis</name>
+</maintainer>
 <maintainer type="project">
 	<email>python@gentoo.org</email>
 	<name>Gentoo Python Project</name>
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index cb4653d2f74b..7a50d4bb552f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.1.1.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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index da07dc9a5294..a8700ec7db60 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -3,5 +3,5 @@ DIST PyICU-1.9.8.tar.gz 183432 BLAKE2B c2e28a123e56ea99ed90160c1bf91f6e779481929
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
 EBUILD pyicu-1.9.5.ebuild 1257 BLAKE2B 72b335e3842b3bf99c397f3aea2e9e4a9c84d61c9aefd82648a74a6cea3e779f92384c74ae9a62d1351cf54cea06fd628996dbdd9bdbc4143eaabb1f2b657116 SHA512 3a90ca2a55c0a0c9dc2f6de4b03b146604a3cf2343f258101c28801498215abc274807851ca6da52b21b8b5d899096c02cbc3ecc83582d3721ced65561bebee5
 EBUILD pyicu-1.9.8.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
-EBUILD pyicu-2.0.2.ebuild 807 BLAKE2B 2f934c2d50eb185e37ef969978dd34deb4f52b79874d26774c67e800c8819587c56d5409a0a02a776a1dcf48ff74a7f5cfaeaf90eaf8a602bbed488df72ae873 SHA512 61687a7c54d95143770b31b4c14e2728dc820e3a2880c25c0f9a4be0fbe60d9cbde1826148c5412e5b8941013d49bdef9c8bd5970d0cbd3fd70a63dbb9097ab0
+EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.0.2.ebuild b/dev-python/pyicu/pyicu-2.0.2.ebuild
index 4dc247fee2d4..05b6f75cebe0 100644
--- a/dev-python/pyicu/pyicu-2.0.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 3269c4100a1f..53a623f2565f 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
-EBUILD pytest-relaxed-1.1.0.ebuild 760 BLAKE2B 8d548b7a50f5d7bfbaa7095d01a3ee2554d2155bf2314f637d3e85b206db663b108e450646a83386d83b933b7d6b7947e65fb631619b2e17238ab6b33172e8ee SHA512 243c98d5c32c02075df21aa57828d33308fa447460a66c017257bbb72465e0ecc6b95b1fa190a89426dcf427ab33c57d52cf764e1408d167ad4b35b41f471a3d
+EBUILD pytest-relaxed-1.1.0.ebuild 767 BLAKE2B fdd2f626fd53fbb31c7af11f04da808d9368a757f8f00da4732aa0aaba577b198c9982d709a3e7411636a5d21faad54e4f77c5c6bef86fdade5771729644b15e SHA512 cf21b2b43af7f102fbcfb73ce78f3f5fbe29e83502748314b3c0e95ad5d66278aec55da241ebd59ea6e784acb8d35c93e42e9367f1f7bb45f2c9e44eaa60b85e
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index 5264bf4fb7f5..027870280e59 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index c7f978096d5f..54044022f37e 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,3 @@
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
-EBUILD regex-2017.04.05.ebuild 1197 BLAKE2B 4cfb5d4e54f6d16805a3ba8faaa3b7dbfce58546bfbbf641bdcdea9285c97fdb11d190f389ad5691e994bcc4c84fe044787ebab89f021938b9d2370ac08ab2dd SHA512 c7839519a38b08bdfe53502befacda7c352c5c9b9bf032145b65d3c922d9d390d0c1b6afc7795068f12fb74b8ee167c40e819e930f990b11a310de1da76269ee
+EBUILD regex-2017.04.05.ebuild 1196 BLAKE2B 4e3a2d77927356ffe5b537606b35aeaa70a3ecd8cb90ae4126dac11515ff2997212dad53a40c3904da1d003d9600d93dc928b9faa8c812d05a9bbeb8815c3eb3 SHA512 7f8b73ba04b2db68fb6be1c61c2b5fb1f724605275ad963a5589af0850da6c3b21d650431d17edaea21441f3b0c9e17aecb6cf80f5bd19409486b6d13a8a86b2
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index 2d5b915acfe0..a18b33918a45 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 078d2260d860..2feccc4ecf4a 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
-EBUILD rfc3987-1.3.7.ebuild 783 BLAKE2B f39116ebd0e221510531c2b9f2410105e08f2b6ad6fa3e3e9f5ba62e5422af66306e8220ca34b16dfd08e748b9fe7131e40ba8cfb66101a5572a5938ce164ee5 SHA512 b7570d2a6a6bf2ed427a48cb212398b5516e2fe809f766b57fe27de31f788941f2789ab41f334015bb8df078bc1282d987691738af40f1a749971cb84e162cf3
+EBUILD rfc3987-1.3.7.ebuild 782 BLAKE2B b7a6fecf8ed2cfec46ac337f22f57989c2154ecdbc5efc7f573d48e426170fb8077de54768883843c0464a842a792944763ccd6ca6ff1f74ce6115b6cb60a174 SHA512 1adf243c48b8f8eb5e01b62737d8c29d3aedadc8155dfdf105727841a5bd6e518505d446c91b3044af5c5419921ff9cc28d7218a6aa1e92fd22f9a4018c9ecae
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index c290f019fa75..b13a89e89433 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="$(python_gen_cond_dep \
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index a3fce916c796..9f7ad49e0046 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,5 +1,5 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
-EBUILD rospkg-1.1.4.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
-EBUILD rospkg-9999.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
+EBUILD rospkg-1.1.4.ebuild 1083 BLAKE2B b4348d3a98c80a9ae1b2f41f0744c3eed3351049fbea366b3d61db65dabedb98cbee69daa7703113e54dbef8f0d70bcc5f92266b7184594173e3f4abe6c9372b SHA512 0275770022f4fb93ca1d58e196f6de84ad257f51bab066753539e1fd4f1738e4551585d83ed73546db48a631d5fddae4e50be604f7c0264049c48f8deac94929
+EBUILD rospkg-9999.ebuild 1083 BLAKE2B b4348d3a98c80a9ae1b2f41f0744c3eed3351049fbea366b3d61db65dabedb98cbee69daa7703113e54dbef8f0d70bcc5f92266b7184594173e3f4abe6c9372b SHA512 0275770022f4fb93ca1d58e196f6de84ad257f51bab066753539e1fd4f1738e4551585d83ed73546db48a631d5fddae4e50be604f7c0264049c48f8deac94929
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
index a7dae07958a5..bf7619313e02 100644
--- a/dev-python/rospkg/rospkg-1.1.4.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.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=5
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index a7dae07958a5..bf7619313e02 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-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=5
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index ddaefe776ca0..35a5606dbde4 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -3,5 +3,5 @@ DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e
 DIST s3transfer-0.1.12.tar.gz 102902 BLAKE2B d0a211985753893b714863268d41f23f9deeb6ab4e31e24ad9bac4e4e522a03d11ad4bdbb6cb4dca9eba06b63144e9e7425f852c16273d27673c9c25a195521f SHA512 1e7ce8db26bd1e9cf94f0754739b2a8caaed9b21c759627dd6ee6c265823c27534e0dc7bfe55aeacfd5fd42eb5999259bf3917d873b49cc25aea42e3095a9f9f
 EBUILD s3transfer-0.1.10.ebuild 1030 BLAKE2B 1d5fc2cee9433164f63c29ad5e2859f2ad7d49abb52540eecfdec10dc24aab9d2b6ca3ee54b89b5bbb9f192bbe37f00aec177212d46d8ca1fc4031c1fe8b28fd SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
-EBUILD s3transfer-0.1.12.ebuild 984 BLAKE2B 6eca49d9eb2c4465836f6533e61f93679cd8b97efde3931b3d1477c706384a1edacff5390b3c1c85036720af544f279fec93e2d2770ffa4c69b8840d89510006 SHA512 15b183016f59cae94e43e01a405c91e26989e943b5a8f92064fae0fb95630928fa36432b315d56bb01a764b7782b94b2c07c860ef2da3329238099ec86a3004e
+EBUILD s3transfer-0.1.12.ebuild 991 BLAKE2B df84ae436a68c1e0c84a9b7f86f415ed75035f3221cb951b88522f82622f132d391dda88220637402aafd1c522dc7a19de9b351440e4a5e48a505154dd917513 SHA512 575dc8e1e46dbaf1f1166edd258dc38c18d39f559e32a3e7001bd5e3ccec0f6f849b2591d08132946e8c16c5decbf648502f164a53f59c017ce326bd9b105dae
 MISC metadata.xml 486 BLAKE2B cabac3d47e4bf8335754747586f4cbec0503c7d8b88925e64ea3a9d051306f2c260ae05ce7430aec3fffe7785cb5a35711199f8df8aed84903d73c52d211b528 SHA512 55132b451c617da889d3c24f7c40e41692d4a1829c3ba8f7d008cde59bd664d069788e373bb93ab668b60254054a8454cdeba2f579dc86b3b713a0762c567f06
diff --git a/dev-python/s3transfer/s3transfer-0.1.12.ebuild b/dev-python/s3transfer/s3transfer-0.1.12.ebuild
index 4e349d9a1584..fe60b291ed8a 100644
--- a/dev-python/s3transfer/s3transfer-0.1.12.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.12.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 29904bc4d7d6..036d6052667b 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,5 @@
 DIST scandir-1.5.tar.gz 29351 BLAKE2B 12cd7d18515ed597d0dc68ff435a442397a23691a0ad2d11d700f28b8abba58517859808190466fb799bb51a4757c4223fad0b1426c1be19bc1cd8f4ffd2601b SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4
 DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
 EBUILD scandir-1.5.ebuild 545 BLAKE2B ca19e8deaf84cc3c3b98e8addaf02a1d025008e6d0855a01f107b0f8c87998a954e4e243e5bc9bf9d40886dda014876fb5eb8ddc38b6c178d1c33adbb5c8f47a SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799
-EBUILD scandir-1.6.ebuild 547 BLAKE2B 1087365709587ef84c8cd7d614d71176c98e161aeec83a138a7f27b6fc380fab371dcd88b04253493c4827739043608a9004943a4c61a5aba61f185760e30dd5 SHA512 cc758553369532297087e3cbdf700d66603dfa4aabc20efb91ba282cad3da88732f4f155c470fdcbaecc612d3f4e0d4459265838c8868e57a48acee14c255db9
+EBUILD scandir-1.6.ebuild 554 BLAKE2B c0c69bbf0d16f995bc29f50fc88dc2c620076397940344d88b93c65e44c86744c5df8fa658573dca8a88e5cc7ebea787aef9eea790c6bdda972714c77dde42e0 SHA512 91a40929cc6f258bfbc7d900e32009ea5b9774ecc353494f03600a9b4a19d0a03f330c97e1e2b6db3cda4493c1e37a16e2a05fae27e91181debc93046413e701
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
index 536cb8ec1db7..dc46e4b8dd2a 100644
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ b/dev-python/scandir/scandir-1.6.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index a64c2c0508b7..d1b23d42c7e1 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,5 @@
 DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31912c909401cccb224b89a7458fa72a4f659c37bfb81f31daae92797624fbabf7de723bf2869eb92af333853 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b
+DIST scrypt-0.8.6.tar.gz 52986 BLAKE2B dbf9f28e03dbe8f37696c6d227dfc719d3952d3182ddba49fd6c2aaf34e53db4a84a412ccec1ac8c83abaa5c12c6d6bb36107cf90a60a5776b1a9f596d1f85f3 SHA512 f0f3bd61a5fcb55a1d6af5b7062202446c2c0595e88617f1e53c4ded6a9b1ab857fda9e8d153c0b3bbceee49a818dd428776522c6b0919b15096fd230b13ef60
 EBUILD scrypt-0.8.0.ebuild 613 BLAKE2B 3238d5824f5faac5741abcfc88d3b04e7a35e8f9ec3211a16af24b5bd03b2d1d59d9ae9949b7a7314ab53792a5a898acb9dcc67c125884003b61d7b78c9e90d8 SHA512 94827254f58aa4649b01ff46a8ee2266e7bc462324b06a06627e8cfa68cd317d939ad2a173a5f98faa151fc5dad2f418a3ef3376c84ad3c2953e2ba465685501
+EBUILD scrypt-0.8.6.ebuild 553 BLAKE2B ed66ad16c07f6fa054c1c224a702e256e1097734c1561d7523e215bc7a6fee34be029a1d0ec217125d5f67e4560a352bc1945b40f7447bc3d13a953c8bc8c473 SHA512 70718f0674da03f7c323b4039798b57b0af5400b8a15665449a3ce166470d3ecd4f2855bd2229158b911ab4c37e04a67575bcd7524c6dc172527438c64259d8c
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.6.ebuild b/dev-python/scrypt/scrypt-0.8.6.ebuild
new file mode 100644
index 000000000000..97ae828ae6b8
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.6.ebuild
@@ -0,0 +1,22 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="test doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 70d3e241e427..b089e2426b98 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,6 @@
 DIST setuptools_scm-1.15.0.tar.gz 23677 BLAKE2B 72d1bb9e3bfd15157ded9a46804dc8a18bdb529268d014e5a4ba9d4a32e48cbc124cdb65ab93136a7a1b6b62a3d24e4c5775f4738db8e3e75c9c149ae9c61f9a SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 EBUILD setuptools_scm-1.15.0.ebuild 772 BLAKE2B 9bafd5038719360380e14ebc8c3b2039ba572898955047c25988cceb1817196656b4b97a79afe13eb8e49578b4c0673f6b916195a3b73e7cf1b520ad77eae099 SHA512 b41121afba5603f74e4f791620a388d228ac8b827eb7b6cfd71da714fe3ad1ae35088f718c004509aaf710c7a79251d300e8711a034bdfafb396e7fc48c1d4e7
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1366 BLAKE2B 444b81e15a6360557a1d7b44a41a121970d9ed2eb60c01f809422e026e995568b192f9428404586ac402943825f486a1390ce9ae64036fbfce9d56f4a33113ad SHA512 4befbf9ca06b734a655dacc5e7976e2792711af126250632fc7707eae39e9b582d227d4a30ea2163d64e9e26dfa46d78cf67ce16b99b828da793ff5655a8c697
 EBUILD setuptools_scm-1.15.6.ebuild 828 BLAKE2B de7fb849b2fae93c8ff9d9d1a5189027520a08770d01f88e6dd59d6511abcaf23241914d91f229a288d981ad6141626e1b8d3e4a655513cde28a0d734730802b SHA512 fe5f8586a7894266f1a09df5883e5f2d80abd04a5fa7e399a324f8ab44bce5861f003211857d2b2c6b68dce28c63ba269d9517f0151ac1737c625f9af1d248a7
-MISC metadata.xml 438 BLAKE2B 10b56535d3839fec5a07d9cabc381dcc94f9ef5dc956cca1f74d29f567f5b99f0cfd068b53bb92792e4b55ec4af3109489e00d35695c6165dc4ae3af167f654b SHA512 cd0e323a85bb13cfe7ee6b3102e605e800aa93a4d4452c20b85e7f48541f5ebec23140ef7f2e3f282cf3c3e7bc6764c0efbe34eef48ad1fd722d57803d668b01
+MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
index 3aabcf579918..36c2a8fbd06e 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -10,4 +10,7 @@
 		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
 		<remote-id type="github">pypa/setuptools_scm</remote-id>
 	</upstream>
+	<use>
+		<flag name="mercurial">Enables mercurial backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
new file mode 100644
index 000000000000..006c5a9012f6
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -0,0 +1,39 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="git mercurial test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}"
+	if use git; then
+		py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}"
+	fi
+	if use mercurial; then
+		py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
index 29b2c0f5a2f4..193bd79c77ab 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 692 BLAKE2B f13fe44b07ec27b28c95d6d3092fd0e8c32628673a9fc7e6058b73aebfc9ee8b0f4e1efc75ec88cdd734514ce89b7e3b0de12371f5f9dce316e425965f648706 SHA512 1bdabd1ff85c4760d31b2ad567e5eb2a537f82001d59ceb283ba799d915ef3b60272667339f547ac0f2e4d376168f2d9a460e4b87d14b452f989096d39cb88f9
+EBUILD smmap2-2.0.3.ebuild 699 BLAKE2B 18dc78dd8139265cefff6e45fc907fb9dc113a9de9751547893bc62c28e6612d69469c05a293d8342b1ee83e696200f60270b8ac3b26517e46ae6dbf9bd01d2a SHA512 fdcb15408791bad791d59bb7a8f97c05a771af9351a44bfeeeb43d6a4de821be860dea528c90aa33b222ff7fd307535396894796e38bb2563d243baa7caa928f
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 27eb3c7208c4..c525924ac6d9 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.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
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 8473ebb3604b..af7bfc190e15 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -4,6 +4,6 @@ DIST sure-1.2.5-r1.tar.gz 52128 BLAKE2B 8370bccba9e9345030dbacd91758dc1be8d122a9
 DIST sure-1.2.5.tar.gz 19048 BLAKE2B 1bc23ec9695103e05c2ec0d8598a8f5014d41b7afbebc94e29d159bfaeb4896bdd84905cb43a4044417198a0fe41f8ec0bd0fd488c5de6dc966cc6125416079e SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135
 EBUILD sure-1.2.24.ebuild 904 BLAKE2B f774321cdf5943334e1f74786e6c0d05aa092452c10311b57d9c748a28b648f554cbf8070315122070d1c1593243056d646ebc4926e7d8aceeb90fff8b832379 SHA512 e3a8a0171dfc4730cd165356907761dc87f043c7888cb374117fd02b23a528d5df3d4dd6b49db63e912ac3a41d90476591a5b28a3387894c2a047f8018cd7d26
 EBUILD sure-1.2.3.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
-EBUILD sure-1.2.5-r1.ebuild 904 BLAKE2B 5b3f02d28199cedaecc74d96610f8619149be60c61c9086bf39c9492a37a522e703b1ccbabd62a72a12f732f02b601b0e377e874fb9a0ece8f560de6ffb68faa SHA512 ee29b6d960a543ca83f959e7f6943f14272dbcb5a5934b993c7bd532bbf6022c897aad282e30cc444604c4511f9eee7eaa57c82800c27e504acb298c8edec064
+EBUILD sure-1.2.5-r1.ebuild 906 BLAKE2B ef1734c01497ff28b23641814e9a1bc1f2ff316c2b4d8df87cb175c0d0ee21232810bf4edb7facb918bef41dc8e8fcb1040fe2082aef2becdee60e905e368e62 SHA512 21c7294cab81f0c7aa45e5ecfaab59213a397a7003c191d9ba7111e2bc980d4b26cc229af7b1bde7918f517b1e92b990a2f0cef16b760dbea6d33ac36eee4bd6
 EBUILD sure-1.2.5.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
 MISC metadata.xml 383 BLAKE2B f3ab99c675ef61738a7751379023bfc1bf11ceac4d4051385a123f89329c9ac454ee9f892d1cd61a1d8228daaa48bf7f6e1460854c7f5427c3e751b4734e52e2 SHA512 278e14f9355806a47bf91640662512576e153074ff4620cd765dc583cf0cf68e0192722d466114ab3b4e24a5f3796b41227477dfcc784c86749daa3c07b2be15
diff --git a/dev-python/sure/sure-1.2.5-r1.ebuild b/dev-python/sure/sure-1.2.5-r1.ebuild
index 68514254ce81..fa76a8a27c7e 100644
--- a/dev-python/sure/sure-1.2.5-r1.ebuild
+++ b/dev-python/sure/sure-1.2.5-r1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index a3080941fe03..4ad3ec3862b7 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,8 +1,10 @@
 DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af81c5b7a0d8142a8283cf2b308fa183ac57ac1a2163cd882749b6fd33e0529f20f1f9e2db2dcc1aed26cb40cd5995780fb SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f
 DIST thunarx-python-0.4.0.tar.bz2 332620 BLAKE2B 768a2a236e12d298efb3abc86f4a339548248f5f88366ec7d956249c028474612b15c340976ac2c2ced806a89517278c70b50069d76b2eee6af6dd097789e275 SHA512 fb54f83c11857ec2236a249895954efc29446120c192b8d19794b7e8145836969f87d1efa524bfaa4c9d31ee08a2c17a57d7210ce4a3a4982780d128839d02b1
 DIST thunarx-python-0.5.0.tar.bz2 334305 BLAKE2B f62e2e7c1faf9c218398d920c1079e82c72253e9ee547892e064f85a2ddb01ac84007ef0fbf4fd7e2bd39a80f74273a96604618f0ec4238f1cb292c97a550a8d SHA512 69350fb76e972fdbf63217e7a200642088816b803e637d3d7a1a909632115f5664cfe6e6bb90b640ed947416e0a0ab2761932a0c0219ccb7bcad767e6e07e7fe
+DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
 EBUILD thunarx-python-0.3.0-r1.ebuild 945 BLAKE2B 6e21b84d4696ef1a37125ffe6faf0a99747d4a86a4e8632fd46c567240dba91500d7dfe1fc2248e454f0451cda3de091efd5551b3be7115facab3cbf5d4d9ab0 SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781
 EBUILD thunarx-python-0.3.0-r2.ebuild 770 BLAKE2B 9fea60857af9d2a66dbfdd4ef55af839aba770f05e204a9b5aec7e8639310dda1e5a3bb8d15bfa4b3c1373b072ec05202606fa4de1e23ea9a6733f37f3e7d835 SHA512 d7127dfaa7180fedcc64734c987555d6e01ece467ab998ec472ff0d66a5e46cc83b10d3c3b85b9ce710a28ac2b7ef87f4fdd5fc92a4c054f1d868030f87f2b42
 EBUILD thunarx-python-0.4.0.ebuild 753 BLAKE2B 271f58f98f3b0487625d72e037cd5fd6470ca5fc282ad510e89e75e9fbb970101faf830c0801be1b3113e0bc7cc6b99eb07fd0d6195a267d45029e79727bc403 SHA512 c054426c2f48de127413768a92774c8da2ead3a66c111863e71b7a14853190b3af7bae4d33db26aac18e0d935bfc86c78c05392e4834f5f9ad6fee19b7997f72
 EBUILD thunarx-python-0.5.0.ebuild 725 BLAKE2B e79c7d63dafd5dead64a3f09c122a0834fd3d839cb2d31585ed166d1dea15f46c03d46aac2796c8e3ed9f39ce16bb7d51c2d8899512d9bc20932d9af110a02c0 SHA512 815c6b5b061a19b1cca054343a115644ba60736eaef2c5ff01cbdacb071c30c9b58b74422db443ef49bd30b3d6dadbd508317db32e94cf778130b9462842fe0a
+EBUILD thunarx-python-0.5.1.ebuild 725 BLAKE2B b9f2c25fafb17f96bc28a4ed02a2fae489433b0f62868a458da814c0f1c689b89e05027c7681648546e9724fd0d003484e11a0f38a4252df2b099af2eeb958b3 SHA512 e04e2170128b53c6d2ee43cc2ad46b0a3725cb164457b8197beb427a27e9c7843d4ae7c64b949525e8d53acbbe17338aa942968cd26768770d00e4fcf2a62ced
 MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
new file mode 100644
index 000000000000..cd7f101ea881
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1.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,5,6}} )
+
+inherit python-single-r1
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/glib-2.30:2
+	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
+	>=xfce-base/thunar-1.7.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index f16b3af2d101..2d74da9fa722 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,3 @@
 DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
-EBUILD websocket-client-0.37.0.ebuild 806 BLAKE2B f8673435122f802ef8287f60bea63edb7e3aedb2f40f634bdb1dd0da67743e22bbad1ab3c87337f0aff9a38349ff3930fcb0e430b20d547ee30488429f61b2ff SHA512 5812162495a2d109131b20eff43b45df754cc5a29dfa0eca1063d21056b672179ab268f0f507c12c4de80eec4fc98edd6a0af091f8938c08dd3626a845c8e3b1
+EBUILD websocket-client-0.37.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
 MISC metadata.xml 488 BLAKE2B 79dd23e10d557b8b6c343db7b47249d8659bfab16d8a11d8668af75a1af0f87891be3c80bba944ddc63aa986dc30a0b7d49c99341ab043c1d084a32f216e62dc SHA512 0aa0c529ae74d6fa9b95bcbc66165c283ddfffacc773d93653f6720dd744da54ad7428dca4fac2b165acd84540f56d7f0f37ed8a1486700d72fdb7716053ab20
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
index 2d0419808c3e..112cd5b33c35 100644
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.37.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=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index bf37e56287af..46feed9b9996 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index 6ad70af80742..85cad328e9ea 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,4 +1,6 @@
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
new file mode 100644
index 000000000000..b7ed4eb9139f
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index bde2ee337c92..84ef5248dd51 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_msgs-2.6.2.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
 EBUILD gazebo_msgs-2.7.3.ebuild 582 BLAKE2B 4f67fad9c1b3e04580803322540d16ada55edaa3c212bec423293ea9e2a5d03b8496beea4a4d19d71d806abe588a435fdd954803e52673ab10a5f53118604f44 SHA512 2a5a1a3764c4ab1a9798fcd5783be449393b73d2937766ec80ff68e68d68a3def76f1b26138e05417706603891528b8e11324400c248d12b75a8a788ce5efcea
+EBUILD gazebo_msgs-2.7.4.ebuild 582 BLAKE2B 4f67fad9c1b3e04580803322540d16ada55edaa3c212bec423293ea9e2a5d03b8496beea4a4d19d71d806abe588a435fdd954803e52673ab10a5f53118604f44 SHA512 2a5a1a3764c4ab1a9798fcd5783be449393b73d2937766ec80ff68e68d68a3def76f1b26138e05417706603891528b8e11324400c248d12b75a8a788ce5efcea
 EBUILD gazebo_msgs-9999.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
new file mode 100644
index 000000000000..5972a463ebe4
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
+
+inherit ros-catkin
+
+DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 537e845b9db0..413ded2a7c24 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,7 +1,9 @@
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_plugins-2.6.2.ebuild 1432 BLAKE2B 1a4091f23832ba40054adee8ca2e7c61a5e0f09310b4707fd0f825d5519bd3dc40caf8e10aedec4313ca007352ad8757f28dfae0658b7ca7c0f64cee48d7028b SHA512 edddcd676dd1c2fa36291ea384ad03a52d88497f12dd32eb783300628d752405259c74cf95c45daa57ed41d713c7d633d54a99cc471b2aa094e8335837fb4cb5
 EBUILD gazebo_plugins-2.7.3.ebuild 1705 BLAKE2B 1f8fa40449e524681b222af2f384eac69ed5135606996502b80043372b55d1fbc04d11cf62a22e7d601037a4a9ccfcf90afd78cd93f6a0141518ae20d76d168d SHA512 2985006fe109d82640c376e447fb2f5ba513d1800d2d1cb67ccf3c6b3ea8c380945c5bd8576042de6122d5154e1d4aa25926cfc0a5892d9dd882fbf56e1bdc8e
+EBUILD gazebo_plugins-2.7.4.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
 EBUILD gazebo_plugins-9999.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
new file mode 100644
index 000000000000..ef6837eae89c
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/nodelet
+	dev-ros/angles
+	dev-ros/std_srvs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-ros/tf
+	dev-ros/tf2_ros
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/driver_base[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pcl_conversions
+	dev-ros/image_transport
+	dev-ros/rosconsole
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/polled_camera
+	dev-ros/diagnostic_updater
+	dev-ros/camera_info_manager
+	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/libxml2
+	>=sci-electronics/gazebo-7:=
+	dev-libs/protobuf:=
+	dev-games/ogre
+	sci-libs/pcl
+	dev-libs/boost:=
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index 023bbf40b522..b7e8c9c341c4 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,7 +1,9 @@
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
 EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
+EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
new file mode 100644
index 000000000000..ca217b085352
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-libs/tinyxml
+	sci-electronics/gazebo:=
+	dev-libs/protobuf:=
+	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure
+	dev-libs/libxml2
+	dev-libs/boost:=[threads]
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 6fbad2808d5c..16725e873b4e 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -2,7 +2,9 @@ AUX urdfdom1.patch 590 BLAKE2B bd90ab431b09a009e19d664e1161cfe07d5f4783827dbb364
 DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
 EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
+EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
new file mode 100644
index 000000000000..e824028e5285
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS control plugins for gazebo"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_ros
+	dev-ros/control_toolbox
+	dev-ros/controller_manager
+	dev-ros/hardware_interface
+	dev-ros/transmission_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/joint_limits_interface-0.11.0
+	>=dev-ros/urdf-1.12.3-r1
+	dev-libs/urdfdom:=
+	sci-electronics/gazebo:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index 39571b0852aa..d031b36e2c4e 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,4 +1,6 @@
 DIST gencpp-0.5.5.tar.gz 8601 BLAKE2B c048ce73f41d8b9ef3111bcb00b9a8776f4b1498bf4828e48ec45994c4f0fecfc75318fcfbfddd18b492d7b597e62e69fd497de63b6cc1417a107e11ecf38e83 SHA512 6440747ba98b23ed515db6d7b6760a98dcb3f832f87c0a8d3797b47c48e51cb01e2c62837ff5a84a2f8aeff16764493093170d83639602e3d82de846e95f9f8a
+DIST gencpp-0.6.0.tar.gz 9164 BLAKE2B 97b7e3904cde95ca6304e498d5f338cf303a55c407c187994b3dcb2bb062bd6dc1b4a2ab6f0cc949bfc6c481199586abef115fe54b4b99e99bc99dac8ae261cf SHA512 0ef0ae3d5f93ab5693455eb5319a0b8fbaab4ee56bd890e0ef96bfbdf8959affe61551f30739bab7e945c213c9b2fb51ff5e89c5b3a40d945da23e1ba88b9c1e
 EBUILD gencpp-0.5.5.ebuild 465 BLAKE2B 87d05b0ecdc318698f9d271bfcc541ce3cb4d030cbb39bd3d0a11208da0773cad93ec882abf43ab0fb134841263236b886a5518e00a82f5b231650991fe0b967 SHA512 4bc32dedeb187d80b202e1c34907ebde2b7fad8bdabe0e0b1fe801ce3bc2b472c638592e333497bd228e96ff5cdce173d7133fc9fe3941f8842733218c717347
+EBUILD gencpp-0.6.0.ebuild 465 BLAKE2B ebd8a37fc5ce1a996bd5ca8faa2173ab8f0daaac133bfce251407ee69685ba74aa7d191eb4f007ae8c9a1b1f3d6a1e6f7afe937dc46199d3e199b7518c7e38e1 SHA512 1129bf9486c73fc7dcd7f91982b683cc56dca8c4089a33db4860bbf5f464b2c2e5130e91cf4f5b2b793c10793474604c72111417f2e8e5c435e744548b5a1f26
 EBUILD gencpp-9999.ebuild 465 BLAKE2B 87d05b0ecdc318698f9d271bfcc541ce3cb4d030cbb39bd3d0a11208da0773cad93ec882abf43ab0fb134841263236b886a5518e00a82f5b231650991fe0b967 SHA512 4bc32dedeb187d80b202e1c34907ebde2b7fad8bdabe0e0b1fe801ce3bc2b472c638592e333497bd228e96ff5cdce173d7133fc9fe3941f8842733218c717347
 MISC metadata.xml 324 BLAKE2B acb13fb86def5c4a53edd5c0db5d4c65d73e99f6d18a2fa1509981878637f006f9b14c5cd40e56b886b73c4ac8ec957844da3e424bb515248c07298388eb23c4 SHA512 031c6670cbdd1abdf53174d877a08985012d75ffa1fb16415501d128ac519567f6b9ae3c786a878aba25481c4413ebbcbc34d3782bf1d85cc6976caccd1aaaac
diff --git a/dev-ros/gencpp/gencpp-0.6.0.ebuild b/dev-ros/gencpp/gencpp-0.6.0.ebuild
new file mode 100644
index 000000000000..e33fa4486006
--- /dev/null
+++ b/dev-ros/gencpp/gencpp-0.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/gencpp"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS C++ message definition and serialization generators"
+HOMEPAGE="http://wiki.ros.org/gencpp"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index b56d4804e723..c66b44979b93 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,6 +1,6 @@
-DIST genmsg-0.5.8.tar.gz 59250 BLAKE2B bd2aac0185a7476f93b9cce93daba2dfedcf008cd06b2e6448721488109fd483756120fd9e6322d2479a466f8e3df2ef01747463337ed76e79f75ae9aef390ec SHA512 78553d93a2adfe2c47c5fa68204418e321bc03a6083e344b456c2a727e5819747668b9c82b4b5862766b2fc2ad8b22b5165e9064b993a4491b1f7751db79dc07
+DIST genmsg-0.5.10.tar.gz 59468 BLAKE2B 2cb70a60dc9281c8999fd88615845bec840ba0d46b00e170fb56e152234c5762058a5a1b2f87fea67d596eadb330627bcfeb8554124894bfb1155654dadb7357 SHA512 8effbada30bc3c48526ef162ef11d0d14c8bba5688d26089cb934a0e9a069233a724608862188caa86d1a4dc8e773d4e93fce5d88239acf0af525f6821d01268
 DIST genmsg-0.5.9.tar.gz 59409 BLAKE2B e3d4ac69bbc665aa62ef9fb7b35cc9b47280690eb743f50e5fe5acaf96a0fda363d594878b1f3584f5d96952dbe9c64428e5e4aeb1f0432c591d03d9ce16cd89 SHA512 ac62c8d08da449890c6eb53264153e01237cd50b97d4d4123e334c59a9a1ef73ce70c4d3d7c95f91ea872ea06b30fa72bf8a3a177309493b33984b8d21e36939
-EBUILD genmsg-0.5.8.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
+EBUILD genmsg-0.5.10.ebuild 470 BLAKE2B 488207849ff40c952ea177dc818313c91a8cf535f5ce1fa75ad43c324a99c6fa6aacc27179bfb35746c07350f03c781c6e7475b165ec309ced2ee008d683b733 SHA512 6827248d5dcb07a5a032a137beab04cc28b57a824c7c24dbb3bf3832478b5579229cb424c82e430d77f85a7ee5eaa92b6750c243977fda0749cb41c4e0119239
 EBUILD genmsg-0.5.9.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 EBUILD genmsg-9999.ebuild 470 BLAKE2B 61bfbd0c196380a71a0d1bdc476f4b103595f41e51d7e47cefb4c79ba872b0ad160f9cf7fe1690fa55329b25fe1fb1e19d513ca45136c5d431653b87956d864e SHA512 2ce83ace0d29fae10543fb03ea2e6a47cafb6feb5af6fff76b6c25788600a1e3837c218a57c5078676e323ce58542aeaa87e1ce095a3487f21206f03c83d4f5e
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.10.ebuild b/dev-ros/genmsg/genmsg-0.5.10.ebuild
new file mode 100644
index 000000000000..1eda6e3256c5
--- /dev/null
+++ b/dev-ros/genmsg/genmsg-0.5.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/genmsg"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python library for generating ROS message and service data structures for various languages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/genmsg/genmsg-0.5.8.ebuild b/dev-ros/genmsg/genmsg-0.5.8.ebuild
deleted file mode 100644
index 4828b324180c..000000000000
--- a/dev-ros/genmsg/genmsg-0.5.8.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
-ROS_REPO_URI="https://github.com/ros/genmsg"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python library for generating ROS message and service data structures for various languages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 87c86257257b..8f539baa8058 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,8 +1,4 @@
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.3.8.tar.gz 20533 BLAKE2B 5e096b4863077941843b966f2991a23c24e5396d42d0d8cd8beb7123805d085d07b8ac7e8e4a3c3ea43a6f4605ada40eb28b8c10207536dcdb7ef92cc1a5fcd8 SHA512 d7b054296f286a5e61e5f952a29ccff2165503123ab6a89724ec34180fb0f4c452fc0ae81ec853cac170b304095e62cef420431e5aca85a262febc2b5ab5ccf2
-DIST slam_gmapping-1.3.9.tar.gz 20951 BLAKE2B 989c28fe60668f0b37bf4766656764095157734c1ae0f41f6b95faa9ed9c20ed91de18534bfc99ea7ee035f2df213f8004adefcf06d269be55b27c37156da542 SHA512 fcab88127507206274e903de804aa9167b30c1dd9fbf2875aeafb990285923223a2ce71edecede60d2c93dba2d8fffd0d371abd643647755094abd9ffe0aba73
-EBUILD gmapping-1.3.10.ebuild 528 BLAKE2B b5399648f9ba344b1663932b02cec6ccdc22ae9cc55e90db76d9a55d8148f59eea12224b84759555bcc73a8beff135c89610230ddcd3253d1d8ced37a66a6c20 SHA512 59bfab00cb4003039a7dbcab9559970d2e79a43038d83b510635b3ef8524ffe001670fa372c4cc7905fe70e18f28ff72ae70266f292f2236b9cfb1089c62e853
-EBUILD gmapping-1.3.8.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
-EBUILD gmapping-1.3.9.ebuild 528 BLAKE2B 76e9d437945d2d0dcb9a3dab407f8118f2f3865b8b44f26dba6be90c47d99d123311f7bb72f70f9c65e22e588d11afabd9bc3280861a699e92155b31ddfd51a1 SHA512 30b6fbbe860cdef1da38582e07f5030c4e748e7a4312409ce8f9eb115bc090daaaf6522483363858c990e87033d0557690fbe9bfc513f3c23b54f681a30c0d2c
-EBUILD gmapping-9999.ebuild 528 BLAKE2B 905b5d54e0335b7b979714b0072654d77f556eccc7819ae2f730da8bbf1c6617cde388391147ab9202d2a84c1203225f4f70e2b589cd11a638d7e64d018d1e79 SHA512 92d31dccbad5f5e345b011779d386e3e4ea670f7447a566fc1628ef586d409e8b4d2bf07074ebb4899505ce8d131d8d80b5751501c4c87622c2ce32b276b93c2
+EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
+EBUILD gmapping-9999.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/gmapping-1.3.10.ebuild b/dev-ros/gmapping/gmapping-1.3.10.ebuild
index 7cdf9ee6b7a1..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-1.3.10.ebuild
+++ b/dev-ros/gmapping/gmapping-1.3.10.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.8.ebuild b/dev-ros/gmapping/gmapping-1.3.8.ebuild
deleted file mode 100644
index 5c4afd8f8aa4..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-1.3.9.ebuild b/dev-ros/gmapping/gmapping-1.3.9.ebuild
deleted file mode 100644
index fe84880698b1..000000000000
--- a/dev-ros/gmapping/gmapping-1.3.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index 5c4afd8f8aa4..ca6f43afe50c 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/openslam_gmapping
 	dev-ros/rosbag_storage
+	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
 	dev-ros/rostest"
diff --git a/dev-ros/map_server/Manifest b/dev-ros/map_server/Manifest
index 77bdf1b0f782..8a0a4463720b 100644
--- a/dev-ros/map_server/Manifest
+++ b/dev-ros/map_server/Manifest
@@ -1,12 +1,4 @@
-DIST navigation-1.13.0.tar.gz 336419 BLAKE2B 8786b1279a569c81c25cf48184d37b2660e27735631539e78404fc9cff849634165fdcf11e0aa309172c55755eea3ef8a884ff633291b77f4e23873f9cd3f8fc SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af
-DIST navigation-1.13.1.tar.gz 335568 BLAKE2B 77177dee95744ef327156bcda3fcb59bd2a7701dbfc9fffb8e65501ebd21d3abd8439f67a8061abeecb0805c801a31a57b103f612f8ae9a15029466e87fa7252 SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e
-DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
-DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-EBUILD map_server-1.13.0.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
-EBUILD map_server-1.13.1.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
-EBUILD map_server-1.14.0.ebuild 546 BLAKE2B ca25dabafa9b7e669e96e740c05a7f4975af9655c9982435f75b4671531fd7c0d685d2162af3e9a0ca202d768415e1f5b34017fe5ce1f2623164679b100fc484 SHA512 a5a9f9ac2cfc449e26be138ffa28fe868d1e72fb7ca822211839cc6e87cdef39d606dbc1b6b388a2e4a8629e92a64cd00faaba32930cc417cf54f9c63ce82c5f
-EBUILD map_server-1.14.2.ebuild 546 BLAKE2B 6bf1a83fa675825564ebb6d16f435097a70aef0683403de823042265626bf58e99837eaf00df8353d5647e2e19c2ec8ce39562e53c36dc614984dd9dcdb74c57 SHA512 3310b6263fad86f87bd25e574f485b790be861f2e9d2a4ee5b7c585f9f6e40d73b10f4b8a21def39dfda882d84fff0e7c08790bb804644f86621343b5c6ba7ca
-EBUILD map_server-1.15.1.ebuild 546 BLAKE2B 6bf1a83fa675825564ebb6d16f435097a70aef0683403de823042265626bf58e99837eaf00df8353d5647e2e19c2ec8ce39562e53c36dc614984dd9dcdb74c57 SHA512 3310b6263fad86f87bd25e574f485b790be861f2e9d2a4ee5b7c585f9f6e40d73b10f4b8a21def39dfda882d84fff0e7c08790bb804644f86621343b5c6ba7ca
-EBUILD map_server-9999.ebuild 546 BLAKE2B 93451029e5c8824321251359e6d4d1b0e2dc6dc3eca7144355ae2e767b640dcdcd3326b928f49e4a5c0edcf5247887cb457906444b9878bae684925542c3e9aa SHA512 29f9f1cc2fb9059705709f49069b6f7625b1ad79df9fe779e827ccc7bf70887b4c2accfaf4a21f34ed74bbbb1f322db2de2044f140358bbc6378e5c7f2d1bb66
+EBUILD map_server-1.15.1-r1.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
+EBUILD map_server-9999.ebuild 568 BLAKE2B 0982353d43d04acac64d9e256b7137a0873a6b678ca879bf8eeee0bd4a3af7ca38b461a0eb03328da6f29c087b37f21598b55718f48c6972486c19742ae63538 SHA512 a759f66177862c92e0151cf6c25a670c101e0ff1e9f05614b222ad86c4f0c0fc7916f21acd3d9f154502bec0c85aa0f168ad4a6e79d5041b56d19b54aab9c449
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/map_server/map_server-1.13.0.ebuild b/dev-ros/map_server/map_server-1.13.0.ebuild
deleted file mode 100644
index 2cf681c69a59..000000000000
--- a/dev-ros/map_server/map_server-1.13.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.13.1.ebuild b/dev-ros/map_server/map_server-1.13.1.ebuild
deleted file mode 100644
index 2cf681c69a59..000000000000
--- a/dev-ros/map_server/map_server-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.14.0.ebuild b/dev-ros/map_server/map_server-1.14.0.ebuild
deleted file mode 100644
index ffa8ac2128e5..000000000000
--- a/dev-ros/map_server/map_server-1.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.14.2.ebuild b/dev-ros/map_server/map_server-1.14.2.ebuild
deleted file mode 100644
index 94e003da1ce2..000000000000
--- a/dev-ros/map_server/map_server-1.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.15.1-r1.ebuild b/dev-ros/map_server/map_server-1.15.1-r1.ebuild
new file mode 100644
index 000000000000..8ed4e749308a
--- /dev/null
+++ b/dev-ros/map_server/map_server-1.15.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Offers map data as a ROS service"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	media-libs/sdl-image
+	>=dev-cpp/yaml-cpp-0.5
+	sci-physics/bullet:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )
+	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-1.15.1.ebuild b/dev-ros/map_server/map_server-1.15.1.ebuild
deleted file mode 100644
index 94e003da1ce2..000000000000
--- a/dev-ros/map_server/map_server-1.15.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Offers map data as a ROS service"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	media-libs/sdl-image
-	>=dev-cpp/yaml-cpp-0.5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest dev-cpp/gtest )
-	virtual/pkgconfig"
diff --git a/dev-ros/map_server/map_server-9999.ebuild b/dev-ros/map_server/map_server-9999.ebuild
index 2cf681c69a59..8ed4e749308a 100644
--- a/dev-ros/map_server/map_server-9999.ebuild
+++ b/dev-ros/map_server/map_server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/boost:=
 	media-libs/sdl-image
 	>=dev-cpp/yaml-cpp-0.5
+	sci-physics/bullet:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 0366ef37c2fa..2972844bc3ad 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,4 +1,4 @@
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-EBUILD move_base-1.15.1-r1.ebuild 810 BLAKE2B 2e55b446c02e129f9c10b252180bab1529734c3380cd06d69ff38ff741802406bb75de31fccd8c5edd4ddcb9531882e22e986f4e7182bf58a9716ef98cde7e9c SHA512 21a9b01b6821db9e0975e4adcc7383c1c610afb833b4d106dcb656cfe0a1d51339f23beb8fd3c953d7b001a0af0252fd56dfbcf192beeb0133563e25adfc2be4
-EBUILD move_base-9999.ebuild 810 BLAKE2B 2e55b446c02e129f9c10b252180bab1529734c3380cd06d69ff38ff741802406bb75de31fccd8c5edd4ddcb9531882e22e986f4e7182bf58a9716ef98cde7e9c SHA512 21a9b01b6821db9e0975e4adcc7383c1c610afb833b4d106dcb656cfe0a1d51339f23beb8fd3c953d7b001a0af0252fd56dfbcf192beeb0133563e25adfc2be4
+EBUILD move_base-1.15.1-r2.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
+EBUILD move_base-9999.ebuild 882 BLAKE2B c68f44cfe1582a8a66fee799f3a844daf4e507555510b565773c9741e489637bd5ed07b20538647b2599c4e842ffb2c28460e44baa2440c83549d80fefa16bc6 SHA512 80bd499cba6b095210a0d424ced28d65e5ebcece7d61b857db8eb0a78644f39099b22f2e82b9d14694963f58d51cca74509898c3038f8092f8fe958caed84b0b
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/move_base/move_base-1.15.1-r1.ebuild b/dev-ros/move_base/move_base-1.15.1-r1.ebuild
deleted file mode 100644
index 2c81deaf968f..000000000000
--- a/dev-ros/move_base/move_base-1.15.1-r1.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
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.15.1
-	dev-ros/roscpp
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/actionlib
-	dev-ros/base_local_planner
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/tf
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.15.1-r2.ebuild b/dev-ros/move_base/move_base-1.15.1-r2.ebuild
new file mode 100644
index 000000000000..2905e24c89be
--- /dev/null
+++ b/dev-ros/move_base/move_base-1.15.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-planning/navigation"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/costmap_2d-1.15.1
+	dev-ros/roscpp
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/actionlib
+	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nav_core
+	dev-ros/tf
+	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-9999.ebuild b/dev-ros/move_base/move_base-9999.ebuild
index 2c81deaf968f..2905e24c89be 100644
--- a/dev-ros/move_base/move_base-9999.ebuild
+++ b/dev-ros/move_base/move_base-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=5
@@ -21,6 +21,9 @@ RDEPEND="
 		dev-libs/tinyxml2:=
 	dev-ros/actionlib
 	dev-ros/base_local_planner
+	dev-ros/clear_costmap_recovery
+	dev-ros/navfn
+	dev-ros/rotate_recovery
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/nav_core
 	dev-ros/tf
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 150649ccb488..21ad762141bf 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -4,11 +4,13 @@ DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd
 DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
 DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.14.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.11.9.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
+EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
 EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
new file mode 100644
index 000000000000..52c01cd2ea3e
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 0784f7b3952a..d543e38fee0c 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,5 +1,7 @@
 AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a98bdc0fe3aee995654b9a0463ef551ad4343b77feb5719fe24489b220928162e81c1ac5eeee2 SHA512 435c0f6b38ffd49282971d563f4e68daa482b63da3b44ff2599ff68f08be404b7921e125463494970a2c70ce938871c7d7bbea00d06c0ce61a76ff8117dcea8b
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
+EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
 EBUILD pr2_description-9999.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
new file mode 100644
index 000000000000..afdbbe676ffc
--- /dev/null
+++ b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-ros/convex_decomposition
+	dev-ros/ivcon
+	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 9f495e2604cb..1b0c72b8d128 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -4,11 +4,13 @@ DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd
 DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
 DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.14.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.11.9.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
+EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
 EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
new file mode 100644
index 000000000000..3a8a32077d50
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 8c1ff23588e9..67cde96bd6c1 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_msgs-1.12.0.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
+EBUILD pr2_msgs-1.12.1.ebuild 540 BLAKE2B 886be8024a4e5351b83ee4d068ed91cffa4da3aceb54cf2c8d31f74673db1ce5b50562ff92353f4186709482b15c2732bc104daff1da0b234ed22729bfc7eabf SHA512 e4aa611b2481e9cf136acf0bdf3dec56646a35614d4442ebdc00f4bd1e7e26525fb9321a4a1757ab73383c8ce5a82a4e5eb387c4489e52fcfbd6b14a9c41012d
 EBUILD pr2_msgs-9999.ebuild 540 BLAKE2B a81dd2fe728a8e08988cdd9003b9d9f3f23d575c68b0745b9f14c273bd61dbfcb675dcdc8793d9092a279f47f113a33c0024beb63634833192ec6af407ffdf0d SHA512 90817efe25563bc7e87d01c02c8a37334b0ee54ca0fdc69e17a2782e7b2f23e31cb3f950143f5f3b4fce0f16fd29035ce85b48241298fb5dacf2f68a48f6b35d
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
new file mode 100644
index 000000000000..fd03e78a9820
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/Manifest b/dev-ros/rqt_reconfigure/Manifest
index 82ee8cf2d91c..40269118e217 100644
--- a/dev-ros/rqt_reconfigure/Manifest
+++ b/dev-ros/rqt_reconfigure/Manifest
@@ -1,6 +1,6 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
 DIST rqt_reconfigure-0.4.8.tar.gz 27937 BLAKE2B c18d7bd646ebd6c19f2c8eb14093f9761b3e4dcfbd0f3989e7e45e230cfb40b402bc87016bd877433357d00ca03deb13ecee502a41332b79da0367faa4f4d7f8 SHA512 0ed02c9429974cfb598371923440dfa3b2ea00018898bb404f0301d1573d6162f61c7628edbf2b9517a9104d8dfbc63f31257a58ad3abf859165231159f794d2
-EBUILD rqt_reconfigure-0.4.7.ebuild 675 BLAKE2B eef22a396a1cd6d08749decc446a76628bbd9e670ce30baa4b8f18b74f33e6f5fb77938b1c89623249f54d94667f7de51b7f54487384fd255addae9cbe955e37 SHA512 b7b88586eac4d15f2711a47fb736cd0c6c8a29b100f1a4e0f38eed2d064a1b3895549865ee7037f4281a5efd4d5f47570e23417be1c51f89c01542b3ec9d4a2a
+DIST rqt_reconfigure-0.4.9.tar.gz 28120 BLAKE2B 91064b3a07d80c0d51178dbab882319326a03a00d648f14a6b160b008075bb59bc32c3f47e0ec1650b27ea1fe53e0bc92197d3dd7baf2bda5fcf75b77c3d5665 SHA512 20898a74d4b43442ab15890bdef8ccc62129fa2786d7c99515120eea90175a318ffaf75986b5b5b1ae5664548461a636ba15577b9a94084826272a4411162ac3
 EBUILD rqt_reconfigure-0.4.8.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
+EBUILD rqt_reconfigure-0.4.9.ebuild 655 BLAKE2B 3aa0450116f59085150a4d24c882e1c0939a97139f5620dc23aa024fb850182cf3875ba212edb7d3d5afd4308e1dab450886dbb821fe03c33d21c8f0fe7a95cd SHA512 e583f30d38fb8a5d972c83e93bf6146ad5e55824b55367c89732394c9ed433f10ea239bd2f0a3538fcf4c8dbf189deff6c9a06d0685085ee5c86bc524e81a4da
 EBUILD rqt_reconfigure-9999.ebuild 655 BLAKE2B 40c952636cce4b3143957b73c3aa4de285d9cb17c072769e2ff618756b61ec10d44c3a68eb686539710944a9ddea996e9b92e2d5482ac7ea694906f45465038b SHA512 ae8663b9615445394b265dcbd5e1212273568b467230594b3e7a041509b3544d9bfb0f1d441aefb2aa88273a9e5baeacfa1e7763d6dbd58e35f72f53b3f82740
 MISC metadata.xml 347 BLAKE2B 1ff3265b37380e28dd01d7f2ff2c6f2e373717f608c586e88fb7a6a4827d8a345e7181017ba7b2e03b6e1ca5b97960bbcb3a0f38c583510e3ca4ec96988ff2d0 SHA512 bc289c092d712b968ff74ac6e7d92545892a158442b31aba95afd99224a34c993c86e1a65bdbc0043381ee01f051309d35cd216f6316073f81b186dabaedb5ea
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.7.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.7.ebuild
deleted file mode 100644
index dc071e77bb0a..000000000000
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
new file mode 100644
index 000000000000..00637e917afc
--- /dev/null
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_reconfigure"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4f28149fc29e..247cad88c54f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index 08f409b20161..f7e925d3e7d4 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,3 +1,3 @@
 DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
-EBUILD bcrypt_pbkdf-1.0.0.ebuild 791 BLAKE2B 62a0515d8e92ac19828322163a59b99ba9674e44fb5564ae49abc6f733e4b8fe77bbb7f44ed14ec32154b533c793daa688e5ee5dd51e58b323a75cb3807c36eb SHA512 5ea43da9970774f98acedd400ed6405af0e55fa67ac26e9a4d352ee2582b34433f68546cf5657032f9d91e5e1d1e7a2f3d47891403178fe868e46e8aef04372a
+EBUILD bcrypt_pbkdf-1.0.0.ebuild 796 BLAKE2B 4ff0aa1f87b2bfa481d30e3c79cc8a3b4a3b614c148e475cfff7b63a1f571d6871bdc8685f662220b907d0826edfc676f11c9f50fd8e52b9bd6a918cc5a362a0 SHA512 c2dd6bcf50c19fcfd5d009e4b506a7f67bd945557c4aaeb40a163190ede5fb25d40b8433b4b43d1230dd1bc80ae591acb00c5814ab42bb0924beb5fdf0dc3f3a
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
index 06a8755cdc2f..5d9024bf53cb 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.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=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
diff --git a/dev-ruby/calendar_date_select/Manifest b/dev-ruby/calendar_date_select/Manifest
index 849dedb9b543..c6053df5b74b 100644
--- a/dev-ruby/calendar_date_select/Manifest
+++ b/dev-ruby/calendar_date_select/Manifest
@@ -1,3 +1,3 @@
 DIST calendar_date_select-2.1.2.gem 22016 BLAKE2B 3cd19112e1d6f3acd9c3543a39b650c753803f3aee4581562cfe5625cdbc1593fbdae45ef2caa15391e6b4caaaa98f9563a70240f45a7806772bcaaec4a5f7f8 SHA512 99d4cadd8b58c49882767787a1c04d1238f2679e6034a1705d24dfc1d1830c9101028b583f36b8fa3403e58ad1b995ead4fe33cda42dd16cbe17d435c1198af1
-EBUILD calendar_date_select-2.1.2.ebuild 657 BLAKE2B c4ccc9c70d7cc88786669d29135ee66c0c7e489c6b3db8900547fc1d9bc82080827408a2ae98648da1d892fd75cf35122ca08f6c1aa3b24af88ece9b6b85e1d8 SHA512 f20c6da900c8e43073087603d95295c9abdc85b58ba8389e404e4662b7066657454824e2da21686a7b8baa1421b402456726616adf2597c2faafebfa05bd8b23
+EBUILD calendar_date_select-2.1.2.ebuild 662 BLAKE2B 2443fd0ab3e0d2f5e4fb23de51f5dfd39c4f932cedb772b6b7db11a280752718cbfc6271ba573fab4053e28b3815e05c020d38a3acc6bcdbb1beae4daa13bb13 SHA512 95d1a4f1ec5914b97b72e7193390f2c323ccee70f1a5975f0259506548a74e1fa37b5be4b449afd702f78a242ad23caee191dcef359b4277c062b1e9d4c20436
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild b/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
index 0b7e156d22da..c5557ef510b9 100644
--- a/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
+++ b/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="app"
 inherit ruby-fakegem
 
 DESCRIPTION="A popular and flexible JavaScript DatePicker for RubyOnRails"
-HOMEPAGE="https://code.google.com/p/calendardateselect/"
+HOMEPAGE="https://github.com/timcharper/calendar_date_select"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index d0643bcfa3f3..c95aeb684ffa 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,6 +1,7 @@
 DIST capybara-2.14.4.gem 265728 BLAKE2B 7b61fc7424b5e5aeec50e0695ef7719d23b594d3fe233c04443c37a5f06b0f1e7c440135c50225813d9da954c2efa0563488668202e09a4e3877f28708f9624e SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
+DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 EBUILD capybara-2.14.4-r1.ebuild 1506 BLAKE2B f2bac2b3122085a3190e5bfe14af9fc2a57629488ae418e1115b26975b5aa4d80bfffaa492c91457ee3ee5663b0197b2dd792a0755617151c26a445b4b1ce835 SHA512 98a6096c892facbbd9f665fa9cfefdebce53fb7ce328b0a4b97716c58a090089e2dfd9b2454763fc4eebd384871bb964780b8fc9e2a883b31ee169781a1fde20
-EBUILD capybara-2.14.4.ebuild 1352 BLAKE2B 868ff6d1d8e9619b0c750679692e5687bb7d940f498bd7659cc673d07ad4174af58d0a5437fdd75427f6a77816915c1fd49b2430a0e6e9aa810d6b8e7e584bc7 SHA512 e979fef0dc97221dc2d47a85afa6fa817f7f42acf6f6ec168a1cc9f48b58e057bdb208f2c366b2958f26bc9e8a7f55b5b1aac8fa484c42f515d1476958fe2447
 EBUILD capybara-2.16.1.ebuild 1498 BLAKE2B d202e916357b80811c9bd15a775759a64dc17ce09e0132b20ecb643a416f44f9335b64e5804059dfa646864702c7e764cff8c5afea70c134d3c9b804554ad7e4 SHA512 577955edb3eff8d228520bd2b041d7591b80e26fbd90bd2bccc59f695950ca6d749069963cbc36da75796e4b9485c9a3189f4e52349d16779e0619fd82d967a5
+EBUILD capybara-2.18.0.ebuild 1515 BLAKE2B 35283033d1284306a623102a8cd5c433fb390ee0b990c2d19e8766932814b794bfee6dcf73628290bc93acd4f3af246e25fa87ebfb77d6bca4c7a05ea0d8f9c0 SHA512 22e620e2b80b115cc304584f85f2eeb8500353d8a65e6617daa58607d2c49fc731542b5f91ce1f4687ff42f45529e19d8052527b3b523110ddc999be8b01843f
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-2.14.4.ebuild b/dev-ruby/capybara/capybara-2.14.4.ebuild
deleted file mode 100644
index 4e501520f353..000000000000
--- a/dev-ruby/capybara/capybara-2.14.4.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
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mime-types-1.16:*
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rack-test-0.5.4
-	>=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-2.18.0.ebuild b/dev-ruby/capybara/capybara-2.18.0.ebuild
new file mode 100644
index 000000000000..ba610c94d2f3
--- /dev/null
+++ b/dev-ruby/capybara/capybara-2.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+SLOT="2"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.3.3
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rack-test-0.5.4:*
+	|| ( dev-ruby/xpath:3 dev-ruby/xpath:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index a9676032c501..7d4c101b75cc 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,22 +2,14 @@ AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f93916
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-2.5.1.gem 254464 BLAKE2B 7276e9c406c000e51e68a2a1c22d0636e294902d31bcaf58e922961a8e1dd99a362467b7046362a5f179fe72f6c077656d4d400e354ed40ed3a06c71de7f07cc SHA512 4fa4b5248bac64c7a76036e428f0f5fdb0b2173987fbaaf18d0130386126dabb083e23cea8cb4df37bae0ea5a883663f71bc6c04406c562bfb7adc23e0899f57
 DIST facter-3.1.8.tar.gz 324710 BLAKE2B 9b7ce93d7d0b2112771ea79df0cb35e7bb752e19e4a54d213161479c27c7ade79e148fe1fdbbb3c20d0d61462aac5f4b97b6e84fdca89623d9ba4911f286e9fd SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7
-DIST facter-3.7.1.tar.gz 374576 BLAKE2B 58f3a8f22c0a01bee1202fdb3f44a8f61a2f9bfed18585c6ccc8f0f3990fcde8c267540a0d06b805b91c538dcdee90e9b9dba3d618cd2df8e935d8d994134167 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee
-DIST facter-3.8.0.tar.gz 378859 BLAKE2B 3fe790c21211fe749727e6da7849911751c8deb51c5ef08ca9669ba385a1791a289c50d4696eb1ed72b06c934bdf385b6928ef04d20ae7b903090162e047b3c5 SHA512 e28771c7136c9b40e2f8b3509fbe07188d2640288705b5bd531521e476b8b8386e5003448b4c199c9d6cced8128ec113dcc9ae317cd4aa5319da906e605cfc4d
-DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7605234e3fef476e92ebb4d541d4b1b9148fc0350cc4b1854c1cb7888482120a3566fc579dabe033301791019 SHA512 ca818ba58fe232752a74faaa8377f706a49661e37ce85af7e6eaf735ecbcdcda4071618a6b8906b0444fea989b7b16cb85171b980a089cd57aaad37508a2b905
-DIST facter-3.9.1.tar.gz 380762 BLAKE2B 15d6c4884a4bd4ce1de252f51b1f480c0908ed8b1b3d7b386e651265a21359305f93dfe199b7e100d027d8507ddf99a0ee712e85e63f26f07f3f6f7c2976cc99 SHA512 a3b66bf40c062dbef644d60909a2c2afd0839c8a11fd02a0a15ccbbc1a1f216d9b0420a0f90dd44166487faa4e00843f2c0f3f057bb43bb30c22677dfac325a0
+DIST facter-3.10.0.tar.gz 388935 BLAKE2B fe224a098bf306cccdfea919eb898e0d60dff09d8277ad7bf70f9af5a2c10983d47bc7abc397357c9296169e3864aa5547e8e67bf7e76596929f1a2b77fa26c5 SHA512 4b8538948871578c88498e95b87757e0bf4b3ced6bef174a120fcc16189996adf6c17c9815e1fa7d8d0921dc7d8c45fe518061f79020a3e2ac49dfd3b5457c59
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
-DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e66837daf410970cca4049304a54af5976f4502a36a3c7d0963d0e65d5bd1c8df5dc1347cc0d6325a9d79512b676 SHA512 c01685e67ed25ae12f51086012e563df9ea80dde43c4cf40ab2f17b90e7bcb0791369a9c8ea67af7a0039e1fb2714b0758d8f0d00e4e857201ad8075d8ba51c4
-DIST facter-3.9.4.tar.gz 388097 BLAKE2B 872ea33c2412ccafd3df1b5e49e79559bac578e91003eda717d03ee1c82e5550f237459066d7fb6692df066fcce183ea4057b4e5e37d1ceaa4b79079ef1c4599 SHA512 e3bb57ad5e538c2561968aab3b47ca7324162dfc5f2a507ed872e41b98f5bbc91f6e836a3452ea2d519a933c76c17a8e1253e74b5d5769e395d7c6895a4400b1
+DIST facter-3.9.5.tar.gz 388129 BLAKE2B baa63de9c2faf4b1891999fdbb5c576461ebc0fe522b77d01d7c711a67466a739802426e2b60812083eacd4e684422353227029152384a78477a840be223781f SHA512 32462caa637e08bae5964b18821bceec3ec4de4d1f5d8c28feaacb3574e3d0dbeabe09c41a7972358d874b29ebc0b0ea73dbc75adf118ec6379d3ad04fb1b36a
 EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e5934416f1fee52654c901a9d50b4e69e10e2669f98806779fdb36f6bb6184698581be4191058d91eed8807c602b407 SHA512 bdad132d8bd7abf5cdb15f3fa35ba76dedf5fbb5243799b46538eb6377776f3a7ca08ed8bf21af11ff5b301add9d2f0cbbc794c4e35ba5d5ba8f27cc74f1519b
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.1.8.ebuild 1832 BLAKE2B d82c18bb394b316a1c397be60905bbc0333697ebe68504562053acde280d0cb3c56ec6bb767be3c6c9edf78bd32b72ec919c8092a255574ff2076bc83efc6ffd SHA512 48bf7bb8ac8b39c8ab7ca2ac97fa6bbf4201b485eabdb3d6410e4568270b11fe863e88dbd1cc93f8c0b690372b5fc635cf72e5a5debb1e97bb5ed1797811d5b0
-EBUILD facter-3.7.1.ebuild 2102 BLAKE2B 96a000c70aeabd1554b918c6c38b40097a4a5edeceaa93d57c8a53e7d9cf09988d00ee426d1618f98fb24aec5d6a2b04b199488af591771ddc563719c61cef6d SHA512 8111259a1c695acc9dd884f6dc19560fb18dcaf4412c924529312b288565d20efb010cb41c64a55594f32cce47071b1216a29df23e93df578cdfa047897736ad
-EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
-EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
-EBUILD facter-3.9.1.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
+EBUILD facter-3.10.0.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
 EBUILD facter-3.9.2.ebuild 2108 BLAKE2B f5ff96477d41f3c85555e15cafc455d5fc571a27594d5fe9fe38525c6ee083e0cd59435031ca81bfb7666632a683ea24d0e9c4b55eadeebd17dad6bb8a241f4b SHA512 67fb489f027193816d966aa4132873e73892c3ef36146abd6c069746c6a807e7ad1aa1f2b3b14f0aa7c97236018882be37a71f5daa95a27491110e6375b5040c
-EBUILD facter-3.9.3.ebuild 2676 BLAKE2B b99a93367d4e27afe75602238ba9da2a8a90b6661dc0388797b86f214156b6c420c6bc26fe0f77a0f1c860c38b13f9f612463c75123ee55c21636e7b20257443 SHA512 04f7d0bedecbfc814fdedfb31c9d7ee11bdc5f345967dfff93d1cdd2697a4bc02731fa7b4b289c521636ff37226310df62ab4876972e57d034a6c05ea10a65ae
-EBUILD facter-3.9.4.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
+EBUILD facter-3.9.5.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
 EBUILD facter-9999.ebuild 2856 BLAKE2B d0495940e38a3a79b71f8583ca919caf296e8ed548724481f0147be4a1d1216502ab27e9c7a0c110e3c8c9bb015767051c05a928542ab74462bb4c1c28908f89 SHA512 bea7abfe6c1f2215f9db8db98afcf7b3a342da77b238dade61de3c87a4395643ae3ef271dcb17e995119410ca716e535bfe1d17b49f84ad55093b6f6d3e8c758
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.9.4.ebuild b/dev-ruby/facter/facter-3.10.0.ebuild
index c15426643a6a..c15426643a6a 100644
--- a/dev-ruby/facter/facter-3.9.4.ebuild
+++ b/dev-ruby/facter/facter-3.10.0.ebuild
diff --git a/dev-ruby/facter/facter-3.7.1.ebuild b/dev-ruby/facter/facter-3.7.1.ebuild
deleted file mode 100644
index 5f534455759d..000000000000
--- a/dev-ruby/facter/facter-3.7.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=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.8.0.ebuild b/dev-ruby/facter/facter-3.8.0.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.8.0.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
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.9.0.ebuild b/dev-ruby/facter/facter-3.9.0.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.9.0.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
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.9.1.ebuild b/dev-ruby/facter/facter-3.9.1.ebuild
deleted file mode 100644
index 247eed1af456..000000000000
--- a/dev-ruby/facter/facter-3.9.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
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.9.3.ebuild b/dev-ruby/facter/facter-3.9.3.ebuild
deleted file mode 100644
index d15e9288ae66..000000000000
--- a/dev-ruby/facter/facter-3.9.3.ebuild
+++ /dev/null
@@ -1,100 +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"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# be explicit about the version of rspec we test with and use the
-	# correct lib directory for tests
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.9.5.ebuild b/dev-ruby/facter/facter-3.9.5.ebuild
new file mode 100644
index 000000000000..c15426643a6a
--- /dev/null
+++ b/dev-ruby/facter/facter-3.9.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+	S="${S}/${P}"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${S}/all/${P}"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	>=dev-libs/leatherman-1.0.0
+	dev-cpp/cpp-hocon"
+CDEPEND="
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${BDEPEND}
+	${CDEPEND}"
+
+src_prepare() {
+	# Remove the code that installs facter.rb to the wrong directory.
+	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
+	# make it support multilib
+	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
+	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
+	# make the require work
+	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DUSE_JRUBY_SUPPORT=FALSE
+		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+
+	# need a variable file in env.d :(
+	diropts -m0755
+	dodir /etc/env.d
+	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
+	fperms 0644 /etc/env.d/00facterdir
+}
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 8f25b0f67445..c5180c3a529c 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,3 +1,5 @@
 DIST flog-4.6.1.gem 26112 BLAKE2B b9b242b9e43bdbf9430bde74c7aa261ad4ce5e60e4522786304e21d55a9531a501eb831073a79230fdc13d8b0e9ec4666fbf72c551e8d82d9c1a6880589bb897 SHA512 43c9bb04ef0c036a523a470ba2741d6845071a376f73f9dd4b983a73112c3fca69221e2444e98c9ecd42ce2a75ae39e4cd21018a934e8583dc622b5e9c384859
+DIST flog-4.6.2.gem 26112 BLAKE2B ab15547c2bfa4b79e158a852ba76b6e69346397da6faaeb1b6ac558f3b380ea240de2e469ba90d23bfad93d11e62f3b119fc6613e0cec8a1d26964c25cdee2bb SHA512 d2bc8af809c5e7471daf455c53c9ee9cee39b4a058501e2d3a20e1412888e11fb786b6c5e19a93172bece80c1d03d21a608bff32e840f5c51e95b1ef40a88c01
 EBUILD flog-4.6.1.ebuild 647 BLAKE2B 29a6df3212837eb32d81979f291bc68342f82cc08b8b9d158c4a37abe788782b137ed8807f45145945fbb0fda6938fe3aac8e5cb25bba47001ba4e5c422e892e SHA512 bd41c61611b729a413002ec238439cf579328b0079d64d9da3a1ee462d353e030764de50359e6cfaf787e25816e5bfa9de975fd17b2517f5ef18d3eab599ce9b
+EBUILD flog-4.6.2.ebuild 640 BLAKE2B 0cd7d065153f854e0125d01807cd6f7d1ee7909a5b4916bf9c4d8aedcafb51caf6c3f0013548f03d65d0a877a4e7cd2a75a2eba0efc6586d5601e9adeae9d797 SHA512 12afe0a71ec0997288d136eee657e13783b0bd4902afef3b01942c64a4eeafecebfb303c08f9445e51343d75cb180fb06a37a45124441819d2ce3e098e02a9d0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/flog/flog-4.6.2.ebuild b/dev-ruby/flog/flog-4.6.2.ebuild
new file mode 100644
index 000000000000..e12ac1c66acf
--- /dev/null
+++ b/dev-ruby/flog/flog-4.6.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
+HOMEPAGE="http://ruby.sadi.st/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "
+	dev-ruby/path_expander:1
+	>dev-ruby/ruby_parser-3.1.0:3
+	>=dev-ruby/sexp_processor-4.8:4"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_flog.rb || die
+}
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 9223ce61a613..ad44a29b8bf6 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -1,7 +1,9 @@
 DIST gettext-setup-0.26.tar.gz 14158 BLAKE2B d5efd85e736f2bac5b9a5ae4947a5353f83378444e64d2d999d95c765352c16147254d069faac87b6d8d65d44e52af850dddc0e11e1cb6ea77627f2768bf19b7 SHA512 c421a06b11a09ab68a1c784b355bdf0a1aeb468f0af8b2dc8e14dabad091a3f5ffb56eee2f39885dcd271cbe504c4c97a220c560da6b7dd5552b537be6455c2e
 DIST gettext-setup-0.28.tar.gz 15594 BLAKE2B 5cda2bd48cba44f38a27020febcbe6e9ee653d5399d17e942272fb4e3b7e5e54ee9612c2c3367dc6a41544363947cff8051af6fcb0f037dfa0a9bbd13274b20c SHA512 92526b21968a3357c5b86a953b83b28ce640be1eb3245122e89d701c3c3b9d72fb58c0c1f43a81f0fd0dd317dad69eb9f06abca818a394b9f14240d729949ab8
 DIST gettext-setup-0.29.tar.gz 15811 BLAKE2B fab356f79e9a84433df583d122a391240ec9c412b062d6aecd13116bba483b3e9f71f8364e82cabc1f695ada416c99fcc8fafb2c8a7b99dc9f21881b4c045069 SHA512 b6bad9c38481880f1086ad9edca86ee46d5afb915213591d7b30526ee3428c91325f59f977ab21395fdc73df702f05666a3e00116ac5765b9bf66ce6bfa90575
+DIST gettext-setup-0.30.tar.gz 15952 BLAKE2B d224e0fee34b0735fdf22abe2efe81b45c6494fc48ca509daf076cda9d3b83dc6dcd3e44c20ae9776d98b7d6128e5b9a93fa49ba1f2daa4b00929714e8d7365c SHA512 6ee398a131098f46dcc2951d166081a90872330b6ba5637292eb326b1bd6f40f46350f6be7b2b9ebee0c62442609700e06d25befcbcbf6510f3d96e656855124
 EBUILD gettext-setup-0.26-r1.ebuild 1037 BLAKE2B 54c2d5aea4dafba440dbdf0b6e72cf76b2ed972412047ae3ff053ec16f22acffdad954b9094e1d07ed5de08e21e480053f35f446c431d6d569c247274775133d SHA512 5d9eaccd4a488bb4fbb07247fc0f359919e7c289d21f9de9147dacefd6804074f2ecb7fe4685166caa101fe9b5b65573f91086ff1e575e3cf0fbd2fbce93ddd7
 EBUILD gettext-setup-0.28.ebuild 1044 BLAKE2B 0699a94e54ffc5e3098f5252a65a846c91e8db6b14115c6436b5fb61c884dda2e361ecfd2ac26976687279bf3b7749287d2e81b1d6407b0296d13bf1865fc9a5 SHA512 5e18394ada417abe990503c7320fe01fa5e749bb1cd26c7d6f6c45b4f454054b7ec128e5a1447d44c506ec988fe5a87c4400c5f91108f177a745e6ddd545b032
 EBUILD gettext-setup-0.29.ebuild 1060 BLAKE2B 330bf2b6be2c95711be022a987e39566ab9e242535b1726c1490d908af4571c1e526ee328aef0e6853519f2d8a4ca7353218b0e2a679120274406d394efc2f21 SHA512 1b05afca02c2fd5232f0e012dda6484b06c0e17ebd74b3c2edda67c314477542a554bb86a646deae3d7b336a0a3b9623cda2566317d2d9b5e339030990b2aede
+EBUILD gettext-setup-0.30.ebuild 1060 BLAKE2B 330bf2b6be2c95711be022a987e39566ab9e242535b1726c1490d908af4571c1e526ee328aef0e6853519f2d8a4ca7353218b0e2a679120274406d394efc2f21 SHA512 1b05afca02c2fd5232f0e012dda6484b06c0e17ebd74b3c2edda67c314477542a554bb86a646deae3d7b336a0a3b9623cda2566317d2d9b5e339030990b2aede
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild
new file mode 100644
index 000000000000..756bded96c7f
--- /dev/null
+++ b/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to ease i18n"
+HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
+SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-gem-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/fast_gettext-1.1.0
+	>=dev-ruby/ruby-gettext-3.0.2
+	dev-ruby/locale
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/1.1.0/1.1/' \
+		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid spec with specific locale requirements
+	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
+}
diff --git a/dev-ruby/lemon/Manifest b/dev-ruby/lemon/Manifest
index 5523a96c8ad0..cba9ab6227ce 100644
--- a/dev-ruby/lemon/Manifest
+++ b/dev-ruby/lemon/Manifest
@@ -1,3 +1,3 @@
 DIST lemon-0.9.1.gem 31744 BLAKE2B e1b213e9fb5690c6dcc03cac1d83e9dca48540c41ecaa8bc90873c91d393c6b5fdbd800610238e485d42c1a3412541beb6119eae1e8830753fbc0c786084f3d2 SHA512 8e77d049982ab4e0ae3a18ea3f4d0e4164026fffe1ad94d3098a4165102630c529a9909c3978febb816723a4ff7e17a159a0e067f5f826f93d11f720e49062e8
-EBUILD lemon-0.9.1.ebuild 646 BLAKE2B b0366ccb005f3f4a4c9138c093a533b17fbf3b5e6af8d9eb71524f074a666611fb9a41344662016137310affea875957bb6b3d584dc426ba4fa36edb4eed7fe3 SHA512 6fd1c3e867400e4380fa7b54576ee730a6859ab0cc0637133ab34b1115590025f687ae167122f7ebe9a1e5f0db056ddeb4954f5f584511fdc03a9df81620ec13
+EBUILD lemon-0.9.1.ebuild 639 BLAKE2B f501d888896b21f3ad36e35f725cab386b3ca41f2956989284b0d0459eaabc80a532b7ff5e7fe6d018716e5b7765878583f533a0ae45d67f7bf67f4da151e1dd SHA512 3ad6f82c8a3a0312341d7828afe025f166754c6ca1db3913a0324553cf0bb2533bb05e177221ba9214c86a7e8796fe4c92acb10ade7b6d65b4963beb1b6c78d3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/lemon/lemon-0.9.1.ebuild b/dev-ruby/lemon/lemon-0.9.1.ebuild
index 3183fb3860d4..7f9e53cb5e79 100644
--- a/dev-ruby/lemon/lemon-0.9.1.ebuild
+++ b/dev-ruby/lemon/lemon-0.9.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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index ed9ae1617e02..96f9fa1f8b59 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -3,5 +3,5 @@ DIST net-ssh-gateway-1.3.0.tar.gz 7735 BLAKE2B bcf9b96e35377e8650e8c40fb28d248fc
 DIST net-ssh-gateway-2.0.0.tar.gz 7825 BLAKE2B 05ade5aac288ee634aea37acfc68c9781e8178bf0ef92abafac13858a86ff952a2b30b6f92dc08f3856d9dd02a9795e0b93c15543b932070b9ec3f6a50c03e52 SHA512 6595c2a2a25ca9bffb942497be984773c10746f34e1dbba3d72503cef3c88e5bb50bdc8713c246aa6e38272540fb0ced66a3909bc02df96f511b0dc9fc50d735
 EBUILD net-ssh-gateway-1.2.0-r1.ebuild 792 BLAKE2B 39f09f89025f9553ab988ebb36f8b02ded31e90e2fed363e65a7f3c3a0326cb933970f5349ef3293318ffb15ab5b5f78295ad6556953fba4530694c11489f3b2 SHA512 83726836f3f068ef1df4b291ec0968126edbc549d2a3f8d6554e96f5582a16531c4818a5bd19acbd8ad339439444a845ebbf0544e3b0476a99f774e0a826ab11
 EBUILD net-ssh-gateway-1.3.0.ebuild 837 BLAKE2B 2efb30d732e74bb7a9c077505782ed530ee4033856292e566e5aa8d4675df7de3a6568db3a26fe0477258f011ce68fa2c0864d8588ad43be7240686eaff729de SHA512 330ef36796bfa1badb6f80d39e217aa9c97ca8e18a1a9bc4f74e17a1a08fe44cb0ab4fef13d6275cb2adc03e78cef04c71d2e068702690f78e2656f2348c662b
-EBUILD net-ssh-gateway-2.0.0.ebuild 728 BLAKE2B a624d842e572e2eca77d7158e046ad8f51b4b9f33a17c5577f978ee2d4d633039e635b19e1656f6ebbe527a4d3361d42193b4e31e413d93bebcb5d975c3b5761 SHA512 86d69b949a2d963076bbf42cece66d94dcbc8b24ee8fd902d148fae3f80fa88f809082ab25ad1f40326feb4689ee080b78f9dd2e87d6edcae5eede51aa5ebcc5
+EBUILD net-ssh-gateway-2.0.0.ebuild 733 BLAKE2B b3a893ef89575c079c81c3535d409404bb7dadebfea419a407a9d0c0be428ebc8fa1073c049de910532578c4cd3f054f75abeb5a11b8beb1f4dc0a2620b4497b SHA512 68b448ae86ed01c146955c03cf60c0cad3b6f06322e5f19fec6ee097f4dac11bee40451eba7c62ada4c7a1dd3541b62fae745532c3af7b569a670174a39e42f3
 MISC metadata.xml 331 BLAKE2B 1c926dbb5b9903bf35a96b839b8564de448a527cac952fa91c5df4c0df4f825eefc7a6bc1cac6c7da39a3127a2a0245b5e3b7d780009c3069bd72723f74c291e SHA512 a5ba1172a48f9aff250cb3cb9c6315a0ffd12595704a2bd5788ef59e73b9efc606d8d944ecc0f1346340a4a9e1caee2c6a1c30581d5d6a78bc26c751d4c6cf7e
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
index 6be6e67b1b8a..8bc7394d8508 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.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=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/net-ssh/net-ssh-gateway/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="2.0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/minitest:5
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 8ca383cc6557..e33e39b57c11 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -4,6 +4,6 @@ DIST net-ssh-git-4.1.0.tgz 194968 BLAKE2B 58d25601959939e7d7ceb7bdd09d7b5f583513
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
 EBUILD net-ssh-3.2.0.ebuild 855 BLAKE2B 47c821c9730975e9bacbf1eb696280f95a0c66310537187daaff05aff3592b154cd35717929412b2b24c9ade83166fc5d9797795f3875263b06dcf5eefff0e1c SHA512 705aaf6f007dbead3c623ee7e8f889c56c378e494c029cfd717f979548a24587b5f0f77648626112c2c864dce951d24fe02e3fe230850fe58ff3d1c2088162dc
-EBUILD net-ssh-4.1.0.ebuild 1065 BLAKE2B 6dd64b1eef51fbd37529a9b4c22d264b14d675f4cf436b1768838d38dcb13f05e84929719c048ca067e30b9b8a2a0d4bc0683e0a13d11dfac84f1ec38363cd3e SHA512 85e008628f0cf0d66d3027c14e6dde85ffe71860b2e575f4938e6e6c302484f1badb25496a04a40bd13c6591abf556652e97f2ef52ab7cf87bb52650ef8c39fd
-EBUILD net-ssh-4.2.0.ebuild 956 BLAKE2B 347ae001054b63c7504ac04d8c93b1e7a46e4bac2ad2f2da850ecbcd1e0d454f6c736f90f8367d55c4d1a611f7d813443cb49bccf4f92075fdab2c68851fa8a5 SHA512 961797f2e4ea0d292b928e68c32b6bfa902579dd0e50dc66728b8503eefc58fa0e4e88c1673fd6d3995a6ce73821771ecaa8e4a43e931a205f94323aca8b1fd8
+EBUILD net-ssh-4.1.0.ebuild 1070 BLAKE2B d04ae5a0925c3ab4897c6fc331f53c30034d78a7c15bf89040a9dbfcf528e8ff461959b8fce4427462979b0a54a6fa9fc0982637efe7c8a19395bd0709e1a566 SHA512 e85512f29b57c7898b97c736ed132409bd71fe191f5429b1d6f6d10cd2c6a6dbf68a1d8b19b83c721d9c8855061592cf52d5e48af2521c78f1a7d803905ee41a
+EBUILD net-ssh-4.2.0.ebuild 961 BLAKE2B 1f744b7182963fa3c97907c45fc050d3e67805f5261def2a8f586289a75a68d652b4729b44ee8616e8e70782af16e6dbda56fddf7d02a883924d0eabee1d3cd0 SHA512 8901b9a5c4f7988c825866d7b8446527a7cf2e06ad16e1d8b4622989856508a7e55499c9a21116ca8067c22abd7b870bc09b040d1a21b79b4a8ef1e8a762754a
 MISC metadata.xml 460 BLAKE2B fcbb901a6f9f2c80489e28346a21ea7cf5dcf7eed49c72dcf8cad079fdb2f52969d03b619d4535206c078c9d2d3a6c0492b035919eef89b3eec8207ea7e3ecb6 SHA512 9e66fd4626a890ca908b35e1cba4b5712ceef882fd6dd1f72ef20e6b07ca0b32cd3fd92d84cd0816c38cbc1d3d76152fccdd1e90d901b3d0f8b096b3274b8cf4
diff --git a/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild
index ac82b47cc505..a7000fc41cc3 100644
--- a/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-4.1.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=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="sodium test"
 
 ruby_add_rdepend "virtual/ruby-ssl sodium? ( dev-ruby/rbnacl:4 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
index 0e07340d45b6..6042bb263bf2 100644
--- a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-4.2.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,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="sodium test"
 
 ruby_add_rdepend "virtual/ruby-ssl sodium? ( dev-ruby/rbnacl:4 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 77c2b620366a..27d99c551b2c 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,7 @@
 DIST public_suffix-2.0.5.gem 89600 BLAKE2B c561b32a26c4b605821eff66ae2afef17988c45d954a15b04a7174b202851e6dd0012df32981146a0cbaadfd0358b1f67be359b5526a65de2a3b0f7061ee7beb SHA512 d261dec44c11803631e267f36d82a59278d90dceb2811233ca511e895c5f1a58005b6afea980bd1bbd78bbfc7a3a4e02f9f1fbe351fded38be340ecc235da383
 DIST public_suffix-3.0.1.gem 95232 BLAKE2B 4a27cfed98c19e4e5e68849e48bcd1a28a93232dd63ee53eb0368717aa7549e106851e97c3e953b5721d98a17de195d16bf68951c6753ef39a4648af00b8f2d9 SHA512 6eac89d22cc766a12032f4abd2fb8b707e4a7c82bf35d9deed45fe11ed3932fb3c2339da7fab775c10603d9e39a484fa5a54d33758d2f5fc9a0c558a1d4b2e0e
+DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 EBUILD public_suffix-2.0.5.ebuild 786 BLAKE2B 226d099d1720b731a3a72f12a8c023afbd741e5c89d41c06b1ad91551fa2b8c1dbc59440f2f9a6f80661e31df643f45b8e748b4578b542f63c07af87e806e3c9 SHA512 a1fa4331c5a81e897178e4f785dd41be6d50df045113e9f436d2165a9a437c64284344671223ace3aadd7e0637a0d58f39c7512e96c56f455257353df83ed3a8
 EBUILD public_suffix-3.0.1.ebuild 823 BLAKE2B e3d32f247a6b49c0402f7a88b013d7dc75fc6f39d3c9a9fd639d4ce68cf7f716a3c40c6113cd072b6c44afe2528f6144f4b8bcf82eec3a205b1fa78cc03fcdaf SHA512 e9027137b6574e2ef0462ce2137ebcd46250d192d2298a76a3bdf6bf1a5ecaa2a85a23e307306b1b67b008e58a4d89fed8a52b5e30682004cdc2499c78062823
+EBUILD public_suffix-3.0.2.ebuild 823 BLAKE2B e3d32f247a6b49c0402f7a88b013d7dc75fc6f39d3c9a9fd639d4ce68cf7f716a3c40c6113cd072b6c44afe2528f6144f4b8bcf82eec3a205b1fa78cc03fcdaf SHA512 e9027137b6574e2ef0462ce2137ebcd46250d192d2298a76a3bdf6bf1a5ecaa2a85a23e307306b1b67b008e58a4d89fed8a52b5e30682004cdc2499c78062823
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
new file mode 100644
index 000000000000..e4f112b174ff
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 8ed161961bbb..32590b93b020 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,5 +1,5 @@
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
 DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
-EBUILD rbnacl-4.0.2.ebuild 720 BLAKE2B 87c2105739248ec75dca71095ab5a5ffcf1a5b93bcc43302f0b0152ae93f1fe834c2a91f85dc53bda852bc4ef4bbb64330f2901111386f23f13639351855a2db SHA512 ac8acefda52f1ee716790af637f69c597761c467461c0b557cfa9fb06d8e0c29ec0b9593d45c75227d4a5036abc4dcc3262f1c6c2f4a0bd1f089522f180bd89a
-EBUILD rbnacl-5.0.0.ebuild 720 BLAKE2B a7e9ddddaa723903288ad6b76ff6944b676884472375627332443a29d64dfd0e09f10fb9e23c2d4f6e76deecd5f7a91c4a504941b84ea792f0c174da4b60364a SHA512 ccd714b95e738523176235555ed7312a904acd5986d8908afa306ec37bb24c17dd04409389e7521c738411eefb6d6f935ae3d176ddc5fcc27c65d30a19ce5d48
+EBUILD rbnacl-4.0.2.ebuild 725 BLAKE2B 97cc9da509931465e2d7c0e228e39c48ef37f27ea2a1febaafa4994c80e98794e53ef06213145777b459551c986f1033478aaf45898592c7b0e8571265cf99a3 SHA512 3c8e4e805c94bab568a2d23cdca032d6cc718de8cf8d22772730c28e39bb5d8c52be06eb74e5d56836f87050d57bf46d57041e4baaace70c1fed400330129cba
+EBUILD rbnacl-5.0.0.ebuild 725 BLAKE2B 8d8c3dd3030b1a8c73bb1e4d134caf0d24b4a0eb9e761d688593376fd2495b686484f6ada768675eeb7e335550eaeb952c88c00489c066c77f3ff8ef0effec72 SHA512 763c5d809c428e3ce3e9d7ff3342e3a3267be753d9d99208a195ef935922b76e63b7d8f46165aa001c72fc9aaa17c8934bc5c603b006b74d3a12b16d47a2e110
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild b/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild
index 9a21d0ad14e3..005d941df59e 100644
--- a/dev-ruby/rbnacl/rbnacl-4.0.2.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-4.0.2.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=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild b/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild
index eb435dee8db9..cce62e8b6199 100644
--- a/dev-ruby/rbnacl/rbnacl-5.0.0.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-5.0.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,7 +17,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/rspec-json_expectations/Manifest b/dev-ruby/rspec-json_expectations/Manifest
index 230fb1303225..b6cd375f107c 100644
--- a/dev-ruby/rspec-json_expectations/Manifest
+++ b/dev-ruby/rspec-json_expectations/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-json_expectations-2.1.0.gem 14848 BLAKE2B 2c359351ba457297f7d561059183a8e32fa5762dbdc97c8ddb2432acb00c092fcc14a45e8f7625812420b926c4f177afdf4ff124f9b35d15b60fb58861c1f46a SHA512 1b09b959d6ecbc76c13b37fbf89cba381feb00505ce3a5701ad87ef1ed2ee178ea760508af809ac7dc8285c24d86dd7e33a7fb903a7f74472ca59d59f8df0daf
-EBUILD rspec-json_expectations-2.1.0.ebuild 682 BLAKE2B 53c966913c2d48acd5868f30ca60337f3b2a9571f82104db2b95c1658dd3a5d62297ea95e234072eb0eb9e27c79a918374548c2351f746807cf693db5d2baa49 SHA512 3dcd888f101f15ecdabaea41565fd7da91b4307a6d8da5b1ed223fcac9e64280fd976401c74f102ec9f02b93eb73a6826bac4280504d203ff2321ba8843db715
+EBUILD rspec-json_expectations-2.1.0.ebuild 687 BLAKE2B 8370046680248c23e053537174bdf41972e962107c6665048b5a049e20b446f4841f113480fa615b54cc1027c022232fe804595f6065fc7dcc653a25139b644f SHA512 40fc3eca561b4ba36c18bed8203a34e2360be02459c46035785a251ccc1ab288941002a5972df012ae703e9aaf2f20124d28b4212af0a63a1d07940605df9d8d
 MISC metadata.xml 359 BLAKE2B 7c62397e3d1ccb0bc72c162d533f024c1ed8ef77af4ed2460350a05731db31b66fad74356d8d025c3a2e8f7206a2f18d506e1d6af3ffbbadca8ae973deaa291d SHA512 70d5b53c0b741113a09ae01b215e3e9397db63e484010a57c681a5cbd121589daf140eeaf691392cb046c1b3a001046c07c8caaf37de6855f5c437b479a02a6b
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
index b6095cb98eef..67a63c05b9b8 100644
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.0.ebuild
+++ b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.1.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=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/waterlink/rspec-json_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 6a0cdf2a1cab..fad338d2dde0 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-prof-0.16.2.tgz 87039 BLAKE2B 89a06edd36e7e70b978ce56b4cfea04f871538d2c35f25be3e46049d7fea863ad91006f87aa7ffb9afa4416c3e2aaafb7774c93804476dbc746b764c86d01c0e SHA512 4a070486375a40afd03c006385a14f5d2ae3670a658e1153b086d0e63eb7a87af38ae060c9d457cd67a5e084f75dd997cd39b890ef4a510bbae801838f74f7f8
 DIST ruby-prof-0.17.0.tgz 93492 BLAKE2B e573b77fb5f1134af99480efe3af706cade122c51bbef883cf0f915e359c695fe70485239fee7415288e99115146230bc803ec1976a39c6f5d743c10f0158744 SHA512 4e2a542420eced379a0326c0f48a041379a7a2aa06247e5cd9659f92b44ebcfca21d12a7bdf50f23ef0bdd6b37895b963a489a975ca84d487920c8fe52446d53
 EBUILD ruby-prof-0.16.2.ebuild 1590 BLAKE2B 4c6c5dfb11e9892715db60979e12d00648fd8daef722844aca1bd74812cc10c90e509e50bdbe822173c1e77db75b5af19358ce968e1e828e106fd6016f4fe4c6 SHA512 376ffdeddc9bb37f668513e597a0a56a3c1d5beb9ebc6fba4fbff2dcff9be1b4815145bb08847e52c068b1f02a198c2e324ca20c5339c6e21ad695f09a968786
-EBUILD ruby-prof-0.17.0.ebuild 1583 BLAKE2B a28fb7519e74730feded234456003a25e7f4f9b7fc9771c818d623ddf5bdb9991f5d08d36eb38adcc3cb7c346987fd4198944de1fbacdbec567fa5e8ade23f3b SHA512 7b7ba8cb573a4bfc170b29f5b7a250cead1298cd223fe595267bfbfe414bcdb4101c354902d356e346ad70d03c583e42dbcefe393025efee3fa104b1643d4325
+EBUILD ruby-prof-0.17.0.ebuild 1590 BLAKE2B 8334b9a3e32cb62b57c8faacf82041567c0b25e0d956b83e15df785ae2fe59296314a2d195036156879e86241e18b11221db0aba10ba5de772d33f932ebcf983 SHA512 f5dbea29ba2b662736fac9e8740cf75a84bf8193ed1b6c84061986c8a88a0cfeead129266e6a4b4416c597153213a78a722684c6204aa9a096842a575e282204
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild
index 2a48a14c7e1e..1f62e5db8d85 100644
--- a/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-0.17.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="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/ruby-romkan/Manifest b/dev-ruby/ruby-romkan/Manifest
index d9cbf8511e8e..bf2f90adb1c1 100644
--- a/dev-ruby/ruby-romkan/Manifest
+++ b/dev-ruby/ruby-romkan/Manifest
@@ -1,4 +1,4 @@
 AUX ruby-romkan-ruby19.patch 900 BLAKE2B 209603b4b3ac92a7a076fa5c121d1274bc974dff581eb6d53b09163a555a4bd2ad2aead660c2e6066bf94b309f82927e88ffc1a856696d1c0f9852ae4dd3b7f5 SHA512 b031c67b6bc821ab6dfd91cafaf98384eca8b8ecbe7f8490e54c06ca54e817e07f54b8f97a0b9499b6fc617e4493a737bb06177d2ecddc97db435c2ab5259073
 DIST ruby-romkan-0.4.tar.gz 4653 BLAKE2B 2680fece04c80be9d2f312a98c5d5756fcd465aacbee5a3ddbd5409e89d8d54cbc0dd27b556173e94ead143dcc25cde530fb002dd3c4833d321b6169afaabaf7 SHA512 d4e4089122d643878a0e19852dd650c4d7e35918838edfe4bc210a5d26cc3e55b5be430db4378e75f44a3435331fd4e1155dfc3e1846babb3a1b626dd127eacd
-EBUILD ruby-romkan-0.4-r6.ebuild 691 BLAKE2B 440611a580853ada65d3b023231e43de0d84bc9906a6e6b6123985dab9d98492e9da5050ab4850f86a645e865dfe6c794638e36290c2edd70dd515a6387139ac SHA512 77188a535f74069106b9aae5d5fdeaa03d3a68863fa9cdcdfcb4106b06e2023fa5dc2d8867261ed07d1f9e480f66bbf32d6eafd844dab1b920740effc27d6df9
+EBUILD ruby-romkan-0.4-r6.ebuild 691 BLAKE2B 032dedd01605bcf27e70dcecaef2b44bf76aaf28561b45ebf0fa77383ccc7e2147d47fb675096d6877c3981902b2ec71a125144eae76e50c55a1216f5b20dc92 SHA512 e62bf43b28f4d039e974c12916cb122bbf40480aa3964b66238ce07b2b0d414bfb072c87e079c21f1e16b692ebe94b5c4f504f3616f08f2e242cd8157dff491c
 MISC metadata.xml 338 BLAKE2B f8a954021951292146b75f8693ae3b4219f237f771a0d31e3f60ab9a58a9ca3324a751b864a90dfdca505ea41e30888f53f756cf109be467ce954fd77730e894 SHA512 4fad57cfae8fe4452b4ef063dac4700b42e391549ebbd37a6b9be5205d04f463b05f7e92520a50a5147da8a40dd61eb6780d2fdb851518cb1409ec4cd5afd76d
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild
index 4d64a722c482..b72b9d47a94b 100644
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild
+++ b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.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"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index 18f396d6a49c..25ca0b194add 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
-EBUILD ruby-sdl-2.1.2-r2.ebuild 1961 BLAKE2B 24e0065ea387eaf2370cab5362a96f12650a4f7fe8996ac7549dcbcfd33542c37142ee64802c8fb4a74e07f1771657fe387faaef0da56428d719f7f6587eeecb SHA512 07563ff06999f0accffcfce96092a047788c4a89829433fabb61eb076ed66912dc82818308673986cef526be11de0a0038de67884a039bacfed96a0919f5cef6
+EBUILD ruby-sdl-2.1.2-r2.ebuild 1961 BLAKE2B 4096c770293b50e80a2e737e085709c313cd9955511fc59f64352151160be337cfc0881db25b89c2f19f4c5b6db48db59cb60b3edabebab4ca52252814704f34 SHA512 dbce680bcc447be335d25ce6072d9c91ef5e24d06bf0b5988c251feb668f4bf949b6a13ccd9f323fa002078bf05200ba570e9df6659a5499d256aab7c0dc8208
 MISC metadata.xml 560 BLAKE2B 44c2c964436b58f2f3d088cc598db576b71e5f42a490e1ae616400686addaf188c82b0f5a4dfab56a61712d5858720007fb31df3f6b71d0e37e5b617dde67984 SHA512 a9eaf9e6a1cf02821fec770e3499796993aebfdf0a7f251773a12950cd42770beb1d5bbc34fad694e74522eeeea619cd659509c31f914f4ddd257a9ce1c17fbb
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
index b9c47ca29cb5..cc3aacac6c06 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.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"
 
 inherit eutils ruby-ng
 
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index 7bbca7a38bfb..012717160347 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-shadow-2.5.0.gem 11264 BLAKE2B 22012d4672528e76a860e534fecb2a40d27c15f7440a0be6880c4ffd06be26e58d2f5279c385c49aca611864c8959ed0ea3afdd78bcdb28ac0912123f18a35e0 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520
-EBUILD ruby-shadow-2.5.0.ebuild 700 BLAKE2B b5f6023acd6d22962f5e02fa6a0e3ace6a0db700e895dacfc08999992ae7bd10c06a49d395cf6352c100de0787912872eba4b7bd9fb5123d4e494f81de22b246 SHA512 b4b3603ef469533fc6d0b59bde115474ae65cee2b7c65a97c45502019812c40fb6357664c0fe8492eeea8315f59926d75c46a44606c87c47a54eb3dfdbca547c
+EBUILD ruby-shadow-2.5.0.ebuild 700 BLAKE2B ed4cc3d001317b6318ff4e8813078e87682ae809c61ae342341b8278249b352fd65017b3ec90f172d2f62740815433a5982b4d8321188bad987b1aa00dfdb867 SHA512 b1c7939ef9faa64f88d3a4f7e6b436ddf4ce8691eb0e25f3a43fd3d95a7295bacd6438d15fc9f7f3c4cc48231c4bda672d797f2ed0ed6f7e3e514c356be5ceb6
 MISC metadata.xml 347 BLAKE2B 42c40ba1449b2293694e5c83b9ef067382931664c25ced0d673e283b7fc31c8227ab533af19425f7a6de877f528837c1b1bd766c70bdbf4cb911667f4a31a360 SHA512 cce865a7291f5f7d1956be970f486355f79703986029fe61cdf2124750319efa6bbd949718b6b5242c1118672327764135ac539ae0821462c6d7c9c9e8e1af47
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
index 3102b14b9278..b17d2fc10c4b 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.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_TEST=""
 
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 4cc9521ce38f..5c1c9274bd3a 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-termios-1.0.0.tar.gz 14738 BLAKE2B 61beda48d956a3fb9aa9aad118d1a28576b420e37528c5bf3d8516e0112fd0b648ec2987c8b47048feb50c694ecba6ad0ac27711ea1216b481dffa759b291eda SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a
 DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
 EBUILD ruby-termios-1.0.0-r1.ebuild 975 BLAKE2B 1604516e23a132e11decbb53f1ab521b0ed3394dd35b64acb46bfe43efd95959313f7d62d03ad4aa9cee7183de3f3c657a1e117d6b792a7c93837dc4271cd0ab SHA512 bd78505df91239e8a0bf638652537daf075c388ad969dfba80dca5310b9c5d092ec7ac8d93570dcc86f6996661badcfd47405976637fa722b87c7a95fc229887
-EBUILD ruby-termios-1.0.2-r1.ebuild 731 BLAKE2B 3850df8960f81971df72bbaae0ce6bd75420aa24a4550e13fc49aa43c272c970b72016755d4a12db776eafd06a6f9d2883d9d4cadbc7975e601c3ec5cc2eba0c SHA512 5956cb389f9f5fc7d3d83ff9b4557bd624715061247ddc3c1531f2d8058607958170bf95bedd4de18760700b6f79650228741caaf8530b9193188e2e32ce23bf
+EBUILD ruby-termios-1.0.2-r1.ebuild 731 BLAKE2B 3db0c404a25ac5ff9cfdb27e483e14d70ebe41c51359e6b8b356e43ae8248c900f5bf402ed75eaf7ef6b8fe711f890ab07dd4a3286f9c604d97f025b9dc30603 SHA512 b34cf2f0e49a7354fa18dd960d139ca82760452814d1738d18814a457e27d12255aa36859870d27cb9d919913bf0bfb1b23da59388d828daa8e04d64f3b2509c
 MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
index bdc574354d6c..d4d72edadfa0 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.2-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"
 RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
diff --git a/dev-ruby/ruby-yadis/Manifest b/dev-ruby/ruby-yadis/Manifest
index 41c939e6dc37..feb1b9e52483 100644
--- a/dev-ruby/ruby-yadis/Manifest
+++ b/dev-ruby/ruby-yadis/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-yadis-0.3.4.gem 16896 BLAKE2B 69527b23900792e83e8ef52970ed8b847f69748823f0bb04d417b2b1cdbd765127b54aad81cf5b1559f532cefc7ea78d7c32e2a222a6a1364103e2b9026ccd54 SHA512 1811fda5421b630c954a493a227d4ea70a6d2722c136c3b668a33c3c94f4bf9229f34c0e807dadb452a6c74f008461ed3bb3fa192bafe4bfd5e8f1d242e6e5c9
-EBUILD ruby-yadis-0.3.4-r2.ebuild 789 BLAKE2B e348ea8d505f0c857d780c53f6e8a26c5932c99c899278bba2dc38f64237e866a02be4b1c28521b8919c219ae7afc30f03659f449c5590a36bc2aae657d707b1 SHA512 ab5d62b1f5229e213f224180ec031c5360288306f289c64dfacc26cb69d7cf5bef2423012b657cc0a7a55f3572a7e067add22293b54f10769b9a556c4ca55b0e
+EBUILD ruby-yadis-0.3.4-r2.ebuild 789 BLAKE2B 9611ba63cc47631834268f6c27fcc24b339303a56ab7ad07368fe2bbee5e02a9c67b96b70ed91138ec567a16cb48f26ec953c45c6a88a6a307e2a89e9e60221f SHA512 f2a7ca541ae2906b6277537f05ca9154bc4e9646124ec6110a978b16cb3de4a300db00246d9658257563e44b8d6fd38a8709f68a15111730abd112405496bec8
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
index 7db6d036db76..8819a992bf77 100644
--- a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r2.ebuild
+++ b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-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=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index f823e2498490..18c3db676fd0 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -5,5 +5,5 @@ DIST rubypants-0.6.0.gem 13824 BLAKE2B f05beb472c22da33462d0dc70b3b6b1038d2c3a2d
 EBUILD rubypants-0.2.0-r5.ebuild 827 BLAKE2B 25ce25c6074acdb86a673517ffaa7f4a6f37d2cd7a11698b75b067d8f8fc6f8689397a1fe1ce417ba1ab0d4b7d238279b7fb15d21085196aaf1710e127b9e9ab SHA512 5096c7df18d37d5c95a2c67ea9e3ba676567925e539fae047cee752c2aa5ecd767b4d856756881c0535985f8bc613a5097f9b2b37483a45c04a22d816b033d96
 EBUILD rubypants-0.5.0.ebuild 524 BLAKE2B 006e16b8350e43f3689919365cf63b9a3befb50ff1ad50ac08d3176365787bfd95b984df78a81e7cba9511d3f24edd20b26a5c189ddb1f8ef7272fce8f31a63b SHA512 c2e3840dbea6e680edf9dc535bfef6fe16fef9df79645481482c313dbacba047302ca637be5dda3096e30e914da04808b9a216fed66dbb9cd07a8bdbf261453a
 EBUILD rubypants-0.5.1.ebuild 524 BLAKE2B 006e16b8350e43f3689919365cf63b9a3befb50ff1ad50ac08d3176365787bfd95b984df78a81e7cba9511d3f24edd20b26a5c189ddb1f8ef7272fce8f31a63b SHA512 c2e3840dbea6e680edf9dc535bfef6fe16fef9df79645481482c313dbacba047302ca637be5dda3096e30e914da04808b9a216fed66dbb9cd07a8bdbf261453a
-EBUILD rubypants-0.6.0.ebuild 598 BLAKE2B 29fcaffd179192f4eda860887334524064515b8e1fc5264c6d1d532966a14e2d63345baee417b5c3a761476bbc7e79e7a73f5930186848976a48725f4c84dd83 SHA512 ccdd96ab2512966cb13607ae877b26c4b0c53657ea8121405564878962aafbdd32a1c40c26f8951e896ae3617beae8110a7082a51074996653f83d42d25d671a
+EBUILD rubypants-0.6.0.ebuild 598 BLAKE2B 2b713b427fef87bfebe6e392b14dead768bcfefe7f0e5127d895033fe91a5138964da7fc8858dfab3548bdcbea8e0a5aeab758e5e9f7d870a26662d8ead5d912 SHA512 6de6e3777adea013eeb11470af61409c9d901dbcb08ac379781be45f577da68e2891828ffa7a1dbe5d6f6d181bd726db30cd60cc59fbd5fc0bfb3cc92210d8a0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubypants/rubypants-0.6.0.ebuild b/dev-ruby/rubypants/rubypants-0.6.0.ebuild
index b6c36b8626f7..232e56e44d10 100644
--- a/dev-ruby/rubypants/rubypants-0.6.0.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.6.0.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_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rubytest-cli/Manifest b/dev-ruby/rubytest-cli/Manifest
index 4537a0b20009..dbc28418c675 100644
--- a/dev-ruby/rubytest-cli/Manifest
+++ b/dev-ruby/rubytest-cli/Manifest
@@ -1,3 +1,3 @@
 DIST rubytest-cli-0.2.0.gem 12800 BLAKE2B 7f20680cf9d061c9bbddd268bac3ded3107cba5f8c4f2ff16865e4927dfdc118993079e400b229dd9f865f624ce33da982ea65fe792682d5a3b92659ae22fa88 SHA512 cd09b69e713f10c37569a20eeaa6fe8375238a17d927f5628d44218291c0f2f0e37a08bc06e51d25bff4ccf207c589b23f9cbc67221b2326baf8c14906fbbe3e
-EBUILD rubytest-cli-0.2.0.ebuild 557 BLAKE2B 40da46fff6c4b074d0ed770c309b9fee6554e87af821f2ac70efeec6e2a9ebdf09a1dd2f39af74eacd6b78130ac47b4c5531c294693d5a177b485ed8594b8620 SHA512 a9c5d9f908949afe7162aa98764914930264b15baa5e38ba440f296021b91983d7da5cdad2398af1343ff23b5b9b83fed66ca3dbbb53077f4a1d2f41a858825c
+EBUILD rubytest-cli-0.2.0.ebuild 550 BLAKE2B a3af4caf7e607bd5de2297700f3a694b6ff7d77029936e083bd484c5073116efff72f15372fbc0ac43b186821ac6b0b85c4e300a554e059c018213c01627be0c SHA512 2fd97221e6aa90353fa54f986c49905e58e53998695ddc0028bb36e8bcfca7f4d6b3c702f19f55dc88d605ea26fe0e9a588e39e5451eee1874b81712ad82236b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild b/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
index 67ac291ce4c3..7a99e10f68b1 100644
--- a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0.ebuild
+++ b/dev-ruby/rubytest-cli/rubytest-cli-0.2.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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rubytest/Manifest b/dev-ruby/rubytest/Manifest
index e6d282205e54..8a5b25519ba0 100644
--- a/dev-ruby/rubytest/Manifest
+++ b/dev-ruby/rubytest/Manifest
@@ -1,3 +1,3 @@
 DIST rubytest-0.8.1.gem 23552 BLAKE2B 1109a2e5de2336d727a3fd1ed7833a60549022d95a74a3ce0c4d94d1fc527841cd5aaef6177adebc002e7fe8c016b24be82f1c8c1dc602a7ef8f5c4653781447 SHA512 545e3c2af0c5f9bd5b109b809dc249171f4e738b7b3827f753746740ba03c360191a6b3c5f4068c97472474b543d3f1f88ef755a8dddbaf291a78e3fc073bb66
-EBUILD rubytest-0.8.1.ebuild 634 BLAKE2B b717986666d9c0a4cc162cd66369a34821bf63ea943c01ca67102bff750f6b7921a75c0a10f8ebe44d4c62f25c35dbb49b4b80184a1a119ca03154036f7e9441 SHA512 543449c724501b5e750ba281b11026efc294f5b21a62b5017baab0784b3be67574da8a16e3c3e172347007e85b5089dc5943800fb94a2631fababe6588b28d0c
+EBUILD rubytest-0.8.1.ebuild 627 BLAKE2B 755391711848de1ad0f9ada1833adca521208d041e3b9fbd36bc07df030472af904a58d1204bd3e0559624b4ddff87fa12dbd9003dae7cd8615fd1a6abd9b08f SHA512 17cdc9ce9d028103955e533300d3523dc600012ed9987bf0e8ec8a4bab802b573fba9e11780287c8ce40b13745928053de253d461e158b5c8287211f56cd5a23
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubytest/rubytest-0.8.1.ebuild b/dev-ruby/rubytest/rubytest-0.8.1.ebuild
index a4160823b581..1d11087e7215 100644
--- a/dev-ruby/rubytest/rubytest-0.8.1.ebuild
+++ b/dev-ruby/rubytest/rubytest-0.8.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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 2d34efec5af8..4de818e60ab8 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,5 +1,5 @@
 DIST sexp_processor-4.10.0.gem 54272 BLAKE2B 1e02525dc989fcdf09b502230b145b38ee2771f41b05a37ba96d177a67fb04843397cefd62affdb4fc447f43943f6c9b0b763c3e21790d96c1bad5d3e4d1f5d4 SHA512 6ab067d921b8ad9f88fd35b942f0c28c3d8d1ac17cc85e73774c97cd4cdd5f91dcfb9392ef0337a7b3ffcd8dda8892f0d71c9323d45f453819848aed52965019
 DIST sexp_processor-4.9.0.gem 40448 BLAKE2B 327298cf76d9acf3229f80965e6cd626a36b3585afc847c4f4164780d93710e089fce09f4d453baaa8e8d99fc30249c40ccd825058d971176e26cc6edc296b3a SHA512 f73b71fa436b73db3adb590f3273904474f2a8575377c0ea9184c2dbe8068b3c673f74657e949666fc04d2028efc22f81c14488a5484c66e2b6810afdbbcc531
-EBUILD sexp_processor-4.10.0.ebuild 763 BLAKE2B 123f6be87ffb4b421ed8e0b1216d5cb8dc8e59e0328f4979ae62fc8bbd584dac0fb8d5becbcc48d51e4beeeb7700b8fd83299a2364f38b921a266df7bd98a667 SHA512 a244563a1df30a315dbc8b10c80799a6b2694a6a00fb1bb6e1cd8d78916d3e14874b3ea183c421f3a7f9a9cd1e1300dcccf4490523098dd2a47803b450a57f63
+EBUILD sexp_processor-4.10.0.ebuild 763 BLAKE2B fdc4728069f684d9a25be521f97ba4df1600da9750debb5ac60fa8893630fc5c70565fbe5ca26cf92afbc9db4eebed5f5e75205dade1732596b227bbc63e293a SHA512 a4a9209549ab236eed76c190ebcf628bbeea28e72aa9f6cff493bae1b20c5193b347290e8b7b681ccc051ee416811ed8b9b64082a39f8b06347f08026d7bb05b
 EBUILD sexp_processor-4.9.0.ebuild 759 BLAKE2B 68b9dc146966ec712f2586937756eac3564055c51f421712f290778bad5aa8f7b3fb08350e1fdbf95f72f412a5c94ca4a7a750c6b4323a9a44da80acdb243e16 SHA512 ff5ea8d9b8e4420c4536f9c33af2e3517b773e94a625f82d8f0734e99d4f82467d0ad565a17a9d5d834a8d021674b83aa12e57c07d557c45090db88381a69992
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild
index 766085908d56..46407e494eeb 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.10.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.10.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 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 600824157ded..3ad5f3cf3f80 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/goosh/Manifest b/dev-scheme/goosh/Manifest
index 822aec024d40..a56be4f1f2a1 100644
--- a/dev-scheme/goosh/Manifest
+++ b/dev-scheme/goosh/Manifest
@@ -1,3 +1,3 @@
 DIST goosh-1.3.tar.gz 43503 BLAKE2B 7bc3c907638320889ef2c871acd2e4e9fbd0fdb8e1a3655cb42cc92eea9fe28f01533ecff8e3efa4488dd5f0d2c9cdc6aa5ba7e333a9acb1d430633479c6cc80 SHA512 55fc3b83b5e711453886d6fd47e7e16df329ac7f294c704e3676f7266383fda6ad5e53c3f8a707a7746dd0ccd33647cc5137a73f516396079702df47919ede81
-EBUILD goosh-1.3.ebuild 435 BLAKE2B 7d11c4cf3be5bc08e6386a4d65b8812fc952695f518a2a2fef5122d70f10ef59203b42f2528524151457fa576f41a1051e64da041ae8e6837f53920833b06866 SHA512 154a67da350d64512cd37188b40ef883e601c9bf082e40d42331013ef79722b5ba91628a5e2c3c6fbb78687a6646fbd18efd0a64537f008511852cdd157824cb
+EBUILD goosh-1.3-r1.ebuild 373 BLAKE2B 0b5b4386796a7594fd2f19166c9c3f668b17ca541d6b305b618208193a98978dac712d8be0275bc1a07b8be62f7b4e5e5619d5a657eeca29abe47b314e4ef5a2 SHA512 be7852be260530b74dcf29565b79c1bc434d590d028b08153bb42767d7a9c2d3312d3b582d8a24817b24604327ef12616ac0bb58db2db5589a75e67ef9ab2edf
 MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/goosh/goosh-1.3-r1.ebuild b/dev-scheme/goosh/goosh-1.3-r1.ebuild
new file mode 100644
index 000000000000..fe51640be163
--- /dev/null
+++ b/dev-scheme/goosh/goosh-1.3-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Small process-control library for Guile"
+HOMEPAGE="http://arglist.com/guile/"
+SRC_URI="http://arglist.com/guile/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-1.6"
+DEPEND="${RDEPEND}"
diff --git a/dev-scheme/goosh/goosh-1.3.ebuild b/dev-scheme/goosh/goosh-1.3.ebuild
deleted file mode 100644
index edc4f3d31070..000000000000
--- a/dev-scheme/goosh/goosh-1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Small process-control library for Guile"
-HOMEPAGE="http://arglist.com/guile/"
-SRC_URI="http://arglist.com/guile/${P}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-RDEPEND=">=dev-scheme/guile-1.6"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 1ad51de88b56..395b1bfecdd0 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -18,6 +18,6 @@ DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
 EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
-EBUILD guile-2.0.14-r3.ebuild 2253 BLAKE2B bb09bb270b0aed7b22426263a4f9577259db3f85789013a6a79d706327f393c7a201a0beefc9fd646441850ceee7612e61a2062f6bb5eed72dbeacf278fcf572 SHA512 d8b7b3397c349253be5aa8e73157ee690d6f541c482a9092baf4138d6965e40e2d85565ad6aacabc3453d0df591f52533740c3827cf92dd2c54cdef702f9adc5
+EBUILD guile-2.0.14-r3.ebuild 2250 BLAKE2B 1c2bc03d5410128bbd1789e202f0cdf855560b4336bd2ed70a6632ac324f61ac4864a055558cf67b5cf509f04687bc488b9696f4e3404d4f60795aacfbf99875 SHA512 6394b472d48049d715951fda1055519cddef1b906cf4c73f362f3abb56b045ab275e0377ac73f8fe6de1d1483a07a382e2eb60d8af5bdd4dfde6985736f1b4b2
 EBUILD guile-2.2.3.ebuild 2054 BLAKE2B cd3af6f083dbd96eb50db8e65e1c6041bc18643207ef35fdbbd05f3ae9541672138f55c0c4001d9c4bf6567035c9c55dcaf8d2915adcb498c8c7d4aaf98dc30f SHA512 d3f1f1e2165e7c2faddd35e1b1e6e8bae693714c1f47cee9db0fc1bc726d56baab4612401e2f20784c7fea9043b252b0289463e3f754d920cc08266e797ab9f5
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index bb2df897f348..88ca6dadfb77 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
 HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-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"
+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"
 LICENSE="LGPL-3+"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 # emacs useflag removal not working
diff --git a/dev-scheme/net-http/Manifest b/dev-scheme/net-http/Manifest
index 4e596a403577..596d30c617a9 100644
--- a/dev-scheme/net-http/Manifest
+++ b/dev-scheme/net-http/Manifest
@@ -1,4 +1,3 @@
 DIST net-http-0.3.1.tar.gz 26907 BLAKE2B 405f6609700e451b299953747d1dfc125b7f8f4a578ff637f7df8962145d3264d248b15c80bc411d82a943f5e5506b2b942be638ae203f1727cfd40d632e8aa0 SHA512 a85d45c2dca6572b8b66a98dfb6719acba4d5ed61bce88de56ea8a84dc41ff0068e7d5b6c864b32b41c608521b153a8fc785635740d65aa4c1bd6d28daaefc3a
-EBUILD net-http-0.3.1-r1.ebuild 714 BLAKE2B f89252bb552ac143725694bbec66593f835bc9ef85c23dc3251fd08890f93a6bf50051113d88fe40404b36fa420a79960b93b91216a2f8a3f311f16a29d80750 SHA512 8ddf616e18fd84b4226646d49f8676b4428def624b76198503661e8f3372eadabba78c7aa87637cadef5bde4fde2bca0fed77c4706ed489cf94efde4c441dcc9
-EBUILD net-http-0.3.1.ebuild 617 BLAKE2B 0c19becbb70768d3b1b7b6ae86c2fa65c78b98be2e26497c2df057d395105847ad9bce8a88493771eeb6a90ce5f1a05bafddab66425ff04eb8c4f99b2fd2bd4f SHA512 e59febee0fcf05335c30e3b22643531ae620a9c5a20c80b5199667fa595053ac74ec93bec8015347ba30b5ac09ba990452a40af922638076d496ee028972155c
+EBUILD net-http-0.3.1-r1.ebuild 713 BLAKE2B 795a4a8557294768697ba67a79a86163178324ba4ce32a5a410028026d808fc819c3896391ef8696a2cfb385f251a6101eaa4d76c9f018d7ee72b1ccefbdd2a8 SHA512 03c3877249bd87cbb103b2971ff3bd158ccf00ded86b8edafc407a3d1053b919bd742c0cf00bf74c3c6a14d25c96877e6c7197dadc2e1e6d0c0f9704ddcbab5b
 MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/net-http/net-http-0.3.1-r1.ebuild b/dev-scheme/net-http/net-http-0.3.1-r1.ebuild
index 44224e7189dd..c279c4a62a7f 100644
--- a/dev-scheme/net-http/net-http-0.3.1-r1.ebuild
+++ b/dev-scheme/net-http/net-http-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="http://evan.prodromou.name/software/net-http/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-scheme/guile"
diff --git a/dev-scheme/net-http/net-http-0.3.1.ebuild b/dev-scheme/net-http/net-http-0.3.1.ebuild
deleted file mode 100644
index ede4863a9d4b..000000000000
--- a/dev-scheme/net-http/net-http-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Library for doing HTTP client-side programming in Guile"
-HOMEPAGE="http://evan.prodromou.name/software/net-http/"
-SRC_URI="http://evan.prodromou.name/software/net-http/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND="dev-scheme/guile"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	# Scheme doesn't compile
-	true
-}
-
-src_install() {
-	local GUILE_DIR="/usr/share/guile/site"
-	dodir ${GUILE_DIR}
-	cp -R "${S}"/net "${D}"${GUILE_DIR}
-	dodoc "${S}"/README
-}
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index b6f3cc96b0b0..86b1bcc309d4 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 9eeafd75fe8b..6f1d3924eec1 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -333,5 +333,5 @@ EBUILD texlive-basic-2013.ebuild 1702 BLAKE2B 71fdfd7880bfa73365ca8bbd97e42492ca
 EBUILD texlive-basic-2014.ebuild 1670 BLAKE2B 8630493349ae85ea661b44e9e211bd12558dd72e1f630de4227dd5bfab590c2e812976970f226df2d5581a56faa7d59c57193752faac9ceae288bbca4af34b5d SHA512 b4887c336269bf826c81466759351057a19ed0047f82ae8b06c9eed1d483c500bd99a0b962bf62fda778d44758ff1f9c8e9fae6771d66b883f5704107a4ca061
 EBUILD texlive-basic-2015.ebuild 1722 BLAKE2B 08620f418a40d45fc413361520df51f35fec6d2eb80d74fbf01acd9678e9948881e7a2c4d5d878f6a29ffe0104ef7f82cf00dee0bf28fac25f29f0c18a50ecaa SHA512 d42b475db6259196281a09eb2e4ab9d058aa49ca1639131e5371388812a0cc839a9ec79cae2ea21b02d08f7097b2a7997925ca56704a6cb5654cec10cf153a09
 EBUILD texlive-basic-2016.ebuild 3224 BLAKE2B 3bceb6a883a0e125c48c49e6471729650fe8dc1c22fdc32cba5a7583a7b2f29796b0881f38484143a8d98afd602e72183763c8edfbf657f68b253532eb56e8e1 SHA512 da7416cbd7f4efd0efbff5315a9e5c91d11ee4d42a817d674b58c320a5c1dfd141700365ff9ef604fd379d302d2eec084e51d76c1eeca599cf6ca31e98c4788c
-EBUILD texlive-basic-2017-r1.ebuild 3226 BLAKE2B 5ca0e4c2c9c4c8b11580776253ee7464b1fcf25ffa3b6b60bf06fa8693039864760fd0de96e49569f654db471b124f68e1c479a09a2692018dacf381db1017ab SHA512 3a714baea203d47d5770ff72576852ca79fa4d385c45e1e4218478bb6f4505408b4af9451b03db98eda1de20765a508327670b08d438e984aab29be8b2d8b328
+EBUILD texlive-basic-2017-r1.ebuild 3225 BLAKE2B 130affda7b5ed74dc0477f21f2b293cc499fe2be9ad69e4f937d9b562a6ba70c86cccca64dad8a08bf97d2f86afd85e8e0da918a8bd98309669f5139a1a496de SHA512 182264ab8c4a69218e6e08c5ebdc0ad4ea6bce07327f5954f98dd2812b5efe600ca8e88fc53380d54878fa3fd927a241c1befe46d25748da6b65fb16aef24ead
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
index d018340c44b3..ce9152f9914e 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2017-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND="!<dev-texlive/texlive-latex-2009
 !<dev-texlive/texlive-latexrecommended-2009
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index f1f82929ce15..a7d72cf7a9d9 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -742,5 +742,5 @@ DIST texlive-module-xcite.source-2016.tar.xz 3112 BLAKE2B 7daffdcd5a43e961c42618
 DIST texlive-module-xcite.source-2017.tar.xz 3108 BLAKE2B 805e383e43bb27febc97f160cd4ae34149fa33c55e16db672fcc30877a37e9b5ada8fa2d94a5e87b6d8607bb503cf9c7d4c1ffb357699f772079504f85d6be20 SHA512 f99d309c7939d864be018f8b33833534d15981a84307aa77249ce3ee259c4649d509ab1322be6318a4cbae85b753b37b594694b39beb628f6cbafbd6f688a151
 EBUILD texlive-bibtexextra-2015.ebuild 4240 BLAKE2B 92244bad9860483ab5145e3f40cdb3b4818b5af573a4096c236846f9a59a5a0691448ced86ff9ac9edb82b9be99f8e45b3a0626d0f9a44966b3ad904c6f20932 SHA512 884a45704da1da1485ad6de484e85fccf8e39897ae0ee58c3734a52f3c95f713efe1a18ef337256b261f481b3f168c93b1a4d968d63f82fc813e4c55d4661aba
 EBUILD texlive-bibtexextra-2016.ebuild 4903 BLAKE2B 3398edfbf07efb51fbe639aa681cb31cad95545bb58fc7acbb673c566b022f598005e5e36612a146cac6403c1cf3bf016bc737352c54d1b9bebe8d3d24b97ccc SHA512 2830a1975cbd7c64243bcb789792bf52bafa64b14b580626d803b8c13265f90315a7c304adad4d3a5448d3ad9839712b792ede2dc4f1131d10ba2cca8933d328
-EBUILD texlive-bibtexextra-2017.ebuild 5187 BLAKE2B 34051f403d3342fb8ba4e15100a4d44afe08e9116ee6995e5c1ce3e48ad0721415aaf829829a72f3cbc6ef06ccf32481ccb17c45a0cab73ca13bf60ee9f94d55 SHA512 52652f5f365b6e24693e2c857eb7a6fcff00e2ab1e71ca06c1f99e00e9e822ec723e4dfa129269adcca0e59fd84354329ffec7ac2bc55b09c03d41efa872d738
+EBUILD texlive-bibtexextra-2017.ebuild 5186 BLAKE2B 333b2c78a9ea976e6cd6d596afdcf9c5aee64cc614fa8f1d5eff24524956b3c62fe2cc320a344d383fe04058f8f222b45a8bef68311612d4cc6e8fb6bfdd8720 SHA512 19b4cfc23edf80258ba88b5c16d2b85d4e7fbe2352b34e90173c06382b98ecfae5fe397d8a1819857de0bb72e1e48461c0e8563ae7f5618ff9d00a4bfa2e0aab
 MISC metadata.xml 495 BLAKE2B eaf4c29c2686caa7d176ca20cb28e092a895c5d1ba17b2023f5f59b7a01383e106582ad1ecd5c2f0fc3d8912a53311db98791b8799a4e52b4eab01c4cda2b003 SHA512 1209d61abc60dcffd50bd8e460b9f6130afd00da9d350d4a53a287ddda6a78140129c7ff036aeca4f008f33d9eedfb0eb3d7fd839196eb14cd4ee46da92d2429
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
index 67a98ec88384..3cd3377caeaa 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index e2fca110d967..802fb4ac30f5 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -209,5 +209,5 @@ DIST texlive-module-jmn-2016.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b7
 DIST texlive-module-jmn-2017.tar.xz 40024 BLAKE2B 5b4999cbaa4583e37af40b40ee82b71e8483ea5689a72c63f1cbcd4962ccd5eb737ebb77b665b56843827809d644bda24574ea1c2de1fa6d52ee159d890afb0b SHA512 cdf252d2e61f53444be69c4b6c9ab1cdafd865365f1d59f0c7d428825858153f213a86a5871e93bb3bb261ac4afa9c5391b2adb21f1c59d81bc6592711aeef38
 EBUILD texlive-context-2015.ebuild 3331 BLAKE2B 0f01efd1cdd744c56214a322de4462f1c0ef03fbf1e73052b1ed5f4e529835257fcfd0bd72f87c641419458a251c3a2a61e70a5a1ead441e8ced52ae48a15787 SHA512 a0e41acd624e8f0c2b2cf0c57a7d171642b6f34c96697c6fba89526f46b6335c43084fb0ffa85f5ed4975f74eeb3a3b55dbb5081eee2fe90ec6ec0117c01853a
 EBUILD texlive-context-2016.ebuild 3390 BLAKE2B 6763b062145c1ff60d8064a199c9b007da5a3348e3d69fd433f2ec462c66e06b381eae77379a4cb9a90b766358a338d6f6b5a7944f2ca39449dbad3a8176ac24 SHA512 29bd33b405090ec461ca6ecb76ad38130838bdc8a3e82529f7de67eda88cd23b0960f84039e54d3db520ffde08616b9fd9262c87b7681adeb289e620fe211369
-EBUILD texlive-context-2017.ebuild 3402 BLAKE2B f13ba021c47a86d65aa1ff7604776784bef251d360bdf1bfa428b1b75b7d0bdb1107e7b643fcf3af954e65d1f8f27435be1e235f61e68eb47ccf412899d8d6a8 SHA512 d72ca0c88deec225f7e551db518028aa1fea90191e67f9bb1f558d99e3f2813175396c51c89e6c8df241000824e7520aa199dd13405383f415632f84b5d4cc2b
+EBUILD texlive-context-2017.ebuild 3401 BLAKE2B 641916d3a75011b6fbf75ffd99e1721d56ace318b19c47251a6485bb64d6633af988fbff11c9c2a7f253dc0b6cdb9665f51aca873d7c3ec2b9045973bb3c5458 SHA512 a29c483f6a113e9ada50df4c058ed1c4f8980fad809ad354a2b39053e90a5e38171c9463535c9efd12270545619d70d7de9ef54d32c0aa17eec3e6e4c97d70d9
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2017.ebuild b/dev-texlive/texlive-context/texlive-context-2017.ebuild
index 71890cca0b3f..5fd733928b65 100644
--- a/dev-texlive/texlive-context/texlive-context-2017.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index cb1241efcfe2..bdbe190d3257 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -1664,5 +1664,5 @@ DIST texlive-module-zlmtt.doc-2016.tar.xz 53496 BLAKE2B 21c8fb0408a61ac64efb5437
 DIST texlive-module-zlmtt.doc-2017.tar.xz 53516 BLAKE2B 58c88b219e36bb4ee1379468b2995713c729edde8f36f18c1f6209b74cf8122997caf27f24d3bc8072ee0ece2ada0542e37816bb56c2de20d658739f0c4ff246 SHA512 834220fc28cda484b15cca0b896124a98f3664686582490c19582644524cdedd111e0ec500cdb4fbd45dd0a4c3ec9d647ee4a5a4de699f6b6ed16a67e7221312
 EBUILD texlive-fontsextra-2015.ebuild 6636 BLAKE2B 3989b0191b27a60d3d21e1f63eae24691491380d8db26e5df29ead531b89b8010dce36a97f58191a67d32ebb8c0c205fc37ab5889b213aac032c707702e54743 SHA512 55f849a5f5404b150a5ab657ee4a8f8fb3a83187b9fc19e7cb8d73897777549be70b556ab105ed35b41802907cbed8ccb52d5bcfaa736b9ded8de96c33ad799c
 EBUILD texlive-fontsextra-2016.ebuild 7447 BLAKE2B b28ea9f6ac33e106121cc6ea9810a269e1a88774cdf3de93accde179373f6a28ee4e0363facf55dd851c3382d61e2022dca9e48debd0c157f4a82325cccce27c SHA512 cf782c23daf034de2537aa5262708b7f8e46e9fc58bcfe30a485e7665273211f6db3cad7c67b57f3bb840dae3c14845256d22ecf019dce5b83a4a7e9f0ab032c
-EBUILD texlive-fontsextra-2017.ebuild 7508 BLAKE2B 64cc519f56d78cdf66315512d74b40095cc37948fdddb3745f319e5afaad910975d9397111b533f90bc6e49aba8f2bf94dd957a7948578e0b3c72ca2cfad0b07 SHA512 0979be7d1d68faef7e88d8c7eebf6ba934e604a5c2cb5d117aa2028087b30d176b1c85718fbe9c52423dc85c8c5ff34588e5fe58297727732c9b655523306367
+EBUILD texlive-fontsextra-2017.ebuild 7507 BLAKE2B 80efef84f089cb77fb11b6f188161064ee0f900c5427800fc307df0a87f9c0ad07e431b401eeca1cd94e3af5380765c343d3241f9bb5f442a9dd85d61adcf84e SHA512 d2ebe12249628e65cd8a518cb94b496d9d4278255b7c77d2efa5c0fb5a0e9dca1cf4b059ede14d0b0c61567bae6e66cc7cb53c42e05457c30f665656b3757133
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
index 223d72da49ca..244537a4a0e0 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-langpolish-2007*
diff --git a/dev-texlive/texlive-fontsrecommended/Manifest b/dev-texlive/texlive-fontsrecommended/Manifest
index 24186016ae2d..caf8067c317b 100644
--- a/dev-texlive/texlive-fontsrecommended/Manifest
+++ b/dev-texlive/texlive-fontsrecommended/Manifest
@@ -191,5 +191,5 @@ DIST texlive-module-zapfding-2016.tar.xz 46960 BLAKE2B 47d0c14c5d540178ee2639a2b
 DIST texlive-module-zapfding-2017.tar.xz 46916 BLAKE2B d9aa25802f203bd2b08dc503c8e163dc0a404dd0629aa5a7a1e28543c85f3b59695d480789eb0b11408490aa72d8e8716ab9fed413641cfdd4106ec7878f99bf SHA512 d7efd293f6e0616d1a633615f9bb79970c829fb99a7d5c1b6c217058ee74f29492fbc303a35951140a135d7742b58609c693df4eeb1ecdc5f63cd9fcdb177d11
 EBUILD texlive-fontsrecommended-2015.ebuild 1390 BLAKE2B 0611474b755f436a3a346da7bb4a06c789e873405713d749599d77a76c875b7aadb2331ce0d19bbe96ebc7e71f0a5e380074b2c7de54d860717b799bb18be97e SHA512 83303017badad9096a7f724c58dec81169d63ced6ac8eafcb36f66b7147b146e51679fea0b6271758558fb76ebc375557bd4e3a5ae05d361c9fdd30f0244c6c4
 EBUILD texlive-fontsrecommended-2016.ebuild 1429 BLAKE2B d1e173c6a3444ba682cccf349829218469bf161f0181da39c19fad0f854f6fb629e7e9e626ad21e3949533ce8ab92ff621fe6220ad1f09fadd236a034087caa3 SHA512 e09f522f15d8b033a149e0bd07dadefb9fa7194a1cff1bf38ecf6fd6bb2fafb64397fe2d1f8a78de61e3799b1bbc211210d910e8a9eac233e008122c27db082d
-EBUILD texlive-fontsrecommended-2017.ebuild 1398 BLAKE2B 1901e6cad79e947198c358166abffad259004aa9ad9d6a623d99a4a339a70fd63db8a93f7053fcf4dbce14915bfd6d9d3b99ff7464efb3ebe1b2270745ad8544 SHA512 1177f5f2614d3cff3f2e0714c57b3321556c661cad298f6e4b117e072ae6a3c303061280f242a5802ed3bf13c4100606d7bfce242c1fb82419da825854f34ffa
+EBUILD texlive-fontsrecommended-2017.ebuild 1397 BLAKE2B 7d5ab62f25ddb1477b0ae46eb260beed22c7d4870705f841a1b910eeb7b22c103201f3fd636de5015db0e1d0873a18d6349a41f46374c142bff67a7e73651dd3 SHA512 e7829a6340d119587e5e6788348b439d03da84033094d123f6f618a6871c82da946b7cb640405ded10f77cac7114aa17d6b9b94d6d2c453c1a2921aad06f8f75
 MISC metadata.xml 569 BLAKE2B ae2ca0d4582cf74769c8537a954af064ea8e615318b8aa1d23f8ada27e6c8c41dc177654bf60ad9ee99fd29e14472ee79d8859de134bf50100aa384a10a69dba SHA512 0753e724c31d9af811afffb43e2317076a8f83211d5a45eee3f5002d8bcc5e424af95b5582d6b556cd2f42133984f5e0979a399d812f3844def897643344b101
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
index 3f1004e1a1c0..09b73825018f 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=dev-texlive/texlive-basic-2007*
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index 99656877bf3b..ad1c7935514c 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -96,5 +96,5 @@ DIST texlive-module-t1utils.doc-2016.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d34
 DIST texlive-module-t1utils.doc-2017.tar.xz 95856 BLAKE2B 7eb77e6f98b472001b4d3484840b30002ab079cff6066759e38a6635abff28b490ca6bf4d80f483a6237e195b20e4f00144a184c839ce92c0a070343cbf8c74c SHA512 59f3c52154ad0e443f35b5ed90cdecc201295ccad18dc919e8b41e9c5ac636502332e50a00febc0716702606eb98f2b8ae9438f3f881cb93fb81b91c5150451b
 EBUILD texlive-fontutils-2015.ebuild 1623 BLAKE2B ba8173335c3e0cccfc7e16b7cf15c89a053f70918a184c47a44ba1e98bbed4337891dc087baf19087206e2416c270a1cfbf9bb7d6f2d97aa4b25ab545a2426a0 SHA512 1bf8ed4c31a3e75a208d4fbcf71c5eded16b8c3ae0ad0b60766b92fbc7141533670984728419f26423740e357b98b25d685b30bf5228efa0ac9ecab8f3f9b5fd
 EBUILD texlive-fontutils-2016.ebuild 1641 BLAKE2B 99ecfc5d05050363cd18b273307b7dd79116c58417329751d587e461bb5e2398bc84991f4c08317a2350c26901dc6957af1eca345d71f4ef986534416e3f84b0 SHA512 a7e3f93f0a9cda43669fd347051f4350c6c513bddf1754854b894e8ec71115a23d6f3f2aadb053b4a5d46c8091d30454c3a90738cdd40bce26b9257b414586d5
-EBUILD texlive-fontutils-2017.ebuild 1648 BLAKE2B 5728442e625770b1c88d681921cdf29f4b81d47e863310cec5802e1734c91cba40559414eaf2430f149d295ed6343626a8a12403904d03d2916ca1988dbcfbbb SHA512 1bebe65a35e2b9939cffef56f628c28308a7584084c3eb4fd83ccda1a4c5463f59c92bfa6e10027ecaf44e78a2571175405687545e2eb942d87234564d1326aa
+EBUILD texlive-fontutils-2017.ebuild 1647 BLAKE2B 9eab3f33664a631515d59bc2bb5b642890e7beb9dd07b3a9ecae1d89f82bef13b5b52852aa11ab1f41f9da167901409b6e967122dbad67ec2512fb8f95f1a49d SHA512 8041160dc99be841767ea32f4a69679509013298c7b2266993726f8450a49e9bfa0738817273129bac18d75d0f5126e99c6b88e9ba452d5e0d135613654d8aba
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
index 8fcb2810e2d8..206b646449fe 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-psutils
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index a5af2f176030..ede6c8b92584 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -73,5 +73,5 @@ DIST texlive-module-texsis.doc-2017.tar.xz 130016 BLAKE2B c64cf692a8582dcea4ddcf
 DIST texlive-module-xmltexconfig-2017.tar.xz 460 BLAKE2B 48985abdf4e6211a630fc928184d1bf4a93b1400c4fd7b9964e64ee9245e1e9357bff437351bf96abf0c20b8c835def9549f4af47eac50d53dc0d46e300a1957 SHA512 20d6c529e0772be2c31b1f47d353f19981c0c0c1790a7e025290f2715b747fdd189f6cb51f6cb9faaa990461e9a30d829854cdfedefb1b20cd1d362e13323c8b
 EBUILD texlive-formatsextra-2015.ebuild 855 BLAKE2B 4caeb81ac40eff97ac794179c4ab1133b4bc7da411bd0f27ac61cf91769938852ff6e4540f2aafc960f2331e99f1b2dcb1717f59418c84df19a4cd8b3c92a43e SHA512 6609dab2676c3f2d6ad28a96bfeecb8a97a40ac45678eefebe46163589ba8c5c3b7349df45a28bae4080fd67932fffe3273285317e345a7d825eda4bb39d49f7
 EBUILD texlive-formatsextra-2016.ebuild 866 BLAKE2B 52fbfe70db78a94d37f3438aa5e6090cd6f92145ae1881972736b0e2e0e3167bc2c4be23cef35eb832bd173884cebd6c6eb575574a256cc0690b09ef42e359d9 SHA512 307a695dfc9c40a722b2f7bda478c888d0f4777c85c0531c5c34b102c3203f8f65f1cdc44d8a258139599370091129664c194b5d7961c6b07a3b49409b7b5bc1
-EBUILD texlive-formatsextra-2017.ebuild 1219 BLAKE2B 07731bde3ded2a6cee9608ab570b75c97cd94fa7a80c1d147b852c8e6c13d041068d159a45f8c7cd5b602d488433ece119d19bde3e46aad93a636dd428f916f8 SHA512 806c43459813286b1bed4bceb4d0a9bd8bac19ff10ac765890640abdcd1da20e1bbfc133767090338bb0ac23ae1085209f93874342080a01e5d19477e8616b9a
+EBUILD texlive-formatsextra-2017.ebuild 1218 BLAKE2B b404a31169956bd7f476dd9058f8b95f5355cdf5be7757865d11409de53fa85b0920fdfa356de543ff3022e9b3307501f7b21f5bae18e5b714f01934a07415a9 SHA512 3264fe0863873809a3b4f35e579d91fc2350c4e8b72cb18c864a3612cacc0981b2e9088545d03bd762ab37a67e7de6e6d0c9b8d726282966878f8ef7e8b2ec78
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
index 4914702f17f8..022213fc1d0c 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index 301e992d0d64..2dfe44b23ee5 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -228,5 +228,5 @@ DIST texlive-module-xskak.source-2016.tar.xz 14252 BLAKE2B fe640843de6ee3a74bde1
 DIST texlive-module-xskak.source-2017.tar.xz 14244 BLAKE2B ef03e62fd8031626ba3678f8812b13eaa416252ac287233bd696679d31abd661b5a2ed88b8b4624fac0ba9b7ccabee9cb9e32c38dd7c7bd1f1e4f2787cb04169 SHA512 91f482e0ac3d798507583729fde18a1a014c6f5e71507fb10f4c893613661488953529f78496bac476a6dab9d3d896d0b6eb902eb166b77b78c90148afad0375
 EBUILD texlive-games-2015.ebuild 1641 BLAKE2B c6df36330b7f4c8197a61399b75a2e44c55b69f63863ef4ee9f77ecf3713d002b25a18cff01ac2f41bb40bae0c581828ffc184575605e0a24baf073dde9fa7e2 SHA512 a2f2c66788974f68e16d0e6886a491628811c5e27598ec3ca1c7859079fe93190ec883f47fac696b4e228a7753b0e4480b76aff5ae0c1c011b4904a69e746b99
 EBUILD texlive-games-2016.ebuild 1679 BLAKE2B de35db32c8b09cfa753c54a8486487dcd3a58a5b738033ff96e4fe062c6762978ab06d0d90b4d4a2761da3f4fd248e1b3cb6c9428de503602aa0a57190b3481a SHA512 40edce778f8ac4e22b05258667c42be1fd6422b99f4334b1e3beefbf62dd5bf0d8f683f44a0dabbb5f4a3d0c67d0010a0c3af5558f0c76d8b0a5a3cbd451d1d5
-EBUILD texlive-games-2017.ebuild 1692 BLAKE2B d9034e7c7091c75820475dc9303e9b95fd5e12ca2b5160faa09fb0957294ebf5e1e4ad3ab48149853d68bbebd375eb2016541f8951d251fcc4dcce70f06409e4 SHA512 5b62cf785da06a7ff7172708d46930e882595bbc27e4cec3b38d4e8885e3f2a830897b23303ad30e2f7cc40db25bf0d6b349ed4cc4835c287080723d858f2828
+EBUILD texlive-games-2017.ebuild 1691 BLAKE2B f4cb2edf028c54150566bf478c0adb23620fe283e8e4e64859b2c7dcdc189ba6f60f0f76941a1ed6c278b51fbf7a8931f17de64d5fc8a9c278c0369c6d3b28d1 SHA512 6f51de7f35de90331fef73e868a1baee45df20636aec24f38b742fc93d056817f9f7dbbe4be8a0616d3d787b76d1e19dacc7be3e0910d02bb910c889c713a692
 MISC metadata.xml 465 BLAKE2B 3de0cdbc6aa2d82d9014a125adea187b4c28e22ce8da0eae7b50d4a7507beb618869f282d8a5a7258edacb43e26038f9704da1d61a86ccf86baabfeccc3f3d99 SHA512 026164fc27101f4b41d1a2b5a979762d3f75f1b0f13d74b7d3aa617ebe24d92708c3f68c7d4d12887c821b3f799cc0528f38f0a20507f5ceb1e427f300d094c2
diff --git a/dev-texlive/texlive-games/texlive-games-2017.ebuild b/dev-texlive/texlive-games/texlive-games-2017.ebuild
index b104339c1da2..45e54cc5a61a 100644
--- a/dev-texlive/texlive-games/texlive-games-2017.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index e3f24adbffcb..7f32390a9505 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -375,5 +375,5 @@ DIST texlive-module-xyling.doc-2016.tar.xz 148336 BLAKE2B c5713dfb4cfcbb53358573
 DIST texlive-module-xyling.doc-2017.tar.xz 148336 BLAKE2B c5713dfb4cfcbb533585738d9f84ebf906f3b86b207cf846261ad89e279ededaf9ecd418a8f2af882ad26a1af11a5a9264f4b497a4c2096262e78e0c666ffa51 SHA512 66da3f3cd34f67c078102731dbbe218fb000e96727a244c70cab046836e85af89fbb3987ec2696bac85885ed277a6e33ac955214924265be639ff228382a8ee9
 EBUILD texlive-humanities-2015.ebuild 1984 BLAKE2B 678d593214418f3e09d8edcc52525594de0d621ac11369535f724bb380213456fe9cc76a4d925fcb92893943c5d81e0da2a117949b3d4085498d202f1c4eaeaf SHA512 90194819949102591cb8f378da050701ed766865e1cb167fa724d38822b07c45141d20bbc4fc90ef8a5fc6683229c30397c6ddcae1ccb691ca10f24ae9a412bd
 EBUILD texlive-humanities-2016.ebuild 2168 BLAKE2B 1b08839cccc0590ee88549bf1fc5ff14450a86996ee6483e85227e62bac219880bf0b9067f65365112873adbad1be55043d0bdd47fd039a5794c3dcb3771c850 SHA512 33cfe4d2f7ea9d94a198a69b2cf23b77d90da98b03309f1727d86dd25be315c90062235529b2fabae3e48dcdd142a6817d23effd050c2a00af3b0924f4b33ce0
-EBUILD texlive-humanities-2017.ebuild 2181 BLAKE2B f70848db1dcf757e3b055e3491655a69e485c1985ce324a472d9fd7de29ff25fc483c3b55f84dabd3bce442da4a24243f81fa6357c56018fae27ac42962bee3d SHA512 a5e5cc0e53b9172237561f62a4326befd982f1bca6b05ed01437e7ccfe783448eab7e2f04931af72e4f9e8d6910aea35389bfebcd842bad937e1c3a205362aea
+EBUILD texlive-humanities-2017.ebuild 2180 BLAKE2B 952b3bf700d30b3970b2c1b7472f028dd40d5ea55efdf57795c0b946816379df22a3bf2a02b76f6baeacdb8cec93517255daa3fd1bf5dc4194144b17a45f9c76 SHA512 8af62ace9f190caa52bdb883beb263d6c1420a7e8671f7bf1c257a16c1b4471e1586acf8b0899a913cfb679d3e3327a6fbdd3bba24e94f4ec51c0a1d62fb2931
 MISC metadata.xml 475 BLAKE2B 2142cba5684575516bfc39a7ce98a7f5a496cb309e7d21d6f90f13d5d9999291e29cc3d85f4b4242acacedcee02f0d224e27d6ace55e69c7a0e0fae38360b278 SHA512 32785127247aaffa27bc13a63d6d39b50084b437895ae3eab812e9a047efbda0e59ff3bb8281654148f6c3d4fccbd2223c984b92b7a38825efdb19083296567c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
index 7839e5c38534..13e50dc6fe1e 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/lineno
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index 86e96d05ca12..37cb618120f3 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -102,5 +102,5 @@ DIST texlive-module-xepersian.source-2016.tar.xz 71732 BLAKE2B ae89d5f706af05451
 DIST texlive-module-xepersian.source-2017.tar.xz 70908 BLAKE2B f2e1a6422ff0faa994c0b38a391786cac7b4c416dfd66c3586a15e61de62cc84f3165f93871a1cc4c61485b2870d1d76fd9058c344b168e079ab121ea19a274a SHA512 be7fb30ad51937d2c500ddc48bff37bd8b8d109b08c7118f913e6ed145d8c7a1fd327b0f1af98b039f0587c455d1d70bc9d27f3527ae8b2709e87fab3008e3f3
 EBUILD texlive-langarabic-2015.ebuild 1061 BLAKE2B 7420181b852bc970b4f0b1da994063bd3680b34b70568114227a71e7911f094487517947b546f0618597839f2639c1b00e8b9659934defdcea030ce02a2baafc SHA512 3866788553d62879b1c639ea0ec2ec2692bb208dbaade1b64e184501f1ac1b2c545ea334e40e5533c29609a3a866201efc9d1db119e7b88bbc989ed3563ee7d8
 EBUILD texlive-langarabic-2016.ebuild 1204 BLAKE2B 5c7bd475b696ef312b9dc3dc35acdc5bd07efc4191de4c90d42c0a55f24ba36573d99bb94ce03b5e5519f8b98ded1505dada515b2519ab2802c5d49c0ce08cf4 SHA512 827155b4be0245106d23b678404d6a179905fd90b3c95aa1af3752e8018c20e03709d4ae500906d949915d678523c21a7140e1c588f640919d8547c0815ea02d
-EBUILD texlive-langarabic-2017.ebuild 1234 BLAKE2B e02f4355503471a157c8de35a44f74479efe8415bb169ee9d63aacb2b30c1900fdc90da1a72f2368b330292b7e2816654c81e3c3b664579bb8b1f6c83670d6c4 SHA512 9e190711070a2eb43d168e2b122694d0b76a17252b501393dd38db1dfc444057070855ced093bdc0d2c5c98a78b721b5620e1dcb9adf26ab7c35be33344d9f9e
+EBUILD texlive-langarabic-2017.ebuild 1233 BLAKE2B cba285698463ad781441eba5ba63ff875af09fbc1d6ebce44afebb118043108aeed4787ff08f162463230201b17b40eec81950de2eea778717aad22814579cec SHA512 a8da008306167e1ab6cd02ec597309be850a0e70479b7d48d26cb3058e285682ed3c0c4f25690ffe8f067ff8e5bdbd6b87808ea38a18ab9ad841a6fba8316a91
 MISC metadata.xml 442 BLAKE2B 736ea2f06e692dd1cb0b4438d8387f401012d78d427da16aa300d9e875fe9f531ab1cf7837d07e131f93a40868af960925fbc300de440b3b0c870d7f444edc19 SHA512 152893abd014e6d0faade3d41cc1664b3a875f0bfcfc5788e52ede435a7b6aaf7a1f7b717dbe52347c515740071353f160187961d5dc80e58773870d42115b9d
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
index b7cb16b5a58e..3832c65066a7 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarab
diff --git a/dev-texlive/texlive-langchinese/Manifest b/dev-texlive/texlive-langchinese/Manifest
index f223f5ed3ea8..cc384202ffd4 100644
--- a/dev-texlive/texlive-langchinese/Manifest
+++ b/dev-texlive/texlive-langchinese/Manifest
@@ -126,5 +126,5 @@ DIST texlive-module-zhspacing.doc-2016.tar.xz 169376 BLAKE2B 45808ff96133386df78
 DIST texlive-module-zhspacing.doc-2017.tar.xz 169380 BLAKE2B 2576e25d7f1d1fbe8d6c79267296473396bde0e88fa5072f0a0e47c6ad43da60170f44c9ae0c2ef4016abdaa915fcc52768051af0e97378a60f356b5f5218508 SHA512 0232956c6b105b02dcc036be0fb5bf761dd99119ed9a339db2c882bdff9ddc5ed17b351cdb0dd297c76760b298306db268794f73567873c62d7eb361a60e0fd7
 EBUILD texlive-langchinese-2015.ebuild 1330 BLAKE2B 041767732d0432a9f2e3e94812112cf4edc87e2636405bfbc4637dd462c556461ec01d336dc2e3049efef08c7c8b59326964b58c738b0f0958c1f9597c9d331e SHA512 ff6c43158d33da0115af1dcdbbec5fbb72a101e95ef61387d42e9ccc81368427d949a50c8e09e770a04dd2b45a62aee7e83a427e87fef7acc12ee70ed31d1a15
 EBUILD texlive-langchinese-2016.ebuild 1472 BLAKE2B 0b97940fae8153ca85373518010b8f173ad73b3df297604b4e5f1fef990453b055da6069092801beab766172d2b24e5057f7ba80c444feba819304879a7010ae SHA512 7bbd67fd50f2392f41cf9113fcb9ffcf7bc3f40a1d664ac92802ed63bb55a9b38e942d1620cebcceeb0307f8271612c595d50a90b9a9bda677f9bd37fa8673de
-EBUILD texlive-langchinese-2017.ebuild 1478 BLAKE2B 781f1dd4a69750435063110f486503e6316242bfcbc077af03da68cd1c2383b76720a6f50e9061abdcf5a684b5d4e846e37f55a751f070ab05e40c5abc7c4d46 SHA512 67fa96e28028fd9ad7ed6e60ab6e5f469c0a335b34b96343688d5d62878d63883211caa7aba0902fcff5a8299d0c894d39586fba887634033f5d497645333be7
+EBUILD texlive-langchinese-2017.ebuild 1477 BLAKE2B 81c11c690adffb2e9d6151e87d266b0550cafbf1d1862e44993cdbaa1c79e128c2522289cdef9e1fc46ff97e55494e97ed7b8b979ee64d996fe0c36ec44e3f13 SHA512 85911837ec2af8c0bf3996bb1f32c0f603f3bcb1a603d1b3566a0cf9ba38c47c3f6eee2ab6fc7cc51204cf8ad8cf67f933f4dc749911af4a04a4c594aac14344
 MISC metadata.xml 474 BLAKE2B 747a030b403eeaf6d99ce9fdf27b18216b5d4f22d07d93360e4055a25e7aa0927d4d2ee9df26afdf67838027cd2bf4033a9bbb2efa2a8cfce5c9894bfa6eadc4 SHA512 4916435018bf6a3a3a4ed6e2b140c6970bcdb9a97dd0fc55e1572436a1d58ce0063c0d48de606fb266fccd470882d7643ead61a37e4cce6cf5d326ea39526aae
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
index 339a3015e65b..8ccd957461b6 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index 105cc51f303c..7d14d65c8f6b 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -62,5 +62,5 @@ DIST texlive-module-zxjafont.doc-2016.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc4
 DIST texlive-module-zxjafont.doc-2017.tar.xz 135392 BLAKE2B 45ed0bc4943682318cc489f1c9a08097f9b5c7c8cf53320eba6a379b5238b2f0319becb98f1482c98b59b5103595703b25a06f32671edb02f8283518d0864dbe SHA512 27cd14f91f64ebfb2e4076895bf04a31f5d0b21acf4a9fee8e3c816c847bb45e894e0dc5ed5cb06c8fe425e75352d975b800511afe38af6f952b37ed1b0c30a8
 EBUILD texlive-langcjk-2015.ebuild 1169 BLAKE2B 9d4411e779b0806846f0a7118ed6d063bb8c8f934c3450b185058ccdf006439e27a98a4c12afe96126e4e3f7d17acea1dacf0d37668bf5068c6d510f157da246 SHA512 02e83ce9e4d97d3888de92d08167765b6df8eab5fed0aa71cdbee7c7ab612699acf2e84526422e67beaecbfc325148dbb3463b424f25539927e0744b12eb800c
 EBUILD texlive-langcjk-2016.ebuild 1210 BLAKE2B 857fd3f3becf0f3c0235b0fd8a962048ada09f95da91b95e42527bace6ef97eafb5035ef37725d64e6bbbb0a68e562263b87f30a02637d2331fbee0cb986bb06 SHA512 ef2415142050f91c49d4bedc445ff7aba975aeaac0ee4963bb3b71bc8a978613953c42f27a5290c138e44ccea81c365a7abd18834a165c21a675b671af5b6353
-EBUILD texlive-langcjk-2017.ebuild 1259 BLAKE2B a51ba20d440239db386f5b5ff4404281e80a79053122441f9a394123eec6858fcc2a82321931a586c025da1d5bb4fa24879fa3299cf6e5569280db690cb52bd7 SHA512 f11448f6cfc33e33d466eb8e294ecba605fe61a17d1c91b089f3636340ee67ff1e8c086ae5078fbaebb342be180b32c8bee68ff0f99fa2312351bce475af6e0e
+EBUILD texlive-langcjk-2017.ebuild 1258 BLAKE2B 89e8af306c1e6440789c107e091d487d2894d6e2eba77e1469b79c3b5cc8932aed312366865dac6bbf69a82f1c3cfc4576061eb37cf5290241e5f1d0752abb75 SHA512 d0e8e8e4eac939bf7f2a6e111c4685108d5a57f491bb8f372a20013404857f3987a63c9141dd90ff41b2971359846fdc726ba228d4a64a4175cdaf4fe7bae0dd
 MISC metadata.xml 723 BLAKE2B 9cb444063df06e44b6058fd7a4696a54ce0da42446175bad1b1ae17874efc1481f68d667358c5b649905b7a8ec8bdb2b631711e39c110d002bc56bd1ffbcb888 SHA512 d8503e8724dc8600e133fe921e1f2ee8d62a30dd7af0cb50657ece7d50a2cf07178f84252014535c6a7d4cb4664f7492396a924060781599540a8e88f80d9de1
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
index 9de0d380c569..59d9e21a65f8 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/Manifest b/dev-texlive/texlive-langcyrillic/Manifest
index 9e7d8f18a621..ab598c29c595 100644
--- a/dev-texlive/texlive-langcyrillic/Manifest
+++ b/dev-texlive/texlive-langcyrillic/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-ukrhyph.doc-2016.tar.xz 160948 BLAKE2B 7844b1c9d0efcaedbd77f
 DIST texlive-module-ukrhyph.doc-2017.tar.xz 160948 BLAKE2B 7cb5ecffd21eb994dec06bd9666138913a429895d5acb5a643e1e388c0b94eeafcc57868816acd8432fd198e92e54b23455336424207f799c8f5934f4e749207 SHA512 6e426ed9bdfd97145613330d613d7c43c15c40e2c7524938f569004e2ba67adc8622a5ae3b58f51e868d74b83618651d107e7f5e52f4077c21e66e0468497a8c
 EBUILD texlive-langcyrillic-2015.ebuild 2281 BLAKE2B e3b4467b62f304f6a62c782576aee7311d8fd223d62bf447b4d4d7e79392b84ba20dae72463760894fc8e5d7d92bce334e5788014c412efab1342ca155408cd0 SHA512 dfaf50fbf9cb0a2e68f7b5520a188ffed47bb2e645fa12995b1e5b8022975488facd2fe00e8d188b2b5d30e897176fea20de7d66ad19eb6fd2d1cee1d755e5c9
 EBUILD texlive-langcyrillic-2016.ebuild 2479 BLAKE2B 8b51434a007652fcacb0bf389dc65beddf872a33804a931f6e527db8eda61302f43fbcfcec99c0906bc104a59a6e7f18c402c54731f5f7f1e7bbb216a3b29749 SHA512 03307bef68df6061ff2d815d3683e5dbdfe148d91a045a24c46c0351a0cca97843681242bb5239e0480b093fbcf0ef7488a2a1b74d4c8611db505674a9ae72e9
-EBUILD texlive-langcyrillic-2017.ebuild 2503 BLAKE2B 9c7181a3f3c9b6c8a0999ca7d0faa2391af4e7bb684d65287e7c7222a12e56fad329b8b013d09e170aefa0c4512045aeb20d8904862bbd82d8f76a6e1365d44a SHA512 6c4f202fb8941f37605841f99461009a316b356834560ced34a536c99e94379423416ed37c06cdbfc1ab1fe3754e21e5ff3606267831f4635d8d1b7b7cfb31b1
+EBUILD texlive-langcyrillic-2017.ebuild 2502 BLAKE2B 5097ddade4c0a6c2f27d061d5ede795f40cef476f35616a5bdd8ed2f0e3cb1169fb14005ec0b4c4787c4208faac0b77d76f07a66a46ce2e018a8ee381a7ce04b SHA512 85257139228d08b720143bb2cf3d2af7148c4dcadb3da96f7a8ee9f06125bdd5e4784da5298898310acaf06d0fc833bfcd31a5a58d0bed79d1e93d4c24a80c70
 MISC metadata.xml 525 BLAKE2B c1d2a5c32b236c45931436789390fbb09eb05a21874a13c607ebeae2b722fcf4d317a5df44fe243aed230089354fe17ff7f8681e3b75fe03ec48ff0df6886113 SHA512 3ce96ce9895df4195578f5e0859a103fb64332cc6716bf5321751fdbfdf30ab19d32ca82aafd2d9942c2a410a17cf35a970f3ec15743a5b097b42706e4ef5fe3
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
index 6cdac11e0b18..8930229e4029 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 765df28c7204..368a388c8c0a 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -75,5 +75,5 @@ DIST texlive-module-texlive-cz.doc-2016.tar.xz 1029148 BLAKE2B c941abdc2dac11b68
 DIST texlive-module-texlive-cz.doc-2017.tar.xz 918152 BLAKE2B e258fec9292ed957e9603e7fe525427e894b6f1c5b9da47143a99e96c8c46f39eb3db1e16315e4e80834da5c611efeb97bd4e6ad3bb27b228cf80729256d2341 SHA512 914b96890fe0d136ebe7939e3659b9b93faa0f226ecef2a6bc06d058680a1ad48318ef09e6093eeb48073dfb32b65d141b80f36f631acaa9858d6ac72279e1bf
 EBUILD texlive-langczechslovak-2015-r1.ebuild 1026 BLAKE2B 68dbdd932989d2b1496ebdfc2611b1296c5a70e4c5cacd68832b998e0ed22032a312b68e86aff273cf9b14423707ad9bf33b3a7d256d8d8d98fa59f566a1f4ad SHA512 425b4f393c60bf59cd7610596f1693298ce274b8debd37a51b7d4523304819f63328698e3f2ad0475f5631cdca28a1d30d348731f7f6eac8b48838e4f2db9a44
 EBUILD texlive-langczechslovak-2016.ebuild 1111 BLAKE2B 9f4ef99e1e0cda3ad5701c27e48c03c03420bbd8e91848b4b90abf8fe15f4800bca7e79d55ef0f409ee5d782785a109a38414cd7f173ad5ea3478f777c7fadd2 SHA512 dfa07cf40853f59a8c85388ce0f66d34f730f34df0efc68a90260fa8db5965833305e165669565cc33415a8e5e67ef7b9997af35aa437be5d56333e2de4c9c96
-EBUILD texlive-langczechslovak-2017.ebuild 1117 BLAKE2B 4aefd21065e2dbe2d230aa14e398ba3cd80813e131d797d0bad87fb129e657cecb88e77c00362ff7a5fdfe23f855ed69d2c7273d0e98662afdee04c08ae51c69 SHA512 8bcd45480fe617f8b4e963c31b51b19a709d01323f774ea84f9659551818de799f1325822d87b8cda18d7c787c382040b1642d0a2417637f5bb8fa21414bffa0
+EBUILD texlive-langczechslovak-2017.ebuild 1116 BLAKE2B f6e419ece6d3522ea19bac1652292e6542c421cd2b76c58edcf63296fe350def49629d89d8dc437e7097614b7f5da72c9ced9ae3b9adaa65d7693ecfd14eebc0 SHA512 c50d8599a54a717f193d160e2a6d14262801edaaa7c947ee9a2eec03224d9d877da2f4f514c62df54fae6f54bf39a24bc87d9935db6ba5effef8c2392b5e0a6a
 MISC metadata.xml 436 BLAKE2B 3c6031ea7696419b6d259418d4093bb41cc1562bb07e35cba24485550c806a1ba2b741530ea2c7a1168d3844baa2a7fbb55be69a69911cda4fb0e955209e7983 SHA512 6db7969532a5e09e517223fe972926798a8221d2921d5d11d3f2fba86dd6283e62e782f8273151c7fa05f9eb3dbf43e8f53179e049a16f975052b22993f494b2
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
index 4340ebc34a49..1423cef9d6ec 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index b43a97a19018..007cbedcef7f 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -358,5 +358,5 @@ DIST texlive-module-xetexref.doc-2016.tar.xz 174672 BLAKE2B b014ac92ef2ce4994c58
 DIST texlive-module-xetexref.doc-2017.tar.xz 174648 BLAKE2B bf126a0056264985fa1e3b54d94e577c81c7e278b578fc45e13dda76eefcee37bfeb4a773c73b7022ea43ff62eb8d3d985b66bfa613188055b6bd08a1f33a29b SHA512 f5db9bde0d0370f56164c5054f1dadc983f84a26f16d3d35d76b738e542db3a63a737a529c250cb282f6389284a9ab10c564b25ccbf09f64fe96559e0752351e
 EBUILD texlive-langenglish-2015.ebuild 2470 BLAKE2B b3de439067bc9662dbddc9f44fc834e716b5da5ab857bb1531877962b72fdc8d95af479b4311f1ef69e9660c616a9703b4fb258e1db8f5a331840260294fe030 SHA512 ef60a5aff5246aa8132c3d80a33496d3dea69a69d1e725b7fca2a8dbb2dbccde23609856abe16c1986f9a1a23e4ceebe9f9b19a984a42b3020727cefdf383887
 EBUILD texlive-langenglish-2016.ebuild 2542 BLAKE2B 2e4b55602cb7fe4f3b9db9ee50647046f792d51547987d6d95cb4c76d93cdc8098c27397e7856bb8d770add63804f806f164195f4d6394f7e3a5b37e06b8fd46 SHA512 b0947fff8c0aaf724850516524a4445af1c539137278419048f4a438716f7b6898f41db66019709489b28d15309d0ff5bc4f4e27f352c0dfda02afb94bb7bbbe
-EBUILD texlive-langenglish-2017.ebuild 2620 BLAKE2B b6a449061c4f1c6dae661965c19a501cd006746373a0bd6e15df9dc2cafddfc4d7d56da6e5fc6d54c44909061eb1c107a08e6bcf5242f285e94b489d2036344c SHA512 f2abdff3a97035e13bdb882d0f9466ed11211d3a72a55f81d47054de7adfdbb42134d8c82b478b0abd648364816cf562544713977f196d7ad8c44aea02e0d633
+EBUILD texlive-langenglish-2017.ebuild 2619 BLAKE2B c440c65b31c1683f7af9c2dbfe8664603444cf8ed08675b6884d95f53a2d9edee0abf82de63b9afa808015454ddf13fb3e3e2a377685a1e53aed814183deacbf SHA512 8d6f538f3e27d9f677983a25f33ce087bc48439240e38a61a3bb19ab63405dc462dadfae70980298b60e5a26bda6e40c106f8970b1bee6f0b9633fe4f6da831a
 MISC metadata.xml 454 BLAKE2B c93dc6411985a25b9a32ad10276380a60dbb427b3b5da91bf09800425ffb32caf65a2fe1e512755d69001c4ba6143fb1df7ebbb259045bdf4cc689a494e67f70 SHA512 31c04097cb5cf947fcb4332ef246526cbe9c0ba0086d12e8ebcd1b7c3e298b063ce8e13d88b29ad7b397ef8338ed38c3f05cfbd1ad3c99fac79c59eeb8b28b5b
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
index 0bd55d1e24c0..3fd97341d9d0 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-english
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index 9d46aba145e5..8407d5cc037e 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -622,5 +622,5 @@ EBUILD texlive-langeuropean-2013.ebuild 2840 BLAKE2B 48f3e173ba64c39818c0d4085d1
 EBUILD texlive-langeuropean-2014.ebuild 2909 BLAKE2B d9f5bbc02ec05adafdeda554edf184b9aa870a2844ab0ed2a7fba65dc92025c5b35611b7637fabaf5589a384a5314aee7e124934f80b42cc10ca4777ca3f9dd1 SHA512 1165a468fc864784fdbe11f7e89e25eb2fcd57d2e754af2a865130bbe814b6c327ad920c0a8d878e4179946562861a18a74f3f24121167860c9a562f04fb64eb
 EBUILD texlive-langeuropean-2015.ebuild 3058 BLAKE2B d98a6872ee8dc59ea66645a56c4e318ed457eb8aff33e52644d9c7f5d8e090900abb7094126ce97fc26c28b91f395a1e9ec8c2fa79012c468fa8eb0e9878e89a SHA512 a59af9f2e82083e2a3929955a1863edacf957164aa30ee955a0a525a98d4b26034c82f377a23aa47a6b02f9c437ff3f143f70511b916698b9d8130943edac140
 EBUILD texlive-langeuropean-2016.ebuild 3409 BLAKE2B a78de8adf4e4255c2f882b45cef5e34aa1b3c1d2942a59738772ef205bfcdaa9add592c4a8cf31bcaf6a2021226650840def54dfc1e800e67781a3a384e9d63d SHA512 ceecf93b9bb7b35fc43f84f1941d3e5a9466df8e43f58c2752c0efe7feddded1044a6f4e6a66bf209fc8e94d6f8e8f3372ede7ebbfdf26d7d37f43bcc5a96cd4
-EBUILD texlive-langeuropean-2017.ebuild 3391 BLAKE2B 97a40a2234eaaeb1b75ee98dab12120ea344544b53dc30c56442ff7f295fc614fe31bb7a3b1ea33c0efb93e3c3e3d49264ccc99ab3ccd863e5b313d685a3198f SHA512 2d6beebf5f09333d0efb90f723629fdc7d2a84025d63e89d5052bd45a4557ff7ef8e7eeadb6ed66f56d60bdd8a0d87a04e98c2c5709ebdbc300ea6dcbc8a01dc
+EBUILD texlive-langeuropean-2017.ebuild 3390 BLAKE2B 35576abb1724aeafc4cc8a8085c2c8a18187dcc51d1095e062cb309937a1e6f02c9bbfd197df566dee2ea1d6e6ad2273b1ce9e0c609c861084f90a731a688ffd SHA512 b4da00319bb8a49de04adfff3510f4dd760c0dc0d0c21f04da699a3394db47677435bc64ddf82b7b161d8239f83540cc99ae121a9e610cb70362256f69b12d16
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
index c7e3d554f509..99a26d2a7f5d 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-langarmenian
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index c87adf370ea5..990566baf1a1 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -214,5 +214,5 @@ DIST texlive-module-visualtikz.doc-2016.tar.xz 5653552 BLAKE2B 3d7ff5529a25b0a45
 DIST texlive-module-visualtikz.doc-2017.tar.xz 3723460 BLAKE2B 4cbc3efaf7e628128b1ca6e9a67888e2bc654d32e460c7493b5f75ff9cbe9309dbfe2e03292bcd942643119c9b1fd6f7f7b66b4e223e8b16396a9431f7b1b7d6 SHA512 22729727d95cbceed8baa9d850bc218005d6b5ebabf5add3cf604fcd501f2b07529ef8203c69544e37952f5147f9b4926ba148527c76669a7fcf408c1d94ba62
 EBUILD texlive-langfrench-2015.ebuild 1640 BLAKE2B bb63c7bf5a41ab3bc68d95c5468ac6dc600a4502dd76e9b8a8a914e8532796db8365d8c79f59bc41ef0b01a2bfde5162854e492fe222e37c82dcfe574f92cba4 SHA512 1a57a22528fae6beb713aba8ff09f78a9cc964dc54e29ecb19683d25036b38ac0c671ad17255dc2f44cb8cc8f03172988d0f1bab6cfcaf5b9e72bd74e3c13b67
 EBUILD texlive-langfrench-2016.ebuild 1859 BLAKE2B fe0893111b6c9d090872431116d9dc903633030bd6f86eb9f260938bdc357ba16185785b2eaea06a84750ac15409f18fcb3c551142fea7bd881a1153dfc86dcf SHA512 2f72551f33dcf53097727824d84fb42cddc672e3274750fd75cace1782eecaf02a4824fcb3590d3d7632261bb3dcc5f6f48e4e4e6d8218c7e9189e80a4009432
-EBUILD texlive-langfrench-2017.ebuild 1873 BLAKE2B b52acfaab1a343312c02f649b395dab4855f8324a34a55f3a80408da15b7908760b3d8d25e21783011fe7305cbbf1e2b736575c1ab51d34b66d3d17d100b1e4d SHA512 00389b66a6f03ea191eb3f816925bafdd3a4c425867a7333b364aa221c8d7d2cbeb6cba21953ac974df2d2ca95825d94c2d67d0be30141c625db7743d8fb17a7
+EBUILD texlive-langfrench-2017.ebuild 1872 BLAKE2B 6eb20f3f7aec996d96990d1483ffb548735d5a6d591194df53323b169f521b12e17bb47d516cfb9260411ae4618141593269db9963c2341bd416665e942fbe8a SHA512 5e61f0ae6c241de83bbb5c263eabab27cbcfa0e518217610c014f302c0c4322f506be78cfa3d5a235fac81cd8cdf4b75f124828b1b87cbc504934c6c79d3530b
 MISC metadata.xml 441 BLAKE2B 6a36c72a1efc71db9ff852bf890e5303b85c080aba256e055f8dcd97000025ea3351d5293f186fee14497706a8644d67ef7b5fdf783b4c9764f88266fc776c74 SHA512 613ea7ab10d9808c61e8a0b62bf7a1a59c10ac796afb1c8067e8e0ca681530650348af075bc0d02e38f2af4c9131c43343c0c6d9431d8d91d756098f84a5aea2
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
index 0a52deeeeeb2..ddcc1b50a4e3 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-french
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index 5087b9f1c673..1877e61daaaf 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -301,5 +301,5 @@ DIST texlive-module-voss-mathcol.doc-2016.tar.xz 230652 BLAKE2B 241c60d9b5384986
 DIST texlive-module-voss-mathcol.doc-2017.tar.xz 230640 BLAKE2B 8e71203fa3dc3958fffa93fe9bb2c36d2e2a520dfedf7a62b18d646e6879f8ae6eaa5374f04321de6561599e5c4b9d8bbf583926d89f7f5823ec53a93a9c867f SHA512 f2add19457add6311f59b8a8ecde14e53d0aabfa26698aa109cef1a3c63eb83eeeac32c16818d2ec3483373b9e42bc873a93cd899626b46a363772ff07466894
 EBUILD texlive-langgerman-2015.ebuild 2234 BLAKE2B 60d764b026e67183cdf963aa8286836a18ba4e67626e722d9272425be976f8540257a7a12f12c525a9b8054f96448cc65feddbc8a545c180cb11a938ac48e0fa SHA512 9de673f7ea085be19ea58b8521784d2e865d939b0830d5fd15af5815ec286663ad730d3de2151335affb462e9d566c5cd09adb4bf35eebcf1f572af9f71f2eb2
 EBUILD texlive-langgerman-2016.ebuild 2378 BLAKE2B 3110ae2ed3d58c25f1acf6812b16fc2ab6210c2aab161c7c08b2100000ec5ad04cad688ddd7e8bfc9399c2f53311abac8b218d593046d75b5799f9d822787535 SHA512 f8bf4fdcfada8dfc960c2ef7f3107e485523682e13b5d46a717c05d4f51616c710141aaa052b5c121eec5ebc2eb8222d5f609aaf89941c73e51c81ec7be76013
-EBUILD texlive-langgerman-2017.ebuild 2388 BLAKE2B b93a31eeda4d005738e6e8036f1e228c3b448445e6aa6bf4c6874f61b7d9e306b3df435627d92390baa160bb1213fdd9b30208c14031bfc2efe87d15a9a313b3 SHA512 fad6283ce844406cb36ed4513984e4347245eecbd05da42c17cc5b598973653f636a2a48f4a39718eefd64e4d5faa9890cd916f3e4bb52c3517de0979be4babc
+EBUILD texlive-langgerman-2017.ebuild 2387 BLAKE2B fb737327c983e7c8f1efdf6135629527a0d95e5b5d973a4d67dab5fd4f42274391831ef3d51b7dac489f8270eb998c4bc48d75bf210f9068bd39ffa1ba3959ee SHA512 c9653f411210a4239e5a70a0f3e53ebe4e2ff0af40771b25395b630b1395e70340e8c612cd873c6d3bfa4f403735a8e1b4a7e01784e8730e86fb8216ffeb4f79
 MISC metadata.xml 430 BLAKE2B 41e8c9acd74fe643e9c5dbeac94931be157c58d415956f514e80e9b4756ea3652fb7852058966e0754b48516f6554304eee95f2561aeb4d94ece0b77dbc459b9 SHA512 94807ed6a052b681bb2c080ff42a333ed33229f5b14047d8c669eb34351158cdf40448ae8d57eae7ed25aa74fbeaed05fe0d393944072cd21d4ac9986344530d
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
index 3ce571ef976d..77568a74a146 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index 4423807db30a..3e5637e40ab9 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -163,5 +163,5 @@ DIST texlive-module-yannisgr.doc-2016.tar.xz 28912 BLAKE2B 70c3fa5093ebb4ca06dbc
 DIST texlive-module-yannisgr.doc-2017.tar.xz 28908 BLAKE2B 162c85ea48dd27040d7f964d34c23d9e81210a27bcb6294d49d1a093f4c077dea08d9cbdb5ef65447e190887a184ff6665ab9e71ed36805c023273300a7375ac SHA512 174fdf12c5fa80bde25b5d519115a275d1fa41990b4167549cd7b5c1417af86cb5b342ea29d6dbf912d7b3ef50d008ed646094e41a1c0c68208e897279c5fb3b
 EBUILD texlive-langgreek-2015.ebuild 1345 BLAKE2B 5edae562bcfe19b95ad2c371e3d113a5796a1c9991fb6ef0f32fdf4953a3d11746964f7a684df45426a6e03910d544a86fe63a22b24e8f00beef7e11da9afed5 SHA512 950d2c080f22645444d7e4265019d036d5ef6b5bfae22e82f4ccc1411e25e81e936cb635f882a3dff0e2166ceaff4f4f992ae2d9ea4adee67bce8d0ae5395f75
 EBUILD texlive-langgreek-2016.ebuild 1430 BLAKE2B b29f77dc8dee13041428cf812365b0255e419d495077e962a9b8e250ba12f0cf62635babeb138177fd34407b9d351a0c9e1eca8deff459b2b6ea17cf4d5aab3b SHA512 ef1f871250d34e9eac1382bf81257843e55c1fdc1dfd5342ff2489cb5efcb375b2bebce0ec50ad3b109b214c3a422528309e446e70fb0bb717beb440ac4f7983
-EBUILD texlive-langgreek-2017.ebuild 1436 BLAKE2B ec11b4664032d2914a81daefa24e571cb0fa8374359f39bb0d86fbfd65d8c9ad6a88c06dbc2199925e25bcc2efe3a9015921e54ec5dc4d54e576c1c9dbc134bf SHA512 5274fc21759412ffe8980583f9089bb05f41655cb4ab5491c1a7020da7578cb2a2dee7414087cf4a9aa07a7b19fc0d95050293ac5fe376342beeab01b20d3f7e
+EBUILD texlive-langgreek-2017.ebuild 1435 BLAKE2B 904d10431114ca377474b828ca6fbe1a8486c00dc35ab5f1b480edda373662610a12cfbf0b54748d65641b4d26ff9d74c3c1a7033cbeef135ac92fcff1bef385 SHA512 63e981c2d6e6364545662e9203449a62439911c649b0f07298953d02acc5ef11e626d1629e52b72d1f17d3c6d8552d58fb8d6ac8c1035c30ccab29aaa5ed6bb9
 MISC metadata.xml 429 BLAKE2B 01e67263a2df3a5c42fc95f234933748d2e6fd741d2ef909646f39aae12a0bbf10611248f6c62ca71bf9a9bc71a30ec6ffc10fbb1b8e649a6aa732649a98900c SHA512 0bf25c8f6d55b298c60dee53a09d63e1d8b659b4b2585b35f8b3f0081a5e68073627f7ab4ea27b5cc135939845f0ad609373edb4265183ae4affec6cf0c700f3
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
index e87a521d0d4d..19128d339385 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2016
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index ac9789f1e930..76473c45fb82 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -114,5 +114,5 @@ DIST texlive-module-texlive-it.doc-2016.tar.xz 1026220 BLAKE2B 62008baebedecde0b
 DIST texlive-module-texlive-it.doc-2017.tar.xz 896808 BLAKE2B e9414135232cac146bb7dff72b6dce1e50c9789ea39f15908cd6927943577edd0f6c0136a9247a67ec52bad99c5e06017c92638bd38c140743b08e9bfd8e6148 SHA512 4f50a36da762c4ee000e93df770232d97726f7846c6d3dcdb9333849479371334f12c7acb454441f5985c44c0aeefcf1146136eae3ce69c4daf9c8e2af89fb9a
 EBUILD texlive-langitalian-2015.ebuild 1226 BLAKE2B 2377cec38bcb2fe414dcc007efa11f526d0180522cdbf5f383194d03b0ff0e098e50c534943b1203d79b134d4fb1fe39883fea0473e2fcc5c1d0917275d5e893 SHA512 1e265212d5f7ae230020279c83e452eb72106249ce512cbfb152b86e3c8f39ea868744824193fb7d6b561ca3d2cd8ae5eb5f4a1a5fe930c5e65f99468a5f2a5b
 EBUILD texlive-langitalian-2016.ebuild 1278 BLAKE2B 35292e791eddee046ba56b5c11312f9a2b67ab0d42feef2ad7d753e9663a68296b42895d69103124c9c4c18298311811a88a96967c8e9c58a3e5d9e88b2edec2 SHA512 44afe9a2fcd7edde0902c2c2e759e9817c1fb691a6807fed5d799214a176d64d9391a1b388b9e06853e0a158f0f2227c601a866a6fee241a42bc1fd08ca27c29
-EBUILD texlive-langitalian-2017.ebuild 1291 BLAKE2B 471bbf8e10c46610c00c6904859d3388c7c3494afc8279c3398dd619a3724b99e0db5516d16daef652e9b346dd85616dc64b8ff26ac4fa0627cb7564bcf1a5c9 SHA512 6b7779ace9eee9e91036ae6b3b8bfeaf005b97c9a40f16608b752361beb99f0a6c0b5483456d3c4e14c534058c06dd5e02fd2353967a3daac9121092e90be5ac
+EBUILD texlive-langitalian-2017.ebuild 1290 BLAKE2B 092c84dd01e596e9949ac5634e54633722169f7e1ff009e6f8a17f3b69c3585dabd737570f38df206beeefdc878858331155e86f6f764b92e3c569ed9383c111 SHA512 984957abce2136ebb5438a75d13f7cc50af907fb035e160196810fde390614469cd024a4e62b8e1fa8d66700e2b6ab1cf988b7924432cab1484a3b10adad73c7
 MISC metadata.xml 431 BLAKE2B 27fe61311c21a334ee4479de2505b23adc057f3b3307d19e4399b739a2c3a569ebba3918cfb1aa1ee19796615d1a0f52c474f2fa793ec8d7eb4c9cb64836326c SHA512 de7474642ce4d561760aa2302808ecf5d6d845f99fc6817543f60ba14f51e31ce809b08ee5b71f99e9efd43ef29b79827d73ba6888a8ed98e57551aff7664f92
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
index affbb8f56016..bcbbb130f89d 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-italian
diff --git a/dev-texlive/texlive-langjapanese/Manifest b/dev-texlive/texlive-langjapanese/Manifest
index a992c02b064b..5b62f567a187 100644
--- a/dev-texlive/texlive-langjapanese/Manifest
+++ b/dev-texlive/texlive-langjapanese/Manifest
@@ -223,5 +223,5 @@ DIST texlive-module-zxjatype.doc-2016.tar.xz 136636 BLAKE2B 099e45c8286afb60e6fd
 DIST texlive-module-zxjatype.doc-2017.tar.xz 136620 BLAKE2B 5db914ed47ae8bcf0630916db81962632124f24af585759440d97522820109ae72bb797700065740c24902ea9d3fb17efe2bc7fee29fe2d51115209488890de0 SHA512 215c9c6809b33dcb830a0aa477beb474f42d1eac162ef933a9ab36967a2c7d956e078aaf1944682c755d454ec74fae504cd2001435ad5f9eeffde92cb2d9bc9d
 EBUILD texlive-langjapanese-2015.ebuild 1639 BLAKE2B 1c4efe39d051b075f212b560a623ec663ebb0b01926fe546ffcd3e6e0c95180f7f305c0d2ba35dc8cabf83b653f728f67f8ab1cc564b24711715c606591dc0ef SHA512 dfda3d2131066bcb53690b809c562d10c85fde14d37d1bc86ed0b10388aa959d0b567f66abbcee8f06e22152c8b263e51c8701bc29403541b9f01d24a5d3ee77
 EBUILD texlive-langjapanese-2016.ebuild 2003 BLAKE2B f1672f7593df2ec5f071ea817534406df533d775b9a7cf0773e2219550bef45974743ec740b128004fed8bedd9233b75a9c7852ea0948b22c928f31714537817 SHA512 f0c78617091aa54247837538f1467b7f8ef72fdf25a9fd4258d0be842455738c3abbf373e2daa75f23e9f50ebe21a2ca5f58592a01a3a6fb6f2d89564dfae71f
-EBUILD texlive-langjapanese-2017.ebuild 2189 BLAKE2B 494e01cf691779a85a40742fd4fe323a37ccb19444bec1aa50add302182184fc23ba5a2d49ed57ed312e0e927954de007434b19c47b7c6566cb1a4df8cfb5ca2 SHA512 3ba1f8a6f4a3de861e42f379f0281b4e19e40c00d7f00aafbe7ab90928aed4152c591dd480278d46be4478578462f781a67ee82263e36846fd846ed66d3fce84
+EBUILD texlive-langjapanese-2017.ebuild 2188 BLAKE2B 318db0d207e0c3ae05cddd8d6be74de64005e6f6ca12c856e75eaae2c9dd48f8de5c0283f005f3de7778d5eaa794b07c5d46a9c8d6f50876a083f231de152d7e SHA512 9ca1721071dfccdf69b5af8bb17e4ca3c272bde6e889c57a0b919b9c724bcd11602e20c7d31dd378a106575b30f7dbda1e96c340788ac1a71d7a4c4ba049feae
 MISC metadata.xml 475 BLAKE2B ba6de588ea300f8ea1d0b7829c5281ee2b8db04e6a64984c3826950756cb7c3d78cbcb9ff7b751202c699c2c41601a30641410a21673a30f81524e8a0e7cd016 SHA512 3baa1973144345a57ce6b43971c69af9c529f1d62f8e128ff5b0558a98d52a6c07cb142ae27d5b76c0a579b2dd305c4b87a4136b974dda8bd5a6eed8b6c9ada7
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
index 9cd9c85a74c3..c03b2df35ba0 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index 6eb5c88b5c47..8f3f4ea29048 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -63,5 +63,5 @@ DIST texlive-module-unfonts-extra.doc-2016.tar.xz 8064 BLAKE2B 7c3f53612c4ab16c0
 DIST texlive-module-unfonts-extra.doc-2017.tar.xz 8068 BLAKE2B 759d77ce36409524db5834237bdcdd85c525a9a01b440dff13e06be414910b847ede522c44b6da6d118c0f5e87bb2df053307aa8ba932e7ab5f9ec62b5a1e52f SHA512 1581e671688c88457227f54f9b35a37f4b3eb066528d4ee85c39d8330144a40d9cb5d0e967098be389bbbe1fee2d53f4437fa1c56d1735f53b49ce7699b2b845
 EBUILD texlive-langkorean-2015.ebuild 1008 BLAKE2B 0a8ef6c6c75d3db0436ba443e8d732ca6a602c4afdacb0d8b85c297e140475a39348b1492b2c0475bb57a9ac41317546a7c0c08a33490d2e3b55611423473b7a SHA512 a0e697d716ed50cc7d0436a1a8efc8b0a4c620e9b5370f88fbfcf1f5f8e1fa2345b5c8abe0a73cbc698228fe14da2a156325d51b588bc7b3e4c4186a6309a462
 EBUILD texlive-langkorean-2016.ebuild 1142 BLAKE2B 8a0ae6cca00845abc98fa59cd2a84759d2d7a266a85c49608136bd9da45899362c746d5092d925d13d94c838f9740a49ddc28ef94b1093f8fda24aa47cea9409 SHA512 c3c0a02cf3dd6b4787d5cbe4f79eb01d439987528a4e3e1c1dc8d6f469f576888ce94991e9e0438420f3fcb7cbbefc76bb2ec0e6c5fd37355c82be6934f15a6d
-EBUILD texlive-langkorean-2017.ebuild 1148 BLAKE2B 832700fa234bb4adcfbd7bb613f56f8c3169b3acdbc52a1121c267367fafdf0471386b63920f8ff504509dd7a19c88f7af3f41f6627297a38ee274fde03fa668 SHA512 00e2fbb774f49e8ce1a13219f4c292de251a90587e95c54960a2a2315c4ebe36d252470c997d6b263096f7d5a326bec78dec115b74bdb0dde2cd56feffb70a18
+EBUILD texlive-langkorean-2017.ebuild 1147 BLAKE2B 221962cbd53751ce1876edce15a7186a1f406511ec0e465c2257e13d09b1d776e7b730686550b91da3405541d1e13d1d3c5471b79712bf94f0c50bac9dd94d40 SHA512 193cd711baf19fb90fe8b5a9e79b65d76fb674021fb5ad7986d2b41812c8d1464a95e98adea20725d1da9beaf38974f1d1c60410c2cf04f93a42d1b0f1baeaf8
 MISC metadata.xml 473 BLAKE2B 3f98501738312fa8703259ad9c06be5c22e8e13cbeb3c073eb06409589fa54255cc721748f9b44670c2cf889b5d9884a9c84ca0f67595cc5e5eff66422bfec79 SHA512 74e1c1d392ea2aef8b16938b7d77867236548014132035d592e629755e4e2fd9aab59eaaf1384e493fc2d66b1655d0775a92d61020cbd5c01cc85bed041b6a66
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
index 7a1a24a35523..600f59188e42 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-langcjk-2017
 !<dev-texlive/texlive-langcjk-2014
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index 38e429701024..19cacd5ceaba 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -212,5 +212,5 @@ DIST texlive-module-xetex-devanagari-2017.tar.xz 12444 BLAKE2B f884d677eb3f303d6
 DIST texlive-module-xetex-devanagari.doc-2017.tar.xz 988 BLAKE2B 7590cedc25e6b10b7b50623373b0f4f643b23455fd3a97c2197f4336b0303796a8f1d665750baa732446f4aba63fab13daced7eed26af36285b6e3cb08b5ed73 SHA512 deb051cb19d44f438ac1f3b7716fb66fc6538ca1ce33c1b84976d6904715d17ef65e4a2fd015f168d908b6905d0a2de5621d8b03150e45b7f5dcfb68f2eeecc5
 EBUILD texlive-langother-2015.ebuild 1703 BLAKE2B a776e72562722025e3f4e3c7a2baf6d61e2573c20c965273224e3f74710da8cc52ce37d922f137fdb424548a00de885239a887b0f291c945e14cab1898f45293 SHA512 aebc6f82f9d2a1de983d652f0e1863d0cb7336180247ddd49f9a4439bac07682f334fd8eb627f00d769b6dfc9e0df739a18b88a2248ed6695b2f92e58b353ca1
 EBUILD texlive-langother-2016.ebuild 1820 BLAKE2B eae19257187024e8f659a47d7d8945cd3f5e080c889ea04a13f6204c476a4ed43f7c39ceacdcdeb76037b0a6bfd7d881557fff01f16e703e84764abab6833650 SHA512 e29a7f00c6c1cd796d1233c8f50c4d05104dcb74217ae27bc0855e61854c903bc618324e3a992bbceb0c9774e110069bb4fc36043ce8ec2ceb3c34732519c12d
-EBUILD texlive-langother-2017.ebuild 2668 BLAKE2B f68a3fd62024bf3988641a8e6d29c005cf1747d30e8588880fd53b4755e9884ee60055dc27806420b301863cde6e1171ceb11718a169c7101215818a69d51a83 SHA512 cbbcf7ae31414103b4682cd16c4eda0dc88ab513b166c5145ad8658649b005c07e6d023f8a838f84ca16d0e520a40aa5f0fbd35c31d1c820f740b1eb8b108097
+EBUILD texlive-langother-2017.ebuild 2667 BLAKE2B 2144ea1de54371b4d7d20a6eb93d53b9f682ac9053f12f1b8cd449ea7a3ea9c951a982f6f89c00305fc65e307e580d7dca5ae20763e27f1e33531b702ec6dbf8 SHA512 483b79dcbceb668c5fd3f2a82ef1e042a3e4626fd65533bec446ae90cd19f167420a76a704468f00a82d4b0c00e3082ba5c76a4906b47eadf58ab194dcdc7fd9
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
index 708b1bc991b2..7d32163de398 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-basic-2009
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index ccc414a92fb3..5292af4e92b5 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -110,5 +110,5 @@ DIST texlive-module-utf8mex.doc-2016.tar.xz 7496 BLAKE2B d32ef2bd413f0daa010a453
 DIST texlive-module-utf8mex.doc-2017.tar.xz 7496 BLAKE2B cd63a21dd1699b7ab117a9cf7c3ccc5c8c9368dbdf8f6a87f25d0e50bf0d19381f517085a64356571465edd2a3b2fa671b64ab8b398cdac6acad8ccf9650f5fe SHA512 3ae93491cd484e39552273cec22d7b295a7a8b12259b67bd803bdab60d2919678c72b4ee46d4a0e41425bdb2cb29fd53b5c880690141dffea8c9417561af4939
 EBUILD texlive-langpolish-2015.ebuild 1100 BLAKE2B 62e87d127307f315be93ae65bc1f8079e9233587f27bb67f654195901755fdbda4574acd3c34e21b28ce760679c7f441c283310046f3c4dac777601793d31598 SHA512 7c3e0f346cc9ca9fb75706cd87f843db18ab3267dbab01520e293054130ca63a77548c67a6b7c36c53a032542a2de320ccc8fb2141bbb50cbca18c34481b35e4
 EBUILD texlive-langpolish-2016.ebuild 1152 BLAKE2B c2bc2e33e5ecca1fe7cef3ff12310d7f00c542dc6d646f4762b83be22f888cd94a97f85fa13ed149720a2b87ea31be5afb45c2b6233a047c05654238b72dbe3e SHA512 08a03ac8d2113fcb46e677a0ecc59d749dd925e59900391302a3d34190a2c85a376d36214f023b323fb35ad2d64aafd3234c146ecd4f28ca454d063c731a3866
-EBUILD texlive-langpolish-2017.ebuild 1181 BLAKE2B e2b53ecc343cdd42f70ea26f7acfb52f3225d7f990a882762691ee716a4ea2eceb0745c34b82c4e0becea3996feff3699dde0139a67347c4d5f5e60f2687ffe8 SHA512 e36773e59d6e7cb55b6f671670ea9f3873c47ca5ab074a65bf378141b375feb731129fe39b178098bfa346ea2091966e2065eb961c1d44229ac8f45f3e17470d
+EBUILD texlive-langpolish-2017.ebuild 1180 BLAKE2B 779ceebc130f30b7ef54f2eed0f10be78c15ecbc9a9133f4357e375dcaebe390a2e687d712570b8439db02767dd98ce4513380e078aad74cdceeb313230e46f8 SHA512 8bea9b51a505b28ee3246cb8e0eb62ca9b2739ba5cde33ad1d478c6cf50448abe7fbfff051d59361d832591395a0a78e2299d49e4c21ffe4f3930d8ce0163ddf
 MISC metadata.xml 430 BLAKE2B e3f3794885f68e64219d24a8a9d38f2fde0fffd413f3233196641a3ea95035329fcd9d632a3fc9bfd9f34540402f4bdb0b2bae0c0613aceb660baa7e64d6ecbf SHA512 4fd41829665f79f87a77ebb3cedce3ecea4bcc767ed49cf40d7e424eb0a1836817a001852e67ead3f61f189a71eb022bc6ef415e616176c33c1d129b105732e8
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
index 518a8345f3fd..fb7d2fbfaa46 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 >=dev-texlive/texlive-basic-2017
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index 6d5d47078d0f..058853d8dfb9 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -60,5 +60,5 @@ DIST texlive-module-xypic-tut-pt.doc-2016.tar.xz 225212 BLAKE2B 5439ab246f1df32e
 DIST texlive-module-xypic-tut-pt.doc-2017.tar.xz 225224 BLAKE2B 8b0095cdd853c248e968896248335f58165c3e4abe7d93fd0d4ee9242c73b6f8a5c8693211820b066a07cbbe7554b0d26c92eed4382d1b7c5be22edc45b9b8a0 SHA512 24bb3acdb66190e34bc56cb5696ea17be0a14fd25cf0a519e44b676bdf8b1bccf7987da307bf0d1f0288918dd15e589c05ecc0eeb351f7aeb2a870396a9d55fd
 EBUILD texlive-langportuguese-2015.ebuild 956 BLAKE2B 541f2e489aa22777dc81d1c69a2c14b2b1843ad707c11201714fc75e6981d1e9681a04ec159fa140bb647e60dd6d4495d8a6239fedf310233c4189b2f74e3a8e SHA512 25453a658f94ee1468e0517aa645473ca1f5d9d2ea9ba93f439556fd9ac09a7df09f92c2c79381f95691f8156a950a7bb6f6c9c7b1de4a970e60208f3ef79d2e
 EBUILD texlive-langportuguese-2016.ebuild 1008 BLAKE2B 08ae382e1bab87629d2125266f788ba61fa15f3d51d454d094233de33bdb2f0c6ecd5c383a4e47c2ab0275a3d61b9164e2d1c223dd4a372faf00493cdf9650c3 SHA512 5fe479bf4e4289e57f3cd7426453fd9ec5934aef7d407ade3841f63954006443720e24fc341c356e1b5ed69e5996e0adac6e9285beda7a4da76701f0cf3fe636
-EBUILD texlive-langportuguese-2017.ebuild 1014 BLAKE2B 6b240cbf3c9a0812f335be831a0da24614d1c9a26c02c3463dbeb47029d78b3bfadec2b23c9ea56ec6ddceb0874bdba5b20b4d6d62103016e7be0bfc1d23f39b SHA512 bf880dea4cb70c94bdcb4de969f5f1fa03f3433126f1abe65ab93f52b97d71323fefebbc6f676257ce8495e3f9911f1cc07d75ea5806d6b80d2bd5f6f0a960f9
+EBUILD texlive-langportuguese-2017.ebuild 1013 BLAKE2B 3d0fc93293f8aba3c8c7e74c7c4f0dcba43a3c7b9fe6940420e8a7f14a501ed00a7d34c3ef4d7214b9f67679b5e2a630837bc6d30567abf0bde375cb0c46d180 SHA512 d1822dc6d47e663769b45b6eb3f6a1da67d5038e97ba24d0e4e9e3cfe1edc1b061d1811734fa8882f330220421567e1654c0882017ae8312baf238d3103435f1
 MISC metadata.xml 434 BLAKE2B dcf4b081dc6c914dd2e249828f1512711394ee46c6100dbaccace8faaf713b3fd2988c14330fea99b123f5ab2c84a0c843aaf4642a32c060be94ddde18d332da SHA512 3a73611ae49dcc118cd89773bb2bb73a3bd4535a77379c44946f08fe84ffb846cfd1a8a68ad3daead16f2590803976b2b9b44b63c9bc21da43193f0c2979ad4d
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
index 748d7fcc5492..77dd34917a6c 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-portuguese
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index 55bab26a6013..e1104441bf81 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -91,5 +91,5 @@ DIST texlive-module-texlive-es.doc-2016.tar.xz 1026792 BLAKE2B d46a6cc74b57c07eb
 DIST texlive-module-texlive-es.doc-2017.tar.xz 1026792 BLAKE2B d46a6cc74b57c07ebbc873939bee1d8aeb26daea5641bdee56ec7071f2b841481cb179ab58f47354b32f520ecdb7e90177741c891a6f41b39ec2fa7d1a449e68 SHA512 d2a5c3f7626ffa447565a6c850e6edd736faaa87d460b961842a5ca3bb3d13766ee3ee25057644184af2c5a1306c75c89250fbb44a1c2920cd17fff7b6024e5b
 EBUILD texlive-langspanish-2015.ebuild 1109 BLAKE2B c45e2f789dce6409d7e8e957a4598b977324e4bbf40ccb2f7430a8c18f18b8073878ad557c087f266fc266b022e47231bab9a6776635ff1a884f44079b7f1d6d SHA512 4ae7db7978bb010a2eb6ab13537d8de2ba97182f691c4011904532a051e64056c2abb8196da3c352f282f7a6316fcdec27da2a62511c4918cc0bae5b2e0fa012
 EBUILD texlive-langspanish-2016.ebuild 1251 BLAKE2B e2f87cdf269ace40bc1298d72400eee0824fa68777497ce2521b49cf5c45afe7d4b8066fb4681f5af219fadcce21e4e8b593a3e22421082adf2ff2ca65b4d810 SHA512 5cc99ee9922382813deb3bf0f8ee5941563c93473f25c54feb50159907ec04f539b38ba69cf695dda250899540211a8a6ea39432500cc2946c8f8abd10c66bf1
-EBUILD texlive-langspanish-2017.ebuild 1257 BLAKE2B d021a26a0a4e65da6e965ed02f65dccc991d5cf82bfa66a36a7fa75b4ec52876d924d09a53a88fc36ee0924cf64291f893f88f5ecfe3d726e24bfd65fe3eeae7 SHA512 d69867a7f2c5737a0b89002136702fbbe9a58801c2ddfd4a90f6d123ae7dce5dc7f7d05ed490ed4102349039de4a59598e954cd48b865fe54636928234dc27b6
+EBUILD texlive-langspanish-2017.ebuild 1256 BLAKE2B 377174ce3c490f5c7b7ed447589f3e5fb013346ebc82722ae787a60a78a2fde03aed47a3b71637c460cc5ada51ff624ddefca97ea1c5be34c7eac71bd0208fd4 SHA512 cc079a5ff53bc91b663e47c0223019d4055f3cca0e8aa537ce866154d589dc636b0f790c1b21debca2d3d9852da9da8fdde7b3a22b2ea123b72077e2a74e7f75
 MISC metadata.xml 431 BLAKE2B 5b913256eb54147f95ff3804ef4e8975fed09563218bfcafbc6d664199b647f289e14e59e61d1cda1714c0295d3d7d4b03af7029ea3a642ff85db17a942eed33 SHA512 e7af474fa040a433df88f7d07f7ef410f4d5cc8086f8cbf397b08f40c03f2ce47a884ee7c994c7a6a75098f508ad73cc9aeaf74b84307b6aaedb9f16ff5873d2
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
index 8d0d229e4515..c6f9f280b6a0 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !dev-texlive/texlive-documentation-spanish
diff --git a/dev-texlive/texlive-latex/Manifest b/dev-texlive/texlive-latex/Manifest
index a45be44b823d..49f980bacfa2 100644
--- a/dev-texlive/texlive-latex/Manifest
+++ b/dev-texlive/texlive-latex/Manifest
@@ -218,5 +218,5 @@ DIST texlive-module-url.doc-2016.tar.xz 266856 BLAKE2B b20dab7bdddd79e71440befcb
 DIST texlive-module-url.doc-2017.tar.xz 266852 BLAKE2B 159ca5b010b9a66768c0b37760d39f93356e1ef81be55da03f360b2c9fef8f345af38cf7cb9432b038485d212d427b6db564fc773b7ad3d15638054b84112a1f SHA512 ec678563ea26b5e013d631b9ced49c870f95556bf9f29259b9f35e2ba1a25150e613cf7fd7cf03e12fdc2323e2124dc617b3cc3bb164a9e7df2365b252d75858
 EBUILD texlive-latex-2015.ebuild 1664 BLAKE2B ca23fa646440a7af7c4f447914bf67100c8cf2101bb715e01da310b3f7e220399e06bc373ba03ff9080b51b1612835bd931aba8b4775d19a8b9cc95fb614c76a SHA512 55ac48caaa06f6b065706ebaad54a16f4800b0f545184ece83257939435c14d39e1bba72e375b685c8e73edab3cb670de3e854c3cd2c4eb4c900a60bb0024571
 EBUILD texlive-latex-2016.ebuild 1749 BLAKE2B dbed9fe284e1737a13d9e8e6cd134754419c14489ed63a939b25602eb58a77fdfdf5ffc35dedaf9a051b8365d93e64444a2d1fd61a652a0ec5c878bf99f25599 SHA512 11fec719d43909cb6931af816f6526738a9f8de7ddaab3bcb6af95e0c08beb69783e48ed374b57cbe39114c87c26a79b18205abc9ec61a2d89ea845e824556db
-EBUILD texlive-latex-2017.ebuild 1756 BLAKE2B 43547ec731800aaf005e3bb2707d16be5e877b6636297c45044c3ef9bc31ed7dcfcb28eef0e0b25ea2756552684bc280ae86e60d015cdfad4b3a98dec9d8ffa6 SHA512 91bb9d1191b0260b31091ad919e189817b2cdb068ff0af286ab171ca491c7f02ec8e0b5fd3304aa690d8dae9037d31e2c7662bac90bf66d0681c27b933250c40
+EBUILD texlive-latex-2017.ebuild 1755 BLAKE2B 586fe3f7dfb0fd88505c6ce929ec858da265081320cb0b8352b830d5d8fa501b7b9ac0a981b0a32f44b3c259c73430349a878bdc8ae8cee630e28a5b21c4b15a SHA512 95fcd68efb2a8b11db29d7038648df9500da187100bb021f97d9d3fb22a5dd2b961db7a4c8e00b4c285b8df2299c2a8ecc150fc5ab3f49f4945202addf99580f
 MISC metadata.xml 529 BLAKE2B 59fc302f07f83452a60415a6ef75ae13bc314b3e2e0c3e8c58aedef8e2079e7184879908ec6d978a43a09a4429b3c1b79a3cc786a9695238b2a021916895269d SHA512 394556cea6402e78e83bb5ecb801bc9c6d4f0e85f368437953ccd1ce563954a3be99badee441c26d7791c965e13b17acd003ec325cc11b87a6fc605ffa2dd350
diff --git a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
index c4a46070ecbe..bd444944e29a 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !!<dev-texlive/texlive-latex-2016
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index aa35cacc51f1..4197f1c12bd6 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -8557,5 +8557,5 @@ DIST texlive-module-zwpagelayout.doc-2016.tar.xz 591560 BLAKE2B b82dc9fa2ee968c3
 DIST texlive-module-zwpagelayout.doc-2017.tar.xz 591516 BLAKE2B 2c7a6199ffd8262858bdda2697b6f9aabde0c1d4cbcacaef223683be09fa1fc2db87be5a7542fc68de96a62ccab7f45468a41d1ba0303ddbbfd2a1947791864c SHA512 0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de
 EBUILD texlive-latexextra-2015-r1.ebuild 35701 BLAKE2B 46fdc6ce25f678528baa046d968c460f64c85ce8ab62663d5dd04405dc1d93c99f1ce10e361a2e9f6f034756a3e689326e43aeb8ef11acd3366ff7fdd5a93435 SHA512 8eafc43db3fca70cc31be8d4b3283cbb51e096c41bb45b6d930ed17fa32a4e899be8afaf25807cef3d4a0cf7c7e39eac06027cf642c02a8c6ad5fc1549c2d54b
 EBUILD texlive-latexextra-2016.ebuild 38864 BLAKE2B fb33ec8142e6175f326d62f259906592e0c379268f50ed472c171a54cd23826ac7a42ab35c9e71c88fd58cb6f4fc8a478bfb4f9927165415ab6326334874be73 SHA512 25639da7c812a1c920068252eeebe967ea498302e75e094345af966cd2aa0adaa0038d28300eca134f70edbdd471bdff54aa2c8e4f2202674da4aec05bf42d1c
-EBUILD texlive-latexextra-2017.ebuild 39389 BLAKE2B ed627780f02312834fb19b7a1d898260a91a30b530629d393dacf3a5d8b1bb2c85f69bddf35045e58438f114014747d23d8e6d4fdafbe260c6611f3b7c7378be SHA512 6202fde637dc6de4ee4d824efa8635697b32d75d041d141d7e062ea1c033aaf394cfb1e876b8035e08d0f8daca74c62e3f2adb8b60f89d75a3191abda72512e8
+EBUILD texlive-latexextra-2017.ebuild 39388 BLAKE2B 4ab9c924f48c371a9ba4aa38fe29c450cbefba7ee1b144f7dd61da8098f0b571a5ace6c5456b789dd8ffbe9ad0fe918fb8ac0153998e9a119e64fadb9173c9ee SHA512 b2bcb37ede411412aed67394ff14c67e2b0c8519e7cf0ef9a705a92c06e2bc72bff2f5b5572ddd20fd963920ca1dab8656a69f6ddb514ebaa80a8e690778d475
 MISC metadata.xml 464 BLAKE2B f44661c9ab79ec9d3ca261cea4af7b64fbef81b0d63218137c940e804a8254b7a8638564d51b4f843e4ec59fc15711bbebd09f4b1fefd5a070ce0819345ce778 SHA512 f2f516eb45d8d405e29e91886fd2ffeb54e6126028d2ac218eb0bf43e009ab225f0a0661ce99436dda82b5f63b47e5930ab047e2bf16a2e306da510453fbe6a0
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
index b1385d2f84d6..029df83310bd 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2017
 >=dev-texlive/texlive-pictures-2017
diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index 894adaffbaf4..69c4ed11afc3 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -433,5 +433,5 @@ DIST texlive-module-xunicode.doc-2016.tar.xz 588 BLAKE2B 323414d6b59493065bd9c03
 DIST texlive-module-xunicode.doc-2017.tar.xz 588 BLAKE2B d26d3f9960cc982a16cfdb2435d59d187b16370034e473a7f72439d4e41f24365df03bb8cc56dfa55d736a53b41baa43eb9ad9ef7790874265f4e8702dd9e6b3 SHA512 29ef434a1832f9c21b327856d074fff3db3d9e6094ac251b9e00cb224fff058806b7a491e9c166570b41ebbc2d1db084b90fac68a26f45e70196623b6754f9fc
 EBUILD texlive-latexrecommended-2015-r1.ebuild 2523 BLAKE2B 871965a20dc0d8485e86a7f21a6c9ed464bb2f34a7933aa835c60029bac591ceb31f20847cb81baa4ab14355732e441118d45800cb315c90ce2fc77458cbf09a SHA512 d554eac751c4d856768baf916f676302fa4ff47de94f92084ce3ce24ec773e6c6a297723d56b37c1a708a129250ba50c5cc8194b8810afb35197d53c97ce44ff
 EBUILD texlive-latexrecommended-2016.ebuild 2669 BLAKE2B aefccbfc5396277a5e45b271de1e083fe7698578a9da7e4a0f0a31e45901fa89b45f9c097749cc314103977211f96e5b5a6cb0a77bd6865d806462f5a94793b7 SHA512 d8a307c712528487358343fa9f0803283375ad3d66f60b7b546f3c818b3fae9f7f8d21381d6a293cc28870180e6907bd759f6f9e68beafe07badc40a079517ef
-EBUILD texlive-latexrecommended-2017.ebuild 2828 BLAKE2B 1a8fc9e0a865390dc14ad41333fa79e8127151e7e6781d850aa40343dabf11566883cbe6bf85c49cbbe2d0527b64876edae0d20b033af3564e19a88386ee74a8 SHA512 858039d10d8e409713c97b35fcf83566b174950b2b8947021d434059d7ee08b574a75676e8b3958fbafec973073ecfa48e5fc96ad1ae84a5d6c421bb8481fbbf
+EBUILD texlive-latexrecommended-2017.ebuild 2827 BLAKE2B 7c339e33e129cfbce4c7d92d1ef7fd4a54405d418f139815118c0b3d2f2930621f1a8a0f06c248e547c07bdc977f8c8428e82b35a1d7b676ba8ad43c04ca98fc SHA512 6bafec96e84fc859efa3a6322eff2b8b2a2afe792a373ecc6595e4578d8859ebfc0593a57184aad5ee239642fed5da18969541c618b479371809fc884e92d60a
 MISC metadata.xml 493 BLAKE2B 2863d00d1b302441682fdc631273218535ce353c050c295b9f9f0fd133cd687a281e4cb634eeb58c89421dc9cecb3bf32e7816dfa2745e139a90f5760e7d0927 SHA512 815d4e8c1dee309cee3f6f0fc553903a7129a3fb9be6dd413e3c0b81f8924c82e8377b11eddeae17192b2451209ecc25d15dc19a925a58ec979c10f2342a6869
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
index b890f84c9d08..7b646ee5806d 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !dev-tex/xkeyval
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index f4f3391829f7..7f986a41dafd 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -266,5 +266,5 @@ DIST texlive-module-ucharcat.source-2016.tar.xz 2324 BLAKE2B 32a496c2f876e38e6e0
 DIST texlive-module-ucharcat.source-2017.tar.xz 2316 BLAKE2B bf8293199b8b1f8207b13bea33e526db234b76080a85815a5c8ba1ef2b90cd0e6f41f607c179c06fca2d7e784400822965b0cf7099a9b22a22a28f687f9c6f4e SHA512 558e2895a44364217155323d0c7592fcd9c6730ae35d998e2135f95bd420ad8c8724627b0616cb649ed12cdb20fe75a02fcf545180d081537fe148a44cd1bc2c
 EBUILD texlive-luatex-2015.ebuild 1933 BLAKE2B 151dadac8277032b699389ff0076b09de2b797f4aa9aa0b80bb6af1a2087aa75bac4785fa58df761681f9a7169005309afa60f3a3b48dc579e5496b14234aec6 SHA512 3784c4eccd2b2c458d77050f3b2ee05c1b4e4856f1fe6751d787c3e342a1a06151a34e1eecb9fb61ad53b8a71f773bf6b52f15f804fb04ee5c305124f4b0ad88
 EBUILD texlive-luatex-2016.ebuild 2130 BLAKE2B f19caa4317b9fd487eea19b65c126f0e107331d5b187bc7a455c5d390ede3af9e02c6ba29c7614804c20175b2419a97c13a0ba48978ff86655579cfc2ba0b1f5 SHA512 03e91853717d21fa034638402c976762e59ac66a781e129ed71ac877333bf2a4d4dc726bbdc37732e1bb4b3eeab68c3aff194b90a109995d93c010fbf3a76ccd
-EBUILD texlive-luatex-2017.ebuild 2157 BLAKE2B 560b85f1e9459ee3bd3318f1c47e2e584721e0c1801959342094b405b1d063c15a2eaa1e90452b0bad824db6bfd617d44c0cea59d9e4c3e91be55e065d7e1537 SHA512 e39e40c6dbce7830bd4c85d730b88e49ff5477f988b2973c6be196555ed432ff6fbf3c774e1e7de6df1b7ba06c813092077534a8bfc27b06e8ab7cac2934d236
+EBUILD texlive-luatex-2017.ebuild 2156 BLAKE2B 4e53428950d243afd8126137c38cf144b119de841a311c938d5afa6b8db834eb3331e911dabc0eaef088115d9e892a126cd4e293e607d4a2104b7bb6a8471a9b SHA512 b1eaf035f70083c9c09df59373ff74c400519219dfacb1784905e870a8422797144b2feefdf99dbb7a5fbc2274596813d0b94b142f88608927d4ddf7830cb194
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
index 111248c05776..1d92cbcaa173 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-mathscience/Manifest b/dev-texlive/texlive-mathscience/Manifest
index f8349e537d5b..a1370efc247a 100644
--- a/dev-texlive/texlive-mathscience/Manifest
+++ b/dev-texlive/texlive-mathscience/Manifest
@@ -760,5 +760,5 @@ DIST texlive-module-ytableau.doc-2017.tar.xz 360816 BLAKE2B 0acb1fbf39ef9de43869
 DIST texlive-module-ytableau.source-2016.tar.xz 15896 BLAKE2B 4e5573ebce1e66772b5486c79586d4cf33fd36f8b05dd302ecb20da33edbc84fdc6899b9dab6c52e066462c3958cca6f5fc8a6213865f53817addb214ce1b9f5 SHA512 76ec8e726ab8878e9ec7a1ce674da3a8d6dbd5c971d95cb6ddb68475493fc179ff3904a7f9b45da1c36ebd10f6d1d95678c0176b11ca48c4b598188713d94da0
 DIST texlive-module-ytableau.source-2017.tar.xz 15884 BLAKE2B 5474eb45ab176e7e03352eef9f87604052099bd385e804fb98795b9b68cc5c15c125fe8f5307a10ed6b7e282c3fca1ffa913cf9b0c4c128134e0113d95f92c79 SHA512 646fa552fadca33406c195ac17b2d20504439f39dd8f62d85fe4f66b6a476424cce08599e69571ac7d05a28252f406fb0c092f55bdbf00524d1967a231a9dc04
 EBUILD texlive-mathscience-2016.ebuild 5518 BLAKE2B 358d034a7ad2114c2097eb5758168f95b3be25e6f2df6c44e722fb0e053a16163925303a6656678b83f18c4b98d364ee1835323f09bb9af43eed6edaa8cb8255 SHA512 b38dfd37ca9ec6553ec0391ab0c7c9bb5648aa6ea9fa5234b18b0932e1305487ac4f5b83705c8c331ec9fd42100e6645b23f8b54ba216aa86d0c552618b15520
-EBUILD texlive-mathscience-2017.ebuild 5818 BLAKE2B eaf99b79d28aa1ff5d2041274d195bdb3d9b61ed5610232106f9dd734e7c2ed07782f6fe3d2f435212f738ed90eebadbab0402ed87d4bdccb332db6664fbcc5d SHA512 764b674dc8c292fa372e3bccb81c703fb146e11ee6f6b867d599fcfc40c659ea282362b68dbedf8046d0d23226feb7b5d76fff08fd90209aa31d039bf5715e86
+EBUILD texlive-mathscience-2017.ebuild 5817 BLAKE2B e384c050d0baf17f8b46f90d17a89971090aa64c1801787e9136977dcb3315acfe06168da4337758158f0d66d64e26f45274c577f995f9bc47ff37c533ea35e6 SHA512 421c37cd80241214b65663c6da83a97000254ee329d812ce463cb0b965dfcd41de2fe0475fdb760da8cb5cbe2c0647e6e23f11d6c69ae5bcaeb758e371ecbecd
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
index 32adc0716300..015a62c29d97 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics and science packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2017
 >=dev-texlive/texlive-latex-2017
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index 97735e6d5617..c525cd43fa1a 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -270,5 +270,5 @@ DIST texlive-module-threeddice.doc-2016.tar.xz 119012 BLAKE2B c27db6786bec940763
 DIST texlive-module-threeddice.doc-2017.tar.xz 119008 BLAKE2B e364557138a3dabc1eff4bef7ce2042a1f6522eb3b6ce84e1e3778c49707546271948e25c3650d3fdff3d07ee176f3071e3f7ba4778eff2ffda75b5d851bc0ee SHA512 976acf5671cdfab523ce1af8a3851a99bb154ae19e601d2cb6ee26f5f78d69b975fe8e73a6930c6dbbf086c5e574d83a279efac3d6fe3f376eaaaef7f05665b6
 EBUILD texlive-metapost-2015.ebuild 2087 BLAKE2B d1761344d2fd274f1e4f3cb111a187386e2ab2e4b29beb249340ea0ceeea52de4990d354518a7db5ae5a4d0f9ea4bb9303cc4ed454ec37853d6b2a12d42c0588 SHA512 a68c555617d120ff2c5b9799a0734dc5345e3da878d6db8fc49ab8273b8b2561ef1ca75fbe8d0cb755ccc84ebdb7bbbb113604702fc9067b580567e7b3ddc9a3
 EBUILD texlive-metapost-2016.ebuild 2194 BLAKE2B 2f93e3d25d7c77ddd8b392fe3c5349d8b3ec0ddbd462986f1200f73afb21d644ba2c8193b27af36ca4f8bd45ebf5c73e7fae967d2448800aeda2cb8405b3a514 SHA512 f586b069af46b2e854375c26dc035959682aa212056a7ab52f2a8f3af0d1e06bbaea4eccaefc03c1f2c0b69af74ba8a2088f301ffa8dc56e557334221869a012
-EBUILD texlive-metapost-2017.ebuild 2227 BLAKE2B a5885e81a1cb9e92389072ce14c81b823ecd3dd064f0ed89f9c89895a6ed7894a154c549d66c0cd8a43cdd11d11b4883be4362402ca370ea49c381716138d3bd SHA512 3d731edd0500e77a36e4aa654ac4d01b8066f5c58d174e9fea0c02fbf44d4ecfecb9a46d5812d3247fa3d5d0f68b9998c1edabf78a12f0fc1799f82e5f30d224
+EBUILD texlive-metapost-2017.ebuild 2226 BLAKE2B 5bbabd6eced79147e24ce82de91e2157118135f4184b198b968032f21198231ceafe8e3452fbf252dcdb1bf60b013f2c7dc4c128b598e09a1ff61736a66cdd19 SHA512 3964959c496773e5432475ec5efb11e72d86e1d322e31cffb2f6ad069a93da772f63e251b8c795a78d45cb432ec52c47faff8cd28f3071622f75024d7a301fc6
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
index 25dd4c84e4a8..8c1ec249015f 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 "
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index a810caae1037..0157bd54dde7 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -158,5 +158,5 @@ DIST texlive-module-xpiano.source-2016.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f2585
 DIST texlive-module-xpiano.source-2017.tar.xz 6324 BLAKE2B c3cf3e0a74df7994f25853fe895773f8b23733e71831060a4ba761fa1603ba4201e9e913e4c6008184c7159d1c331a6bd2c34d37b865d883b0e1b52f2d1b2687 SHA512 2566a4cd4070ae021ea0808b3c9ccf1d6a7add4f9e0a504c42f6c42ce659ddb6e9de7f7b8cd61f02a84c8bbb9163ac11aabb09c1b7efa4aa8a6e067ae3c129a6
 EBUILD texlive-music-2015.ebuild 1639 BLAKE2B ef6fcb260aca80084d8b6914808ca11194e5707589fd40ef348073fb592c82bef2abeaec1ae2affe3e1310d315776aad2416f137ac95df6fe0a3dd192e03507c SHA512 5984a2c6fa3e0fa3355ed7817496ab529efd02cfcec845058a284aace05ca459dda8da9ac317948f1e60e221b0bbfd65f0793799968539f41103afd83184879d
 EBUILD texlive-music-2016.ebuild 1707 BLAKE2B 13639fb9102b4b15c837183ec8a3ff8b97ba9acbcda5fc2e96950def41ecaea5988c009a738e81e1f940dfff5b5de9df1425d85eb548abaa06a743069e675044 SHA512 231669bffd8ff89c2afec839bab68363284e0384305eeb368030e1d699b55f16118777e759b9cf2a233200050e477dbf4a7fcf66adcdce8dda25be7c03cdda4f
-EBUILD texlive-music-2017.ebuild 1684 BLAKE2B 29ec326dbbc3fd17aa8bf543c024030a1d4a04e56b27e189e153f07384074015271568a86bc58626d0d74915421ed594a62ef0f523a0991b09c3935be97f3b84 SHA512 2738f42895a3af64fdd502aa22c198e85a1a47b031f20540b73f0c5580a626e950a80d19e1945e3d15ee259a7d433729dcbd6277443f6ae73a1d13c88dbd48e5
+EBUILD texlive-music-2017.ebuild 1683 BLAKE2B 2c3eca234416ac41e50d98d1a22a0ff7cf34a1cf0bc36ae2088ccd814c8102d60e868f31a147cf172b4029f92d8472d26340ac54b3b81866c58423f2733ee1bc SHA512 5f1217339b20598b61e47117399eb3aed746abd715b71fd23567d9b67857afbba378f7a4190fab838208a4eabc1ddafca6b2ebd7a6dca2e38f349efa2a900c4e
 MISC metadata.xml 444 BLAKE2B bcaf0689cbedb3dc02a63060d40765ba836651697d152028439119abff46f55cedd497220880d05ea00d5ac98dc61df77bd918c88e3d6fa783a356552be2b8b9 SHA512 2f4196a50ed70a2fe7a7f3d51ee5f3299682a7dcd06f0791ba128503d0bae27caf127eaa61e847644c06d40d3bc107977fe5546040e3eb14cae1705c570d6c7a
diff --git a/dev-texlive/texlive-music/texlive-music-2017.ebuild b/dev-texlive/texlive-music/texlive-music-2017.ebuild
index 11cb36f40f00..1079101ebf78 100644
--- a/dev-texlive/texlive-music/texlive-music-2017.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 56ab2e6a80c9..bc473df0a608 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -1011,5 +1011,5 @@ DIST texlive-module-xypic.doc-2016.tar.xz 3923200 BLAKE2B 3c0da6c849d411338568c1
 DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc
 EBUILD texlive-pictures-2015-r2.ebuild 4702 BLAKE2B 0f3de68fba8f5c5ab1d7da53cf684a74327decca7dce8bb9d9319c3fec4602abf8bd40be33338de28146690abcee14b24b5c07e1e340d2a4ca06fd0837bab411 SHA512 9d139b8e5ae9b39ca353f3542ecded6f474f1146c8d3076ab96f1e1c229baffb298af4a63f721b7bc604be67c4113f69e8d5bb97a82bad587cc7b5cbf29e7d00
 EBUILD texlive-pictures-2016.ebuild 5350 BLAKE2B 236fa6ce487c989244bbf50ba5a20f0b045ea069e9e399458d5efec652c09c2f38a89146d1b76f575083ae8019296e5d85524b576b2a8b4e2a569cd5a8be4ae6 SHA512 154546a58d9e46cc4ee55aae6af764294d9705b54499608a7916580b56414248f181831581ffaafad94061a513b8a90b466e7ba7d5f9afcd9b23f9839e8c1758
-EBUILD texlive-pictures-2017.ebuild 5547 BLAKE2B a8e67e028b674e5c6ad5128dec65dac14f999dec51cd9723138e56250316186d8bb2192918beea36dca8e0bc550aa43ed97f76d0553d6ac0227157b92ad6e3a4 SHA512 e85b04bb4f4a2b553370450777a695d0c42ac07504cef5e1af98177f406e94f3feacc787b8b6da9dc92bba48579e44a7606f0994c9906187a476a541402b1883
+EBUILD texlive-pictures-2017.ebuild 5546 BLAKE2B 85368b9bd11a7e5138e9570d0da690c15a9505e19981ff4ffa3ab05090213f9a92153bca977ebfeee950da70ddca29660bbf2772efe1b8a146570a94ec25b821 SHA512 3768164ebb96f261180ea0586370b97c4f1c87e8efe787a89ec1988de00e882a0bfbfba63b241ad261804940e62e26dcb7d7ecb6d3f56b5ba1919266f2677d43
 MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
index a7e884dc2638..f99082439df4 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-plaingeneric/Manifest b/dev-texlive/texlive-plaingeneric/Manifest
index 22c071587a73..bf00cdd7420d 100644
--- a/dev-texlive/texlive-plaingeneric/Manifest
+++ b/dev-texlive/texlive-plaingeneric/Manifest
@@ -181,5 +181,5 @@ DIST texlive-module-xlop.doc-2017.tar.xz 537924 BLAKE2B 99ca47024e0a88404dc3dcbf
 DIST texlive-module-xlop.source-2017.tar.xz 916 BLAKE2B 13e151cd8bb0bf1b2912b7e9962a2da70e52f24b6f8ced1aa582ec974e20c680befc949f677dcfa54c4f8f0a6266b14611022a28f1118d6b8e85a4e5c3495fcd SHA512 246d2ff227d6ab8ff9367f0ab26458e408f4919f84edba84a06c97c057ad4c217fdac5efe8dbae56bea66f4ec0133e9e94ce444cbac4a3c70e3d88b413b7de08
 DIST texlive-module-yax-2017.tar.xz 5952 BLAKE2B 41a9fdfa93d7f50c7977ed2270ba0c62b80f329a9ddc9b86ac909217ea6614884c0a58904a94109d2347fb7e5ad627dde5464718fdfff364d9c402b59645b359 SHA512 2602ad4d5487fc3ff982b9921c0f16b19b658d0d225cc4b40be98be4b7d6ac86666475955644d04d8ec0fabca8c566b1fd219797d2dbbec8b6d9becfeeb6d0f3
 DIST texlive-module-yax.doc-2017.tar.xz 123708 BLAKE2B 7a64cdbd2a8e88238f331fc2dd9f4350e02ff4cc9cbe32741debbd7a47ea4bd934cb751eb9faad159e594f6fbaf86ecca86d497795c7e2985e5134ceb879def2 SHA512 ead74dc1ee40a1b28cda1665969e3e21f1c1f153d6af1b74e1c1473c0edd79225e74a054416f0d04c432721c7ad80540d28566735e570234371d290033c9afd1
-EBUILD texlive-plaingeneric-2017.ebuild 2909 BLAKE2B e3a87c0ae2df60bb6c0271f04979416fe52c6c5b134efc3d4e3959f9590153692df14694871caa2222fdb2f019435cb2bf6d8d198b6477a285d74bb8bc0b8b87 SHA512 39561cf1c5aca68f5f746f0fa0d988c94935b0869fc7aecdb25d56efe02d774ec502dad8ec6fe06f32f78cc19da6275d5a787aa17096d5909bec83f16b53462e
+EBUILD texlive-plaingeneric-2017.ebuild 2908 BLAKE2B fc7b639cc7708511535507e38cc335d6e6d87a1e63e976c63e0c0fed1557032e151a60eb7caf28af0725bce8dcfbfcf73b589a0934c43d38ea2d294996a25919 SHA512 6d4418e992421653ab5a9c3727f6fbcd880037f5fb6292207ca6db287bb2ee6c9ca06b3ea001cc221ba9b22d8b6241bb9b0383e2f9bdae85111825af81ef49ab
 MISC metadata.xml 510 BLAKE2B 499e22771e566c734ad5e8c6a239863e8ba931da1b0784f3320e07d4741afd647cc893a2f0646bb2ddc6b17cb340303efdeb5c8c6d866caa9abe7c97a133a620 SHA512 651f52d36fa1f4c9b767e600554cff9a6a38b702727ca17db398eba1ec732e60351cabb4521bff8a3234230f645fbb9e24af342df28e857fa6d1c6f5ceb3f9c8
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
index 0774e33b87c5..c4734401855f 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !<dev-texlive/texlive-langvietnamese-2009
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index 6e302ba5ed62..b17d5de135fb 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -692,5 +692,5 @@ DIST texlive-module-vocaltract.doc-2016.tar.xz 15928 BLAKE2B 35c277d8ab65745bd41
 DIST texlive-module-vocaltract.doc-2017.tar.xz 15928 BLAKE2B 35c277d8ab65745bd415507cb2c3e056783327aab71d6918434675bb41febddd8b237abdbb5398e18d7ee959c3ab20597824a4ece759572f55871437e4cfc7d5 SHA512 38931f205f6a284a8e1397d74ea4987ed99317582f10fc5a28d3dcb06489cb6031d97edbc3a5a0c0bff25cb4a8c1b223da3491573bfaf26b6c76c5569617b037
 EBUILD texlive-pstricks-2015.ebuild 3837 BLAKE2B 988ad479cf87d9fcf47284366d8ff4c17a7dd863a4ab312d98bb7d1faca3910f99ac9cf11dcea7c2687a68d850dc1275933616d57c43f9dbb05dcda544eb0358 SHA512 7984d95ed298cc8bdf142b8d7d5826793cb0d0c0692625926fae792ac26ed8f634d91308c7a5916d2b0749e5895369078625ed64e8f7a01104100228f94a1dcc
 EBUILD texlive-pstricks-2016.ebuild 3906 BLAKE2B 48c1faa217c65c19a0b0dfc7f974c5e669b40dc2d6987cce7b3cf5fccc607e6a7a0469c447c020f3b185094cf48983a8cea2d79f9668398442d179cacbf92d2f SHA512 eab6117beb0d638c0c993a8a10a557a1002d96cb05f822231b3a89137b505fe2dfeaeb9ae3a4a49efbe4c9ce51612ae95327127b1062d13548c555660167b5ed
-EBUILD texlive-pstricks-2017.ebuild 3887 BLAKE2B 3a79c0f673f57186df2c172cb692edb37d4805c72f7e1fb90457c68ccff10dfc1cb4c29507e08248cb07ebd55ec2fca2e71b1e9cd7796d49f4ea8504f62e4a1d SHA512 e33fe830944bfe481d269793493beb80119c550d59bb9d93d8cf8bff4f1399f978cd23cadab4ac85e4d110d2e9e1c8d227e33dde9060ae2cf00f08564f58c2c5
+EBUILD texlive-pstricks-2017.ebuild 3886 BLAKE2B e7ffad7f3342ee4b5683c1d10b87f1847617e247dba3b7e6159a86455448290d9328b6ccd42e8e75c07aff53e5fff71e09204fe1fa68d0c570a0bc1c1d7f8ab7 SHA512 13d35845e5967821c1b117d44823641f056b8afe4a6aa16f47ccadb59f11fd9b0b55dc21e7ea8c7545168bfd594684f3783c8e4a602936366f15f7bb813a4ada
 MISC metadata.xml 449 BLAKE2B 524269780e1b502624f7ca03581ecaa6dc078802561231346bebefc0d9110aa0c8080b52e4ca3efa80c9ed5cd9a680d23a6228cbb693cd40c7d787ea24c7c06a SHA512 a3df336b00fc7b9c13cb71b5bbc2917fd5eabc00fe2cb341ecb845167a3f2d342025d4d81d22f421c79b2cd6fb14782cc1c5fcc54fe720b2e14d5e75f56eb58f
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
index 8a34b2bc35b3..ecfd3f48955e 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 >=dev-texlive/texlive-plaingeneric-2017
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 0afed7bbaaa3..10b0e8e2d9f0 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -1221,5 +1221,5 @@ DIST texlive-module-york-thesis.source-2016.tar.xz 12584 BLAKE2B 62d8fbc2d8e7195
 DIST texlive-module-york-thesis.source-2017.tar.xz 12580 BLAKE2B 1bae520b3031c8bdebef74a8391f9f89d40e9a0d0cd71a46285e0939f1c0fca4be0ef7edfc491f6f5eb4a48a61404a0026514fbf307ec6a3bc383fe95eb87ec9 SHA512 088375bfb5eb7d55150761e9e322f93e8282735740a30176c3c8e03e720692b3212ddbda85410429e477d95841f396b43a3998d6d03a55b8d3edde0ff592b1ca
 EBUILD texlive-publishers-2015.ebuild 5206 BLAKE2B 89eac7c490c9a707ab43b7c31b741b0af929fbaee896fe9f4cd3d002bf7379088f6ad89128a4ad4b97c7d6df882f5565bb44a4145cd1947794135e0480085763 SHA512 8b19b119e459b980432f71e41b89ed55887c79647facbe967821a282b7d4de691acc10da19634c6697240cdcf5e7d0970d6f11dbbb2afab200996d844f0b73b8
 EBUILD texlive-publishers-2016.ebuild 6003 BLAKE2B 51629da13cdd24d5e6992253133d21ff3cdb5fee110c7a349f59352def289b042aab1c1ed644604c06ff1480025451be33eb6d911cb811fe2363eacd5f6c2c65 SHA512 1698659d1889afd405fc2e94c2f4daab7ec18f0efb0c12267d2673a60e104e82711f1ef40fbca3d6cd6c34572dd991bfecf5fd1b1d78eea10ffa054a10d0a0d7
-EBUILD texlive-publishers-2017.ebuild 6175 BLAKE2B 758530dc5a216198db188c08344f112d154f48f6af64e3de4f09f871c61b674cbab0905e51517d4a34dc52d474494a260bdba35309dfabcc907e5c4d739da5d4 SHA512 d602a446acbbc5c8a7c084510441ab3a3b54c10850092cc15b96ea582def5da1f6d300cec1537904d386cf15e91812cb97978adea17e87e31f6bf2d4f869a1d5
+EBUILD texlive-publishers-2017.ebuild 6174 BLAKE2B 87a74b8a2fe879fce3ff656fbdaeb944850b59c459094d195c7736cf1bd39b3c89f55585c4bcfeb4260a7777be87cf6feb19dffd53f0dcaba04b2d0395fb5c0e SHA512 5d373491c9b89e6c364655f3c0c3190fbd666422772186ba1a8ea5900059c703fd4283c1d4f2ec1134d25d9ab4cbaa736bf83799900e0375387ead9d3d51d7d2
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
index 54afd0b38073..019ec75902e6 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-latex-2017
 !<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index 90373866fc53..c5c0cc643459 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -236,5 +236,5 @@ DIST texlive-module-xunicode-2015.tar.xz 25752 BLAKE2B cf329be8b01de223cec927cba
 DIST texlive-module-xunicode.doc-2015.tar.xz 588 BLAKE2B 6fd1bd78870423aac5f246596b46f120020199d00818701fa6a45e77d7dc3ebc547d352ee264c7b93b22b84586adb242f4e1aafbaf8a33259f8b2dda832069cf SHA512 25cb6d481074888a2a033950fce4779399b311b0fb0072abc41ad30e943e15b1321ebaaa2c34e0b90941ff3df1a2779aa1ef8c336ac93ddf1359bad674502baa
 EBUILD texlive-xetex-2015.ebuild 2137 BLAKE2B 718243970bedd524c327019733d9a32b15f9ef3163927113d783deb3721be873538c8fa6b0e092a6615ff3303784d3db56b7c8f8d95032b6fd5810403f2689a3 SHA512 1fa5f3642c6423469523e90670fed9fe21d45a8caf3abddf71219df821f7f956c89aa55370b899ea571bbe4dbf9aa8b7c6df38b58022da727350bb0946d502ff
 EBUILD texlive-xetex-2016.ebuild 2095 BLAKE2B 60f9f421b0a8e2eed9d21718422e93d0f97a50a6de7f5d9dfd128beb0eba742497ce87da878c16e651679d86b319fbf70135cd258b7c69b1cae0bf5c1a3de2b7 SHA512 1e14458de84ba0dfdc2d32594cb074981251b6915b7408cfe417d696c3d9e9af51de28c1135ae542fe0ec24710099da7198615c1da48e4cbe080c99a0bf01a67
-EBUILD texlive-xetex-2017.ebuild 2188 BLAKE2B c10af5825f1bf046a394f73a83d784ab5b8c24c48001a0a25d16666ed0e83498d0f102d392390dfac43db6056d1a6bd9b76a6492d8efef3b876765b1a2e576dd SHA512 a3535835926d1352e9ec4b682bb262f92716cc648d659f27cb920b923b823f53f93c3446521512b1dbf9fc058d64fbfab152b3b7bdd8832d0e0ce2e6c7c0ffe2
+EBUILD texlive-xetex-2017.ebuild 2187 BLAKE2B 9cc4ccb1b8868b3d23947d40d364542a5bb95d27117af0476d51e3437a6c6b2ae920fd5419a54af45afbde607b0cb3d90a471a8aef379a2f7b73f086db65bc6a SHA512 9898f5e2999519454f87badfa1e69770fcea88c2e05c6f5b0599cfd25c71c6768e1109a9d53afddd6613d8dcab5f6cea0b0cc1d7a0300d4a13f739ab9d9cb352
 MISC metadata.xml 504 BLAKE2B a78657320760b67ad93c4a3c8742b007639499446359800bc66c332b20dcdeec00835b9c17b576a45398efb5b15275427a74dfc1a474c513f8fb4eb0fc58d68a SHA512 c93e85dfe7e3cd8b815b3ceaa52f9fc91899eafa788904ccd10fea03bfbf40f5699e90f059899ed721a23f34b368885e38aa8e22e11f5950d3cae1bbe2626e96
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
index 8c2dd571cce5..fc7b054d3431 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2017.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=""
 DEPEND=">=dev-texlive/texlive-basic-2017
 !=app-text/texlive-core-2007*
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5d34c6d8df37..cc60ff7a2432 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/beediff/Manifest b/dev-util/beediff/Manifest
deleted file mode 100644
index 11ea48b13b04..000000000000
--- a/dev-util/beediff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST beediff_1.9_src.tar.gz 77382 BLAKE2B ee5ddb7a054ac81fbeb03eb948784320253039f01c47a14ed1193f4a8e608d80ba70041fb0afe3348b61680a911167910c22f3b664549f6ac6bdc1d32d31919c SHA512 b3aaa2f5ca6907269fb38c33c136928d379e85b776ad1fb5acb2217063a3f742a32fe59010672bc5c53644e878cb31fb044658f8ffb8b8481c9867dfe2bf64c2
-EBUILD beediff-1.9.ebuild 687 BLAKE2B cdeb5cfb2968d261aff4f10d0c6fb810ffc50da88fecbf776cf96562a00ffe6ee751df752e1bead9ec9a80eae9a08978518c131db4cfbb2fbb31a3c5e087257c SHA512 2e1f670d9967ff5d09ed07a443fbdbc881af1d2b1aa1780741ca05dfd27ea6c360ddc3d80811075564ecacfad1ba9703d406fab51643f1ac9eec636c88f64c31
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/beediff/beediff-1.9.ebuild b/dev-util/beediff/beediff-1.9.ebuild
deleted file mode 100644
index 291c7b1aab2a..000000000000
--- a/dev-util/beediff/beediff-1.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="A graphical user interface for comparing and merging files"
-HOMEPAGE="http://www.beesoft.pl/index.php?id=beediff"
-SRC_URI="http://www.beesoft.pl/download/${PN}_${PV}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i \
-		-e '/QMAKE_CXXFLAGS/d' \
-		beediff.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-	doicon img/${PN}.png
-	make_desktop_entry ${PN} "Beesoft Differ" ${PN} "Qt;Development;"
-	dodoc ChangeLog.txt
-}
diff --git a/dev-util/beediff/metadata.xml b/dev-util/beediff/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/beediff/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
index b148038abc78..db891843f02f 100644
--- a/dev-util/coccigrep/Manifest
+++ b/dev-util/coccigrep/Manifest
@@ -1,4 +1,4 @@
 AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
 DIST coccigrep-1.13.tar.gz 32366 BLAKE2B 8b9d8e0832c6bbacb3a8efd74ab8f4a0ec3112e935ddca63f345799ebc96a3dfbc8fe8e9fa77cee912d7dd5ee28c62e72ea00173e4ee4b16588b4b6e1eaf661c SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba
-EBUILD coccigrep-1.13.ebuild 1331 BLAKE2B 148d5bcec052c3030ed2568d6f91d4852d56a989f91b49c95351496f04fcaa6bb06589d1c238bffc419d2b7a7d6cf8f1c0978f8e2fc759e660481f8d4e844d73 SHA512 bfbfe08294264e7f982e2f68e0ce0ecf72bb28eaac4f73d6afe45a9a63e56350481a7979923588a825a0e2de249a86788b6adae7cd5274fb4991868354c37a45
+EBUILD coccigrep-1.13.ebuild 1336 BLAKE2B 7f096b29a8b9556a20b0253ec4016c21f15da1cc51d71dbb15057d0ae890e92d1b7b92d9c728520780ccb4a8b7602cfc6ac9bd45b0e6031d483e9483d0774aa6 SHA512 e8c7b1e718a98695eea59a7a76920c6e97b5967aaa0f961d76063f5d049dc687f274fc2c3fb3d34ba0ee090a07ff7d6dabd105682754a4211c4c0530a7a58de4
 MISC metadata.xml 400 BLAKE2B b233da69d5a9b48dc8349f1f0e746a5d39dbf14a2da934b486935e44d5a8219d7e771f880ce41d2005b2ccc75f5c982989008e7b294bb853d1e240203fb83d32 SHA512 785b3ffe7af1ca248f1aad24c21e3d5c5e0fdef899a7002ae53fea4a8fcafd3ad2d2e759540a1e0556853b62bfa7b0c27303a5be45bde5ce176db3be94c31c40
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
index 6cc6aa3b0ab8..f56d4bacedc9 100644
--- a/dev-util/coccigrep/coccigrep-1.13.ebuild
+++ b/dev-util/coccigrep/coccigrep-1.13.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs vim"
 
 RDEPEND="dev-util/coccinelle[python]
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index de4d05891bfa..f1efa8c333d7 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,6 +1,6 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2527 BLAKE2B bca33bdd0234c05252ae763c977a356ebf1faea0e6ef2d7f58a37b2f0887a0d412a2d8aa82e2b7307b8d0c730478fdfd636eb6c1eeafdcc4cb5e15794bb7d659 SHA512 faed2a5a7a28a9a0e907916fb0835703f715f3dfb5dca631126818bab314316f263cf69fdd07f877551f5b67b994c5bc3c0690ea644574dbc2456453a4278e74
-EBUILD coccinelle-1.0.6.ebuild 2535 BLAKE2B 929201d9b5cd3df87b12dbcd3b8b9c6dfeb56098c1f1e9a826573fff56e99843d17c852e0f39aa7dca9b060e69bec94fecf46bebc62f3fbc4c3a006a267f18fb SHA512 d39ac4d96574eefaa32e3b19456f0d01cd406363d631f866c17abf7557175738266c9dc0147889eda3ad26a4ad2c8af7246ef92b94f73135a2658bc17ed518ce
+EBUILD coccinelle-1.0.5.ebuild 2532 BLAKE2B 61181f5b7d0c9fc9412fc14ef043f65219318715f586105d75d7e5ea27e0bb95bcfa0870f41f98cebd6e6f30a0636fee8f0b0f46e806a3f743a00d86eba61d12 SHA512 4fc8095cc0c7ac610e5f73bb4bbc5fce144979773fff9047f54dfea8ffdc17c4d8576c9dd90059f778a8ec19f905a61f6ad29ef4a0a68629fedadb4c376751c5
+EBUILD coccinelle-1.0.6.ebuild 2540 BLAKE2B 250bbaff5f571d1ed9130840eebc1382813276ee32134664f9d8130a5d96050857cba62802eaa7f0e3929ff3bd9bc3d47bbc8c03b807f1628ce2b9617c92e576 SHA512 a81263ea8c9bd9323e96df6996bcb311bd6f7ab1a67444efe2c5ebba2f666395af4cdef9b9ddf0353d314ccb8053cb317b6f51f348c6c229cb45554e0d5fd93a
 MISC metadata.xml 350 BLAKE2B 0a338a957b414534b2bc01b9e916a93bc4b17d54b855b23d90f67af7f53a2dddded19eec734bd50edec0130b0b2210869c96c3f8cafe968446dad7d44b76740a SHA512 9c0be4d11897f712a537302f5f87d92cf8df5866e60d3293f5dbf7fe6dd1d88d5678e103319577b397546307604124db39ac47cde7dfb5e61141c43a0fbe5761
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index 5d511dcf7a2a..e4f865f92b0e 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.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="5"
@@ -13,7 +13,7 @@ SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 403ac36a8d1d..1e97b0576dc1 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.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
@@ -13,7 +13,7 @@ SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 6cf3acd9f0ba..a011f3269557 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,5 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.0.tar.gz 1149494 BLAKE2B 6be4edf8a122919570319867d2981fd56fe644093f83216fc17ff4d17e6caa13f163748b6eec68eb6ebab86259bf10fc8636670248fb382120a72738b918ac9b SHA512 5dc9a9910a76e31f0f9f845e1d59a0dc8371463de295f35090efdc16230b1458cc2d2f8632e91c46d18efb0c154874c65388cf6a37cca72b72f08d56b61cae72
-DIST drone-cli-0.8.1.tar.gz 1150026 BLAKE2B 25197e3e8d15f07026251d68689fea1fab03329121b748bfd3c06d6310fb76de743934467e7c453492a7843c7ee0a925161e7f4dd912949490c4adad1d896dac SHA512 c3f157ae4f7deebc1641e73bbbf218da85d0f732143941c2c37a52fd6c7db0951d6ed6dc6d55920641a3b9a7a10537813442353890699075bdfd072601b82cd3
+DIST drone-cli-0.8.2.tar.gz 1383569 BLAKE2B 570a8af9da23be7aac83299e3feaec17e09af4a506c715b636417b35f5f1e4253e3c049a44ceeb3ee056f9134463bdb5d8bbda8228b757178fa3022461d13909 SHA512 cbf32882bf7ce1a29ff37bd600f60b3fd3517d56803fca7575fc4595c2e398ce2b4cc760ca03f16eca414386e6328ee782726c9720f9678457bf97c56f24f232
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.0.ebuild 784 BLAKE2B 18cb3725cfcd63ec71ecc2b060e642b6d7a1975a53aded45e14420e7f39992c52109ea943bb4b8f10116901f68cd9808c23e7b922bf089bf1e4a7e88970b2fd4 SHA512 3dcf6b16268b39b395db9e1b0164e74847ce411862de4f789a2d2c48a5844b39c54696df2306aaa868212d51e0024fc70dac1d90cfc1b69b1f9835ba57547ffd
-EBUILD drone-cli-0.8.1.ebuild 776 BLAKE2B 91e46038938be9e771d9e979f9663e9843e013f3cc4d1bd835270152374414b8b85a5eaec144ccf2e5b05c0f8830d35a7aa80d9cb5f64f6ad2ab90ffa01c73f7 SHA512 c95490546d157429a0bf1121a3e44794015d357ff3b9977325c89769c332311d469147fd620e38d8799ab1d4307f29170495169ec9d97b8fa7f42591506f87dd
+EBUILD drone-cli-0.8.2.ebuild 776 BLAKE2B b34171f2374a53942f1ea7cd45d6df56cbbe048be116fc0264a651c3b4526109b471b4fdb8f3981bd6c6b267041bc63007f0234b987582b118d054fb645699bd SHA512 6dd61f938441c87273dd58150b49fbe5d9e61a962a018d7fec68a5e18011cb3f65fb15fdebb55b2b7c9d743bfd3bfdd3d21f98a5974d36e2c3f2f1e22a303354
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.0.ebuild b/dev-util/drone-cli/drone-cli-0.8.0.ebuild
deleted file mode 100644
index 2a1ec2b92731..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.0.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
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="d7b19e6f6f581880352f232ba3453e0b769a9dca"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-0.8.1.ebuild b/dev-util/drone-cli/drone-cli-0.8.1.ebuild
deleted file mode 100644
index 950e201a21ba..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="1cb942f726e6c616bb78c85b70baa61ba01152a2"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-0.8.2.ebuild b/dev-util/drone-cli/drone-cli-0.8.2.ebuild
new file mode 100644
index 000000000000..227f4987dfe1
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-0.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+EGIT_COMMIT="91d29707ae30f7ffb628c0397dfaca1c986be5ce"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index ace2cf421347..bdbd5a252476 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,5 @@
 DIST goland-2017.3.1.tar.gz 213951052 BLAKE2B 019ebf772443dd9f5e81cfb3717f5e4cb19ec3c8a67eb20037b6b72c97bf3e382e073660021aac22c3e6dbef9b71c4642acd026e10f27e09a5c60002cc2fc84e SHA512 b4d0251ede2a80b1cabf6b29e362a1679929d4f24530a88f6bc80482bb8fbd36d0d619d94b0cce45ca2c92142335a84141aa6e54fb42154ac09097e8b7318a16
-DIST goland-2017.3.tar.gz 213261483 BLAKE2B 4c84d073265fc701dc0f34571850c2fab05e2e07479d9dc886af660a097a361a5532cf9078569e9dc8cee0322f92544683e9c05689d025bb39de925a10e05c2d SHA512 5fa8d61850e31c1db82e32d9ccccaad71fc00db85a31bc423384b443819d9dc6f3ba11399c580d8eb9c3fe698b437c13072fc49126359bd405b7d57e12c92328
+DIST goland-2017.3.2.tar.gz 214008724 BLAKE2B 682860f2dfaa96a97ac91eed2a49aa4ee524154df5ba10936b1cc2f816e837b21b27f9da9641c06e5b028fb44d03933abc6b64b87e286e1c38a4c08b92dd2626 SHA512 3488905d1c8944b80f24d40e910da2c04f06ee6dcc08620ffbc7b96c0214d28e00f36b85a178ee9ede8c08fda89294e0d10b99c6929eb595284fc937270e17a5
 EBUILD goland-2017.3.1.ebuild 1043 BLAKE2B da6f4c5156e10afe541dce7dd6f3221488cc5cc893a5ce198c0a77ec4de7b40e9ace46a3675221dc52ede0c5243ae884fe5f682d4fbed018f29719a7991d025f SHA512 0b15d7f4eef60f271ba5df45d9dadb704b8bb5eee596b3826d871f533c6efe6b1fb4ea90148346caf3d684ec485684cd0c995388487506cbc0cca0f3cbdecf0e
-EBUILD goland-2017.3.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
+EBUILD goland-2017.3.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2017.3.2.ebuild b/dev-util/goland/goland-2017.3.2.ebuild
new file mode 100644
index 000000000000..d46b730ae466
--- /dev/null
+++ b/dev-util/goland/goland-2017.3.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/goland/goland-2017.3.ebuild b/dev-util/goland/goland-2017.3.ebuild
deleted file mode 100644
index 3698daaba68c..000000000000
--- a/dev-util/goland/goland-2017.3.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 eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 6d572f95fa3f..c6f8a66f8fab 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,6 +1,8 @@
 DIST include-what-you-use-3.9.src.tar.gz 446773 BLAKE2B 6b8e66e7ace440ff793c07fb3a4c3db95418f213c629b119fff315559bb581a04b864f5a8cf2eed2221dca84af23fb7ae0c3b3a2c4a59af88bf1e656951f5e8e SHA512 dd7990fa4112ddb0434807efd9dcf0f77bbecaa61eab51be24428f8e45b9321c7647a979278f3f1266ba9be05c6f1de536fc084613d38638b795248001ce4b44
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
+DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 EBUILD include-what-you-use-3.9.ebuild 973 BLAKE2B 61940f05ffd32b4012be4d1710d69adfbfa5147151fd328be078d5663d73abf19ab3bec49ecf30d4a9a7ec91712162f30ecb53d796a38ef433282c8cb928aeb9 SHA512 954ea8edd222088d445c7330a6ac0069e0130729dbcb1068c889af9737cde2b31f06761216970a1cf009d39dc75b0c4f884335aeff0a844cab556bea411b6364
 EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
 EBUILD include-what-you-use-4.0.ebuild 909 BLAKE2B ef96edb28020f98a91316a4cf7e05a385f3dddd1224e326b6d42e7fc67c4a7521973cf4dc47111e9ae15440b20b16ad046417b9af7f17d61cb7cc74d336e81c6 SHA512 e99495f5a7b6c59727920370b3fe63b031841693eae43bdf33b3130dac0b9794140952390f29aec0f52421c59a084a457e375caf1d697f5d015342febd519931
+EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
new file mode 100644
index 000000000000..92dc8c8d1911
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
@@ -0,0 +1,58 @@
+# 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 cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=5
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
+		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
+
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 63143869fb88..221fc2ad04dd 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,12 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.89.2.war 74294776 BLAKE2B a163d6bd542b01cfcd5781fab524d91ec74ff0dacced3213366832e6839616554f0c42dd1ed580c55fccda693736b5f4041a6eff7bc5e66a6edf608ce3126bb3 SHA512 dfaa5ce0e3cf679fff8f3a1234db8dd88087d221cd1d0f4a84c2a41a5463f9fc2645fa9ba3bcd86f793bb07ef74a0efb3075fd28f3fdf7ccffb18904a8a69231
+DIST jenkins-bin-2.107.war 74518540 BLAKE2B 13aaab2968afdc3d8e2f13086bb480f0a798b736f0b8ce2c80537858cbba5b62efe12806beb22342daad5500f4f81cdcdc00b14e29f9e2ca0e7b5fc1f1c2c406 SHA512 9739e7d63ac7996f731abf43ae91a248697771974fac2763cc8b3838ec52b2c25b609e73d6a58b650994576e7d27c856e30dfbe08b16f597c1be80a9a2579745
 DIST jenkins-bin-2.89.3.war 74292096 BLAKE2B 63df34eef6786ae81ed8e6d486b77e13125fb3b74ed6db03ea45d2c57d9f49c6648e2ffcd4b042261de287cd60a13a43a7e93f151b32b113c8847221ce4594ad SHA512 777b4d7cf1420cbc6bc7da22a0ede75fc07d5d66af500f6e7ebde75475c7046051da6c18f695bdfd4dd238b57355828a5d5b43775a8b4eb3bd84db35d18a9874
-DIST jenkins-bin-2.95.war 74275142 BLAKE2B b2865010628940f216bf39847203d786ef63ec8f18b8adabec629b7ef7b01681dbdd381738163cff9c04f75b50705cfa5c9aad9bcf038fbfb9c91abb738fc1b6 SHA512 2002953a49cacdac8a93f24335d489dc4c10c7ae3f3bc80b4f6dd524a5ac1984fc7229c570e0c79dd53c51bf609cc989193c0a6881f2e0b9d8dd49e47bad20dd
+DIST jenkins-bin-2.89.4.war 74297875 BLAKE2B 05e243ac84e6a9a377dff3962d3e2f4f729d390bac9d5de27a19641babb24ab95b5e8cbcf127df7170928a902e267b0d4e497ba08ea99080f610bb4d5c7b12d4 SHA512 eba6d7ee6f2cd452d805ef97c15fc794424039efb4f1d8b7c0cc463c21c856c02455187cc24360847fd7ac06e816f37964b9a4d99fd306def6c713ed0339e2f7
 DIST jenkins-bin-2.97.war 74297213 BLAKE2B 374266b466736d8e6b6abdef13718e132336525926f28c6ced413dd1a091568bae81900133efc5a0efa96e41847e17b483e8842884c3efa7457c59cdb4bd32f6 SHA512 e784e35136c079caaae12788afa093830cd4d1d4f657b2f11571db5b7a3fa3271d2cd50a8793097905bc0ba67b8ad0bf78b94db00d86ab722453f4c0a41f647e
-EBUILD jenkins-bin-2.89.2.ebuild 1110 BLAKE2B 19defadb6c4401f2f8cdfa8375dfe2ea7e5c92e2c97eaf59d376bcaca38fb2d02ff618c76da1f1be57a198effb75417dcc8332c65c0605d580b54bc95b70de56 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26
+EBUILD jenkins-bin-2.107.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
 EBUILD jenkins-bin-2.89.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.95.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
+EBUILD jenkins-bin-2.89.4.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.97.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.107.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.107.ebuild
new file mode 100644
index 000000000000..4f30f3987712
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.107.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.89.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.89.2.ebuild
deleted file mode 100644
index fb976b69a9ff..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.89.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.89.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.89.4.ebuild
new file mode 100644
index 000000000000..95d08ad47b24
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.89.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.95.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.95.ebuild
deleted file mode 100644
index 2101948a704e..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.95.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 4ef654f9d801..b7e8ad14c69e 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,6 @@
-DIST rosdep-0.11.5.tar.gz 76136 BLAKE2B 88c78dbdab31451ff819972425c7d444cd8b447a15ce4a90c0efc1ad32ca81585782010123aecc7bb32fc539deaf6dd31bcd743be6e208be6f8bdccd3ce8b3df SHA512 593ca209714945e79ec878e0e84d086645bea9095bc2fbf0a3ac48b8696c8694990f554f160b8271734e2980d95390dc2dffbd3da765c43c505d8b2e1e05e381
-DIST rosdep-0.11.6.tar.gz 79121 BLAKE2B 53bc1679127a280f82af5e20997b94ec976a9c9f293c7ea0f7eaa980954753016f68094262150f3c505663c90b0dc97ab29ebdf394d34897c7f78030cf8ff556 SHA512 f662ab62951d84db1af48978791304e0c1800929a1ae89c360a042a17bc48c2ff6b7ea790fa7fc16852fb5f09f62e9b800d7be7f71ee18124102e48f030e3b2a
 DIST rosdep-0.11.8.tar.gz 112899 BLAKE2B 863cb6caaa1748477ec6216dbcdaf1c547135e2aaddb533373d20cc84bef51f640ce3544aaf99821c749b953effd594cc1909ca7e05d6fb3e277ae806747c5a8 SHA512 9fe44eb2dbcdfce0ac6df9b4f6926d26fa12d9fe4089976a460448dc6d4ecb893c0c7cb6b6e9f16bd07da0be4088d7d3eb594d2c0fad6f77d8728e2873cbc344
-EBUILD rosdep-0.11.5.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
-EBUILD rosdep-0.11.6.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
 EBUILD rosdep-0.11.8.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
-EBUILD rosdep-9999.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.11.5.ebuild b/dev-util/rosdep/rosdep-0.11.5.ebuild
deleted file mode 100644
index 463cc83cafbd..000000000000
--- a/dev-util/rosdep/rosdep-0.11.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.11.6.ebuild b/dev-util/rosdep/rosdep-0.11.6.ebuild
deleted file mode 100644
index 463cc83cafbd..000000000000
--- a/dev-util/rosdep/rosdep-0.11.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.12.1.ebuild b/dev-util/rosdep/rosdep-0.12.1.ebuild
new file mode 100644
index 000000000000..842ec4941e9e
--- /dev/null
+++ b/dev-util/rosdep/rosdep-0.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tool for installing ROS system dependencies"
+HOMEPAGE="http://wiki.ros.org/rosdep"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+}
+
+pkg_postrm() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		einfo "Removing rosdep default sources list."
+		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
+		einfo "Initializing rosdep"
+		rosdep init
+	fi
+}
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 463cc83cafbd..842ec4941e9e 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-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=5
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 59c34b9090c7..d893022bd64f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,6 +1,6 @@
-DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
-EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
+DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d
 EBUILD strace-4.20.ebuild 1960 BLAKE2B 65781937316df4e01de886b552b02834c37411a1c004de98b6e95e7dd2b6c9b11bfa27de5effc9661bbc341172d1cedae180e6488abca43c014e18949fccc3f3 SHA512 ca60303dcd6526df451f516dd519406e0c0160b92d400e1c44c1fac8e5df2874ae2dc8c9a2dc0297d6354246302e8bc7af20522d2422de2df858b3b1348da2fd
-EBUILD strace-9999.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
+EBUILD strace-4.21.ebuild 2109 BLAKE2B ab88781b7c02413b1c458a92bc424159e8302c2407d8d4c281ebb259e5e3ec5fa59df9c0ee6e69f6d639106b82f3af7c5f1d5282038433a8e4f401818bc10092 SHA512 5d5a2e17d23a2705e0011ab5ad1c5635f6548d81c7ff0f5592880794e711305a6af05a0f10797bbabc16d2b28edcf9326df513cc1b485fb62aad965c2fa46eb9
+EBUILD strace-9999.ebuild 2038 BLAKE2B 61c00720bd641dfb3f9fae3772c0c6313e904d07a8e635b1a5b3dfa263f0c810f237f34b87b6bba055e2876d10ddf793a4ca74aae40897a2beb4581be182623e SHA512 23e56bf7661d29d8331d51f68c732ceb2db55ff2a88927f4f9281beca96c0d30d39c3aa1e19f5509f22c3c2b40bfef6668e4cec0b95bdde53b9f9ac7fe1c3ba9
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild
deleted file mode 100644
index ad9e35e242c1..000000000000
--- a/dev-util/strace/strace-4.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
-# strace only uses the header from libaio to decode structs
-DEPEND="static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	econf $(use_with unwind libunwind)
-}
-
-src_install() {
-	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.21.ebuild b/dev-util/strace/strace-4.21.ebuild
new file mode 100644
index 000000000000..0a2a04c8fabb
--- /dev/null
+++ b/dev-util/strace/strace-4.21.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	#EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	#EGIT_PROJECT="${PN}"
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind"
+
+LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		./xlat/gen.sh || die
+		./generate_mpers_am.sh || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	econf $(use_with unwind libunwind)
+}
+
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	use perl || rm "${ED}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index e445febc7869..8e7cd87aff5f 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
@@ -38,8 +38,8 @@ src_prepare() {
 
 	if [[ ! -e configure ]] ; then
 		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
 		eautoreconf
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 198452942eca..93e4f1254b97 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 238973d785db..50c6b8e71e80 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -30,9 +30,9 @@ EBUILD git-2.13.6.ebuild 18874 BLAKE2B bcafbe72ca9e7b0d1f8c6c43461ef1d225ca2ee18
 EBUILD git-2.14.3.ebuild 19352 BLAKE2B 375c5540c22cbe94fb89f81b099f3d29a92f4f6ef5757792ba80d2b839451988bb9bdec65720b8be7e47dc2ffcea47eeb92531da930705d1c4d40094c435fd56 SHA512 9fee218882dbccd73ea9f0014311630a50194dc090a7a4eddf5970c6c7e675a7a98e2849a9ff8867894f1d84d5ade79ac3edb6a9784005b5d1a6f5c6deebe4ac
 EBUILD git-2.15.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
 EBUILD git-2.16.0.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-2.16.1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r1.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r2.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999-r3.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
-EBUILD git-9999.ebuild 19355 BLAKE2B b286bb11c1b50affce296a56465bea7874e56b70343c43c8d7cc8fba872ad92f463800652517434039fe91d2268ea1e469113d09391602ca18a42f0b3b52e2bd SHA512 040fdda804318cd6d42882f98588d7ad5a105af11cbd879532d45c8438e3854f4be8f58ec8bc2a05393edc526950e135f22f547b4efd212e3bedce1cbb9b70fd
+EBUILD git-2.16.1.ebuild 19266 BLAKE2B db732dbdcc07e3d904aafadf29c6a604c283191f7d09357155990e995956f29aa5e4d90fd1abf8a9ae9ea962af832ed2be67c26ecbd4b74990083993bc1b266d SHA512 12d1a033926417dd00abfed6f2d1896ec950de8db1f8ddae3f8f56667cc6e078b81774dc487c457e019aa1abb7d624e8c644e66d2899a6f2991de26e9a3560aa
+EBUILD git-9999-r1.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999-r2.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999-r3.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
+EBUILD git-9999.ebuild 19268 BLAKE2B c5d980343d17117b4a61bd5ea470b507fdc9061ca760b0140f3591a16f8cc5eeb4756db1bf8c1ff8c984bcd85e5b04e4ce251122b26a55282c0381420ee0dfef SHA512 e3fc8dbf927ac71d8e9fc1caa49f5359f2f6fd8999637d30a674793c16a4be0fef5b9249e87273f0b2289e1583efc724ef3d6fd3bc28d8088dab92617dbf6245
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index 67a7f811554e..67db3890c141 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 67a7f811554e..e9f0c242bcf6 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -572,7 +572,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
+	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
@@ -603,7 +603,7 @@ src_test() {
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
+		disabled+=" t5000-tar-tree.sh"
 	fi
 
 	cvs=0
@@ -612,10 +612,10 @@ src_test() {
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
+		disabled+=" ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
@@ -625,17 +625,17 @@ src_test() {
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
+			disabled+=" ${tests_cvs}"
 		fi
 	fi
 
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
+		disabled+=" ${tests_perl}"
 	fi
 
 	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
+	disabled+=" ${test_svn}"
 
 	# Reset all previously disabled tests
 	cd "${S}/t"
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index f2d247904c0f..b614c4bbd66a 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -1,6 +1,8 @@
 DIST tortoisehg-4.4.1.tar.gz 7923557 BLAKE2B b2574bb87693a3fb824c3c02424b8f5828c1e3673b111ae82ff0692588083eec639a67b200ce6e3def58e5a0e021898c3df62a053fa61d477f92d4226d3a1b69 SHA512 b364e6d16845c03aacaf691e8528e0bd87151026f9f55bcaf61ba67d1eebfc3f9935457e5ca3391e29417682367b9b33803a9870817c22db31f1dd26850e9d53
 DIST tortoisehg-4.4.2.tar.gz 8939270 BLAKE2B 858ef57f6e80244ebb99b43608b1d939896f60d2154e461a128efdb0d5ebffbf1b8d5a9a40596316b0bed8edd74e292b5e562e3119f75177d430c081ba07511c SHA512 6b0335d8022d015846d456d351b168f826afa5223b77ee45f2124fbd1099904cca4e2a3ca6cb7a48324491211a149bd431d29fab6932e8f8240542e13d814381
+DIST tortoisehg-4.5.tar.gz 8941832 BLAKE2B b5dda8acf483400bc7cdcc511ca26bb7edbda94aa7ce03fe2b2e3eadc4e7616a7773e7aa974815d51e06a0a8014186b3cb1817eb751509ee85db8b1a3cd4a5b9 SHA512 258956c1d8f7e3b47f35be1d4587a51bbf79d3b9bd218ab16dbfd36c366570b3b8d32fb9b9af54c3389f69e98185185e7900e6f26fb46d6024c979fb6dfb0f3f
 EBUILD tortoisehg-4.4.1-r1.ebuild 1958 BLAKE2B 9bcbdb8041527e8f28e3fa892c1361aba4bef802795d3031d3743713a3cbaedbe5ee36190f5233e6677714bed1462e6033f8fbe2a9ca8908c55de58caf32ac5d SHA512 f5a6d20b69f1196892fc7f7a66605653ea397881122bf9164260160d1be2b05490ee724be7b959bccfe9cb3cb6d92c6feac431e17cc7277811cf8d2e3c5e1c16
 EBUILD tortoisehg-4.4.2.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
-EBUILD tortoisehg-9999.ebuild 1960 BLAKE2B 0b7e73641f2cca4e70f52000e1d3bb0a5a7782a067fff385df4516c9c95b472c5e3ba0a3a9fefe9062d12ee571e8a98714ab073c28ff95fe395a133d35f18218 SHA512 fc5a09758d42c7c6e789607eac3431f8c310490c11e682be905bf7aa2299e5db3bd51692b9438d61521bd4cf16a856e0f6b5091fce23a986f08c22572b1e4afa
+EBUILD tortoisehg-4.5.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
+EBUILD tortoisehg-9999.ebuild 1956 BLAKE2B 455f8582101c7862cecdba7d683a0fd4eb27c595435ca66819104d94763456c6c8dd4c68f941d9d40b9bc14ff1b73a6c986e4ecdc290d93cd2701b6e53721ae3 SHA512 530d586ce4e1157b10de3a08be0498191827510626e975448ba5dd6e084d5263b14f228043896fab0d87a107ff6f97aa9cfd78b7fe2a505f3f696251d68a56de
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild
new file mode 100644
index 000000000000..3e6b1f3db8cc
--- /dev/null
+++ b/dev-vcs/tortoisehg/tortoisehg-4.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
+	EHG_REVISION="stable"
+	HG_DEPEND="dev-vcs/mercurial"
+fi
+
+DESCRIPTION="Set of graphical tools for Mercurial"
+HOMEPAGE="https://tortoisehg.bitbucket.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="${HG_DEPEND}
+	dev-python/iniparse[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[network,svg,${PYTHON_USEDEP}]
+	>=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.3 )"
+
+# Workaround race condition in build_qt
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	if [[ ${L10N+set} ]]; then
+		cd i18n/tortoisehg || die
+		local x y keep
+		for x in *.po; do
+			keep=false
+			for y in ${L10N}; do
+				if [[ ${y} == ${x%.po}* ]]; then
+					keep=true
+					break
+				fi
+			done
+			${keep} || rm "${x}" || die
+		done
+		cd "${S}" || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
+	if use doc ; then
+		dohtml -r doc/build/html/
+	fi
+	newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg
+	domenu contrib/thg.desktop
+
+	# Remove file that collides with >=mercurial-4.0 (bug #599266).
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+		|| die
+}
+
+pkg_postinst() {
+	elog "When startup of ${PN} fails with an API version mismatch error"
+	elog "between dev-python/sip and dev-python/PyQt5 please rebuild"
+	elog "dev-python/qscintilla-python."
+}
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 441fed1aec6e..3e6b1f3db8cc 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-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
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
-	HG_DEPEND=">=dev-vcs/mercurial-4.3 <dev-vcs/mercurial-4.5"
+	HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6"
 else
 	inherit mercurial
 	EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg"
@@ -36,12 +36,12 @@ DEPEND="${RDEPEND}
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
-	if [[ ${LINGUAS+set} ]]; then
+	if [[ ${L10N+set} ]]; then
 		cd i18n/tortoisehg || die
 		local x y keep
 		for x in *.po; do
 			keep=false
-			for y in ${LINGUAS}; do
+			for y in ${L10N}; do
 				if [[ ${y} == ${x%.po}* ]]; then
 					keep=true
 					break
@@ -68,7 +68,7 @@ python_install_all() {
 	domenu contrib/thg.desktop
 
 	# Remove file that collides with >=mercurial-4.0 (bug #599266).
-	rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
+	rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \
 		|| die
 }
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 5e36ab8be513..d6a25e3b0b67 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 8b3ee0bcebd2..cebd8f69d5db 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -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 or later
 
 # @ECLASS: ant-tasks.eclass
@@ -69,15 +69,13 @@ elif [[ ${PV} == *_rc* ]]; then
 else
 	# default for final releases
 	MY_PV=${PV}
-	UPSTREAM_PREFIX="mirror://apache/ant/source"
 	case ${PV} in
 	1.9.*)
+		UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
 		;;
-	1.8.4)
-		GENTOO_PREFIX="https://dev.gentoo.org/~sera/distfiles"
-		;;
 	*)
+		UPSTREAM_PREFIX="mirror://apache/ant/source"
 		GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles"
 		;;
 	esac
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 574049b051a7..a759f416747f 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index fc8dce592844..7fe5d9a618d6 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,4 @@
 AUX urbanterror-4.3-fix-build_system.patch 1927 BLAKE2B 0a451f82e8ddfa8ca7c394dcce3af2d8e7952d3443820ace01f6754c78f4c0cd983a9b6cb31188d07c60d535cbb299a4e59b52ceabafed6516b679a2c0d96fa6 SHA512 a2ba20e40dc00d066d48399a00b53cfe2b23854f09be82fc5a986b93ca409559cda72bda50f7135ae6a01801cf8171784628d12a4b2440e63eaf68e4bfb3f1b2
-DIST urbanterror-4.3.2_p20180206.tar.gz 10071986 BLAKE2B b809793f8bc1d878a97d882f60eef80124cff63ca5754f9178cdf9067acc2c6b52478362b8799c7b3718484d1a680ca932df8d97ebb34e35fc90eb2ae17582d6 SHA512 e4fcc53f9a7b8db1f5bc069acce5265db7009acc0588b29fff2a2b19b05d09f42cdb2c3f1811920221c75b6d3fc5f2e67fbb0f8476ee50644d8db9dd4f0b7c63
-EBUILD urbanterror-4.3.2_p20180206.ebuild 4548 BLAKE2B c05f027eff07037375f655f26fdb6d1aa7b232227dbad27a77cca7268ccae01933eb8e6191ba7cc6e9b20df613deeb0bdc7773ed805f7827da1dcfd62895f931 SHA512 92f6d1ef7dfd0f8ebb43bd9024ea75c3098573dd7933389d50f07ac9f7512d46ac478979999ba0319f09fa173cf24d2ec584b74321d61f719c97bae4513d36bd
+DIST urbanterror-4.3.2_p20180211.tar.gz 10071334 BLAKE2B 43bdbb59c7f4d7a02e87035d446d4e9dc91a2b8d2299afb97b09aa91f4062b732a71e9d624058d947dc5005f911b60f5ad7242b75b96d7e6fe750a01bc4a5494 SHA512 f55052f3fe5984af7d75aad95dc0673398839f8f79ed9d2a74865072f700712c9968c51e13e8e12d5b4c6b508a0a51b830d8c0afa159b88dba8200f7854f3da6
+EBUILD urbanterror-4.3.2_p20180211.ebuild 4548 BLAKE2B cf80a71ccd741f3c18c1c6a30b101707904573f6fada03f8fee621e2c6b75c96b2043acf0e74c51eea803618617b3fb78cf1417ae28f918ed748414a27a81477 SHA512 b2ca6921e9fc1ee1ae6386ec8cbf1905896d8f86d59bd05125c25aec4ea493e2349bbc9f299e73221b2be84240e305f73e1538225af32d831e41046b226b0984
 MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
deleted file mode 100644
index 93dc5736a99f..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
-	EGIT_BRANCH="urt"
-else
-	COMMIT_ID="11a2b7462574a913e8960014cfc504f37903a3d6"
-	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-RDEPEND="
-	client? (
-		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-		mumble? ( media-sound/mumble:= )
-		openal? ( media-libs/openal:= )
-		opus? ( media-libs/opusfile:= )
-		vorbis? (
-			media-libs/libogg:=
-			media-libs/libvorbis:=
-		)
-	)
-	curl? ( net-misc/curl )
-	~games-fps/urbanterror-data-4.3.2
-	sys-libs/zlib:=[minizip]
-	virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use client; then
-		if ! use openal && ! use opus && ! use vorbis; then
-			ewarn
-			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
-		fi
-	fi
-}
-
-src_configure() {
-	default
-
-	tc-export CC
-}
-
-src_compile() {
-	# Workaround for used zlib macro, which got renamed in Gentoo
-	# wrt bug #449510
-	append-cppflags "-DOF=_Z_OF"
-
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	emake \
-		ARCH=${my_arch} \
-		DEFAULT_BASEDIR="/usr/share/urbanterror" \
-		BUILD_CLIENT=$(usex "client" 1 0) \
-		BUILD_SERVER=$(usex "server" 1 0) \
-		BUILD_BASEGAME=1 \
-		BUILD_MISSIONPACK=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_GAME_QVM=0 \
-		BUILD_STANDALONE=1 \
-		SERVERBIN="Quake3-UrT-Ded" \
-		CLIENTBIN="Quake3-UrT" \
-		USE_RENDERER_DLOPEN=0 \
-		USE_YACC=0 \
-		BASEGAME="q3ut4"\
-		BASEGAME_CFLAGS="${CFLAGS}" \
-		USE_OPENAL=$(usex "openal" 1 0) \
-		USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-		USE_CURL=$(usex "curl" 1 0) \
-		USE_CURL_DLOPEN=$(usex "curl" 1 0) \
-		USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
-		USE_CODEC_OPUS=$(usex "opus" 1 0) \
-		USE_MUMBLE=$(usex "mumble" 1 0) \
-		USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
-		USE_VOIP=$(usex "mumble" 1 0) \
-		USE_INTERNAL_LIBS=0 \
-		USE_LOCAL_HEADERS=0 \
-		USE_ALTGAMMA=$(usex "altgamma" 1 0)
-}
-
-src_install() {
-	local my_arch=$(usex amd64 "x86_64" "i386")
-	# docs from ioq3, not from UrbanTerror ZIP file
-	dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
-	if use client; then
-		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
-		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server && ! use client; then
-		# dedicated server only
-		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
-	fi
-}
-
-pkg_postinst() {
-	use client && xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		if use openal; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta s_useopenal \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		fi
-
-		if use altgamma; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta r_altgamma \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
-			elog "Be aware that altgamme works on a global scale, so external"
-			elog "applications like redshift can cause trouble. Disabling"
-			elog "these while playing is a usable workaround."
-		fi
-
-		if ! use altgamma; then
-			elog ""
-			elog "If you are using a modesetting graphics driver you might"
-			elog "consider setting USE=\"altgamma\"."
-			elog "For details take a look at:"
-			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
-		fi
-
-		if ! use client; then
-			elog ""
-			elog "You disabled client support. You won't be able to connect"
-			elog "to any servers and play. If you want to do so, enable"
-			elog "USE=\"client\"."
-		fi
-	fi
-
-	if ver_test -ge 4.3.2_p20171105; then
-		# Yippee, new features!
-		if use skeetshootmod; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta sv_skeetshoot \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	use client && xdg_desktop_database_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
new file mode 100644
index 000000000000..d96a973d0821
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+	EGIT_BRANCH="urt"
+else
+	COMMIT_ID="41425855eba78b31dde895116c4db2e8ce77a2b8"
+	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ioq3-${COMMIT_ID}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+	client? (
+		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+		mumble? ( media-sound/mumble:= )
+		openal? ( media-libs/openal:= )
+		opus? ( media-libs/opusfile:= )
+		vorbis? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+		)
+	)
+	curl? ( net-misc/curl )
+	~games-fps/urbanterror-data-4.3.2
+	sys-libs/zlib:=[minizip]
+	virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use client; then
+		if ! use openal && ! use opus && ! use vorbis; then
+			ewarn
+			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+		fi
+	fi
+}
+
+src_configure() {
+	default
+
+	tc-export CC
+}
+
+src_compile() {
+	# Workaround for used zlib macro, which got renamed in Gentoo
+	# wrt bug #449510
+	append-cppflags "-DOF=_Z_OF"
+
+	local my_arch=$(usex amd64 "x86_64" "i386")
+
+	emake \
+		ARCH=${my_arch} \
+		DEFAULT_BASEDIR="/usr/share/urbanterror" \
+		BUILD_CLIENT=$(usex "client" 1 0) \
+		BUILD_SERVER=$(usex "server" 1 0) \
+		BUILD_BASEGAME=1 \
+		BUILD_MISSIONPACK=0 \
+		BUILD_GAME_SO=0 \
+		BUILD_GAME_QVM=0 \
+		BUILD_STANDALONE=1 \
+		SERVERBIN="Quake3-UrT-Ded" \
+		CLIENTBIN="Quake3-UrT" \
+		USE_RENDERER_DLOPEN=0 \
+		USE_YACC=0 \
+		BASEGAME="q3ut4"\
+		BASEGAME_CFLAGS="${CFLAGS}" \
+		USE_OPENAL=$(usex "openal" 1 0) \
+		USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+		USE_CURL=$(usex "curl" 1 0) \
+		USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+		USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+		USE_CODEC_OPUS=$(usex "opus" 1 0) \
+		USE_MUMBLE=$(usex "mumble" 1 0) \
+		USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+		USE_VOIP=$(usex "mumble" 1 0) \
+		USE_INTERNAL_LIBS=0 \
+		USE_LOCAL_HEADERS=0 \
+		USE_ALTGAMMA=$(usex "altgamma" 1 0)
+}
+
+src_install() {
+	local my_arch=$(usex amd64 "x86_64" "i386")
+	# docs from ioq3, not from UrbanTerror ZIP file
+	dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
+
+	if use client; then
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
+		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server && ! use client; then
+		# dedicated server only
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
+	fi
+}
+
+pkg_postinst() {
+	use client && xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		if use openal; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta s_useopenal \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+		fi
+
+		if use altgamma; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta r_altgamma \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+			elog "Be aware that altgamme works on a global scale, so external"
+			elog "applications like redshift can cause trouble. Disabling"
+			elog "these while playing is a usable workaround."
+		fi
+
+		if ! use altgamma; then
+			elog ""
+			elog "If you are using a modesetting graphics driver you might"
+			elog "consider setting USE=\"altgamma\"."
+			elog "For details take a look at:"
+			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+		fi
+
+		if ! use client; then
+			elog ""
+			elog "You disabled client support. You won't be able to connect"
+			elog "to any servers and play. If you want to do so, enable"
+			elog "USE=\"client\"."
+		fi
+	fi
+
+	if ver_test -ge 4.3.2_p20171105; then
+		# Yippee, new features!
+		if use skeetshootmod; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta sv_skeetshoot \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	use client && xdg_desktop_database_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 85d4c20c922c..3521e790ee01 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 87267f2f3a98..917f72b57fdc 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,10 +1,8 @@
 AUX cinnamon-control-center-2.8.0-optional.patch 3453 BLAKE2B 244d7bcc80e1450e947f5d58cd69912bd46bacd50a574b6959c1ba8dee017c8e46577636d1027ee91b15bd91ffba23ce1da4b61408d7ccb2e29feb363b80d6a8 SHA512 b74e69516baf9df9870941ca6a463b6a7afa37cb4b333c0da6fd6e2e60c09762afabebe145f1efd8accb08ff5dd4e0e88698598a8ade8d3024e2613813c3d6d1
-DIST cinnamon-control-center-2.8.1.tar.gz 4090162 BLAKE2B cf4e68d5b66b5193951d631c7e1da0f15d9c83efbadbcc17b406d734d19d306023e7665fc587b311247872ba3147d5b7ae51e0c63034d37c7b017ae226cd79a4 SHA512 e0f21bc29128b56d2024ea5bd9dff70a917259437804f4aad0942ee1313090b70e6811d1b54513b4639c0bff0230efcb2847a42fcf9ad183b24a3cbfeda976de
 DIST cinnamon-control-center-3.0.1.tar.gz 3834138 BLAKE2B ecc6f496deacf967026698be22477e90cd72973e3fbb49ef65c54522c0d910d41ff70a5d4adb7d6d0bb65d3e47b8188def6201af75be4ae4309354a2669e362e SHA512 97f726cddb12afd697a542bf40b89c84e8256cc7e1bff31eaf3ed86ba9ffe23660085e4e4123f955f1aa4aa31930b209c2a26649f2dec55d10a4803d86942e46
 DIST cinnamon-control-center-3.2.0.tar.gz 3837279 BLAKE2B eee6a735b8686229d27d90d655e1598700b329dd72c61cc0535e4f423eb9ff2534b0f733db872db65a8a5372bf71ab69c2a9cec7b4d189e06e3f89bf9ec6be80 SHA512 19a3481ba52784c733e5aae9603596a29fc12c78f21b8fe08492deda8c3eeac2bdbfc2da24f29dc5db6f6de02a26a43f67f3141dbfbd07c26f0e38a872c39216
 DIST cinnamon-control-center-3.2.1.tar.gz 3838032 BLAKE2B 615cee8d3bb4498c2faa9ae7bf776ab872169c9e0eb98412383e927f9dc199deb8d70ac3efad7e13c2ce6892a634a80dd114ec228cd4c308ba043799d7853ee0 SHA512 77f98aa47a10ef280ca7c3f8662e770d87a5427c91093382d3c289abcc0eac38317a31cd47a19a8ee67a4579375b84392f45d239b98fe494f7abfe10ef186554
 DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
-EBUILD cinnamon-control-center-2.8.1.ebuild 2673 BLAKE2B 126f0bdb37a5e0f5d8fff53597bbf628c8f7194521ada3cf7feaec6303b9567852f06a9b9686405c4825cb61b8e2caf49b7ef8f2cfd5732753864cd3ff50e3f2 SHA512 5ad2c1910d15c6202751a1c5298d0e4c12cdff20ca03f826c4b3defa9acfe352de5b95363c020e25c4bffd2bbd70f768b86d3ef8b70d2b7ba39fc9002b31dd5a
 EBUILD cinnamon-control-center-3.0.1.ebuild 2611 BLAKE2B 9a4ba0fd9dbd45cf87cf1b2ddafd26023a1c7e6c3cbddafb7072b6ef8b99d8d80e3f14483533e9a9486a3e9102a354b11cfb2828867577fc08461154bd62c3e2 SHA512 f4373e0845807fc3182a086ebbacee8e5a18c015c6ef2d1c2f00211cf8f3ea162f9c55daed64b5a1c100d3621d7446ca6bb8f4cdec86099a2ab51c911fb52fcd
 EBUILD cinnamon-control-center-3.2.0.ebuild 2585 BLAKE2B 2dd57986cf8c80549a91ae4a0934aedf09d4c6fb577ba9c75cfcec349c4e2cfe082e6f52988b4084294ca014db1181ae343b34d75a47f05a4793b6ff6f9c80a9 SHA512 4dbb1a7f539a6a38e99472ada1703d0b27a6e761c62b266b500b9b66e59a955d698387431e9f8adfbf68511bc9a8ff4e5d36c416d5d0314406990b49a11e595a
 EBUILD cinnamon-control-center-3.2.1.ebuild 2561 BLAKE2B 52a21e3c82a9a738ac88f1a3cedc516c3510e05072f3b2d0b85553fa7340e87917339cb490893f77a15480edf117953b091423b8c713642e3e302bf1cc00f3e8 SHA512 423385581a6c1702d2064aca5a3e85eecbd0e43c4fa92368ff959e92891fac2aa1c411c7cf215e73900917844ce281bec3d4b37185cb148d172e7236bb0d968b
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
deleted file mode 100644
index 5979d2989764..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=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
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-
-	app-arch/xz-utils
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.8.0-optional.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index c99fd6336c94..8c0bd002524b 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 6d84c6b7dc25..a02ce0993e4d 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-17.08.3.tar.xz 280448 BLAKE2B 639871f99310e94f936c2cf7784c5968274c40fd428334ad77c9480e88442ad55d7a4e432e936d34c477555b81e7f9c579b464a1f90ce32da29048548ec8735e SHA512 318be593363dc6710369555946f8152ec410a74a2b8821b5e10f7f1df8dedcd6faa1a4fd21255f0d9366760d2e5f61bd54b4b08a1bdb1f30a7409e4031c2a53c
-DIST akonadi-calendar-17.12.1.tar.xz 280016 BLAKE2B dec6b78b8c672d3e3451b24d681bd64e7fbb6f5f9fc75bd03150fd4be02914e70e3957ae74cb3c2e92ae6c161c4289a30a88d40a571d92a494e0b370961d9272 SHA512 c5d3fb041171b0649d38ccd431382f7fb2636328bfbd05c8ff05fcfa119a36ccb4d066c9e25cbb9bd36a08e4bc6005ba3758b0313d1bd57a0949fb548dbe4b03
+DIST akonadi-calendar-17.12.2.tar.xz 284256 BLAKE2B e825422ee86a5532dba84d38e35db00ee0c4df99460fa70e0a042eb40156f51cb9aacbfa04a046cff90c18718e30d6e89af88a831e0a66a74f1e8b8dbaf4d9e2 SHA512 421c3a69f06ff487940340fe0ffe9d2eb1e79270c2fdbb9697f1ef45a387736ae230f41f7bdf2d23d57f337eeb9fbfd2e88390cb775c3a33a4f923951a1bdd40
 EBUILD akonadi-calendar-17.08.3.ebuild 1158 BLAKE2B c304e46beaba64b5cc94f0e99730b66fd4041598e15efe4aa07028a692ae661f46eef3a26e6f7bdce2fd95f96b4839ce5b928bdcb11ebc4e3ce06aa82d1dc02b SHA512 5b8f29ed924cd27191026dfe15f03164a97df58eb6b1c1a27e57f7ce3dae7626298c77db8b2111cc53343bc4e480cb7444f537f355c04b72d5375215b49ff1c5
-EBUILD akonadi-calendar-17.12.1.ebuild 1121 BLAKE2B b0c12f36b05d5f176a65f4a7c3ac3c475e181c6b5282dea999d6bd0645f6afd2e8fa1bf8fb85220960411343188ab216e91704bf1a5cf21cec8c81c794b3b4ec SHA512 70ec221bd6cf0eeefb4c4041d7e848a932e5c3a16792e2ed5da348038b9be9aec8bcf352d00e62ae93c918bb796e2ef252499fe3bdad10a1dce1ce04422388a4
+EBUILD akonadi-calendar-17.12.2.ebuild 1121 BLAKE2B b0c12f36b05d5f176a65f4a7c3ac3c475e181c6b5282dea999d6bd0645f6afd2e8fa1bf8fb85220960411343188ab216e91704bf1a5cf21cec8c81c794b3b4ec SHA512 70ec221bd6cf0eeefb4c4041d7e848a932e5c3a16792e2ed5da348038b9be9aec8bcf352d00e62ae93c918bb796e2ef252499fe3bdad10a1dce1ce04422388a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.2.ebuild
index 66563cc64656..66563cc64656 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.2.ebuild
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 97eeea4be105..c333a03dd283 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-17.08.3.tar.xz 353516 BLAKE2B 628a80b4bccc01e98d4124180fdceb68742fb4b0ef822baf665215a700c6ceb16c98b5efa7ad18c894910fdc269087e874cb32f5b80ca4d1e1a904e007fa2974 SHA512 d3b8dc0c82b4258aac3c06d87d62c8ecf881fe62c31a9f77b4c050a3ee70e10d225660b08f7cbf4cf6c813ed2c1c5c321cdf0633e37cf8e21bf70a04bd133870
-DIST akonadi-contacts-17.12.1.tar.xz 345012 BLAKE2B a51c69515101cba7b052628b8554d6b3b88114c4d94fd1e5d05c994ac8c5b03d879d4773d223f90695dd48c5844a57e0c23f75578cfb17b802a35d6f8ccfabe8 SHA512 6cc74f87f27e9be0193252279b85095d2f453e57382ee95dd6439d2f2ae41a329bf8154f4fef6d82ab2262e76d0d80e41e8ca60371282ac1efa594699a3dfd28
+DIST akonadi-contacts-17.12.2.tar.xz 345972 BLAKE2B 0ec746f29f5236fc218f8f6205a507d0426a164a73bf7dbf7b750b9c454ec3ddc3d74709fbcbdf6e17c3327abdd1d46257fa79cf50698db2e4ca9ba7a2923808 SHA512 36b8c18d31661857d47bbe1dca3d912f1a3b4969ad03002014d18cd7978857dde100d95b5736799c0e18d2b6564820bcb865258d1848f2965dd3c675bd978729
 EBUILD akonadi-contacts-17.08.3.ebuild 1165 BLAKE2B fb9eede65ce8c2bd5d7ea7aec2307fc0f9d86ec5444980427e1eb3f8a41915d90d78e2b36146dc753b7afee4b2e40ea0e265f5a70a098ebb161c24b141da1002 SHA512 156432d40c1c5d701c2fe22d2e20308e1ffcc512dba07989e9a39747d0927ba01624b65c775191fa12db89ed5e54270a35166c48256acf247010b30f05394c20
-EBUILD akonadi-contacts-17.12.1.ebuild 1060 BLAKE2B 41b680096f2e55da3dc5009fb34febd30ca607a26ba3f20c6ce74b178cb06f01a22863c6c1845c1594783ed2a2fe3e5c8b30893340a0a138d909dfe51407ce66 SHA512 2fb15e086cd6e6fb919ee65d7b9da4a5243123974fddc7a87879ecc457929cd7ca9aa9b7fbf227d5abb41c96b2c0e43da1adb68995bfb23d8b37a995bf383730
+EBUILD akonadi-contacts-17.12.2.ebuild 1060 BLAKE2B 41b680096f2e55da3dc5009fb34febd30ca607a26ba3f20c6ce74b178cb06f01a22863c6c1845c1594783ed2a2fe3e5c8b30893340a0a138d909dfe51407ce66 SHA512 2fb15e086cd6e6fb919ee65d7b9da4a5243123974fddc7a87879ecc457929cd7ca9aa9b7fbf227d5abb41c96b2c0e43da1adb68995bfb23d8b37a995bf383730
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.2.ebuild
index 7cf2a294e13d..7cf2a294e13d 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.2.ebuild
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 759ede034c99..0ea719c94c75 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-17.08.3.tar.xz 434632 BLAKE2B 7873ce751e8af1af3b4b4859e495a1e4f4820e8899c9955200d6ba7412d5f5ea3c974d4a112c547e3dd429f59d4d2de2170fe76fa8320dd974d838f8800727f5 SHA512 dde89492fa2b2e2c0eff38e7cfa5d83607a843ff62f46a4042139b8922b4744b887428d1d00d68e4dbd6b09afec6194e3793c27c1dd005550af7cb8c85879351
-DIST akonadi-import-wizard-17.12.1.tar.xz 436392 BLAKE2B b5a906ec8a538f347e31fc20cb8088f5621f741699a0679983136fcce9881a24215b7eb3f57e75db64cfd48fc1201a8644637b1f97953fa84722cd84538ecc70 SHA512 4426df8df9da5a7cb812a0c8b97cd5e2b69a973fd41dc02193905d7dadd010759af99403c5886f002df6977c5abacf8810892a04ed8078b0a4588408b43d0849
+DIST akonadi-import-wizard-17.12.2.tar.xz 436612 BLAKE2B d5d38287132d46dbd7e9696edd05f0e824a769308741454ce95680a7259512f1a25645a211ba526d8eee2053d54f449ad5bc0d217054457c713c793679d5e5a8 SHA512 72066b27582ff44c67a741d0fddaac43abb3db6f7b54d1804532c024b4c56f1e287bdf1c11562b5760c3b92a7afc2c10df567bbd8bb0d99b2a1a41131f8e61fa
 EBUILD akonadi-import-wizard-17.08.3.ebuild 1092 BLAKE2B 79c7cefcb40da652176dbed9bc3b814c842fde199101100108a880ff3cdaea44e6d1e03fab9bb21da5e1a943b2a5674611d7481436828e116a872ff432429872 SHA512 799993cdfdcef5ff984962bc5898c03e562c881e47c1952ae14493ad54697c95625b3e499c4aba2a83374f656dd50bf2167d9dbb5eb6481d6bdb07fec7bf5d2a
-EBUILD akonadi-import-wizard-17.12.1.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
+EBUILD akonadi-import-wizard-17.12.2.ebuild 1094 BLAKE2B 6854fefd7b24dda144412d954eb9bcf680d5e4265fbb92a8f1a70c33e49e1433dd4c25d8ebcf6844a1f1b871fc34ab902a43087a36bdf890924adef288512c13 SHA512 f3bd6bebf5a4222f528a889aec9d92afc79b069ab28d024faf9c1b2e6746aef74ac4d80c66a4068ee563e4eb1cfce047dbcecae3a970fff7b0442fef419e702a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.2.ebuild
index 711036b2177b..711036b2177b 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.2.ebuild
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 2c2ca40cdbd1..f55c338f9123 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-17.08.3.tar.xz 130840 BLAKE2B 27d639f6f6fb29544847b452dd67a352a4b7569371da4ce05a5ac0207c6209df16dc7532eafc659a62d53c7b631260feebd795964350a6940dcd131de2ba8d92 SHA512 2bd31750fa63705035dcdc56b4686ec0e22fc593baa6514e0803e6e4ce7ab4346edb5f1eab14f598e7d5c23569b842f7d733dfd53f9d60a64b3f6214de8742f6
-DIST akonadi-mime-17.12.1.tar.xz 130696 BLAKE2B c41c21893e484d9e460055e5e11b0618da609f95e5c1be1323c532442da97fdc6f10de4f02e4a4fb82e4e356b748d548a450abedbc92edd5a38d137316c45102 SHA512 bb1b91a0119dc3e916fa3da177163ca87915119d3827dfef652e150908ea552e3e423fc500d2ccec5ad95622bf5b7ec24b4f8705a0b4f5cf873aab91ef90b22e
+DIST akonadi-mime-17.12.2.tar.xz 130124 BLAKE2B 115408090a0809604c4cd25af304ce7fa69bceb79e54e04019edc997a948b956479aefc3bed1d0eb83677c73e014c54b1c21ca4d80f5a50ea5b9234484b0d7b3 SHA512 a0bc9110bbc4d51910b17efdc3347c84f409d21bd43bdb2b44552dcaca6bbc16424ea89e95296351a7bec655fe3c0601a960fb8367238eebaf4c7ed7f1ae757f
 EBUILD akonadi-mime-17.08.3.ebuild 854 BLAKE2B e00f5f3937ca400397b770fa737be1fba026ea09f6cb91825f73baa77fd92fc76a784fe735943f80b2799124ab6e84044293d3ad236b9a0ebef7b4be1133df85 SHA512 8079f0e000153d63fa00b3edccc1b6fdb6eff4f847bea2752515c0659cfb868647924948a5e347f4a717e86ddc13db7a67b24df749ede2a775988d89c1f7ba61
-EBUILD akonadi-mime-17.12.1.ebuild 856 BLAKE2B 5ef05ff978c12a119b1a5c89c9118a3ba298a89a3cace79d97ffb4251758f51b1d19da30914f393da02affc215efed74de32cb0306a6e5ac576dfddefa676b00 SHA512 7e16cf5c8019cf4f4ed3acb87e7950fdfee13b66868f1d8684df158d8d7a8e4225e3e5367010cd681d56cd3ca7633541eec29f08cb704a74756685a29b107665
+EBUILD akonadi-mime-17.12.2.ebuild 856 BLAKE2B 5ef05ff978c12a119b1a5c89c9118a3ba298a89a3cace79d97ffb4251758f51b1d19da30914f393da02affc215efed74de32cb0306a6e5ac576dfddefa676b00 SHA512 7e16cf5c8019cf4f4ed3acb87e7950fdfee13b66868f1d8684df158d8d7a8e4225e3e5367010cd681d56cd3ca7633541eec29f08cb704a74756685a29b107665
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.12.2.ebuild
index 828716b6dc54..828716b6dc54 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.12.2.ebuild
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 168e3659657c..974416c9b03a 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-17.08.3.tar.xz 24728 BLAKE2B 6447bff50f623c54f155038b47e52394f6b6798cbd0485de45ef01ec9cb7c45e4c023f6ee0d577e3046f17df3c6ba2e6d363c4e93e2510a71119c5eb8009bd9c SHA512 ea7f19cb833d9a54fe8c52f02e4b87ee45a7cbe997b7b6974d9f8372d5e13cd6815be180d15c2aec9df6e490c028ac2f5c6d97cdc9a87b0e20c3b8b701261a68
-DIST akonadi-notes-17.12.1.tar.xz 24556 BLAKE2B 733b4186fe78e57dd77a6a16ccfb7acf67beddf55ca7d41c09482c28160f5187f7f9ed1cd0055d3de2b31e3fcb97b0a285d102bcb3ba0efd779ee7c8a02cd9c8 SHA512 1514103b64f4eed44b777c06d6149f3907b93a4d589812bb0150db2690d9382b16c4073b9bc586e2d23a653e95c475e04f16e5a435308c4849732884fc0434a5
+DIST akonadi-notes-17.12.2.tar.xz 24528 BLAKE2B 1e20827dc6a5c7eb5262193c5ce0e707187eafc8e1ce70c53bd696708d738d0aa2ab2509a20cdd7de69d81f17b314ad3068a140c6d7e9d764e3738c9dff88092 SHA512 8c10178dd8d0de8b9d405a45aff8f70f58a4c66e79355f831c08202665b24e2584f716e32694ade4acfb07cd8707d37c82c3c1feba9fb219a67aec7f01abe4f7
 EBUILD akonadi-notes-17.08.3.ebuild 565 BLAKE2B 090781ce229840a81506e8c174e72fbc0b316c9d1259f9fc02a249cc1d360a8b497e943f8e9e23abe780493b15f6d39fbc32d631f555ed5de4377ddbb86fb537 SHA512 90a63b2aa30e9eb5ff2dc83dd368d3687eb2e523a6534d15ea349ad68e34be5a635d03da59628c3938d99b13663cde7e4ab1bde4fe753b4610851680480cbb0e
-EBUILD akonadi-notes-17.12.1.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
+EBUILD akonadi-notes-17.12.2.ebuild 567 BLAKE2B 6bf6f7d182475533dacf721500c4d2bf0086f6f99c69a8c253a18370073b348e63a220a17964242448c241367b5a4b241d2ed0f28faf474ad9926a6affeed89c SHA512 34371782e6bc37e5c09d0707b177b3fc55513ac6c07ba9d5f4f65236895d511da07196cc34e9e3ddd91e2715062b0599590ecd44675efb143d4e9bf41ac7d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.12.2.ebuild
index 0afe6508a57e..0afe6508a57e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.12.2.ebuild
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index d364ad566eb8..5650451011fd 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-17.08.3.tar.xz 81288 BLAKE2B 04342e552c47fb9e2d94e13715b4d6b564b02bf9704671ada211f353fc3554b7fc01600ff6c4b3e03cf6c2edd4f525a2c01e2b9e8a4479ea8b28de26ad2b79d5 SHA512 e76e0f2a4f0c26b353e31c8cfeb29f6a1e342101b58925d741479193955171e7698019e1a0117348694d7f1256c777cbce9c43033e8b7336cacef0e2c87f9c77
-DIST akonadi-search-17.12.1.tar.xz 81600 BLAKE2B 56a2a27ca37af5e1a74d595bda34e9fdbb7672f9409d8d0b10cfe1bfc157bb198274f3ca63b3ba7e534a5210faae5b45021f42e88fde59886b6fc21d38851095 SHA512 67ff01fd3e5c0b488d4eab73c05369f2dce5fcdcf38304747c68705b10d596c0222664a13100e123bd366c29ccc98ab8d33922f75813085c0aba34539239cfa7
+DIST akonadi-search-17.12.2.tar.xz 81876 BLAKE2B 4a6cb6987cc24536b7f9c9c3675cc8677712fee4550d4777963edd188a7d07e4494da86a14370a8c9aa5952923602a71d9fb88f3c583955f270fa889fa3e6e2d SHA512 0b8d495c2ccc433ed4fe2deb1989d3a711f0622f28d7e5f87f6576edfada5dcd774dd6d5cf6f6352277ea4908b2e1026054200e76868e6455eec67124861252c
 EBUILD akonadi-search-17.08.3.ebuild 976 BLAKE2B 13bf3b907e3cdf1cfd40785f90c9f9be30a75c1dc4828fa3bd23168e637cb6fdc723873819176b801b690eb5dc919a04323734ca0b08d592966ff0c93e0eca46 SHA512 1b0315bbd84210dd18094be5a058523ce0ca647b6b132642ffc766beebf1c35bf4e1b2692db772873e27b1745a44053a0acbb9283faf080116ffb53fbc195cb4
-EBUILD akonadi-search-17.12.1.ebuild 1085 BLAKE2B 6f3e305cc83fc0e7e258d8f04cd7672a2a347e127160181622f5236e5972bb2919f4937e7775cd34dfebc1a9446977566194ff4abac92689ca3c3d3057929c8a SHA512 43c58328684563f17fe61360369c9c4908f8b41468ca5e1d9e6db2f4d33a182c63ea07ee36359a9031a67839988ca3db85759d17b4096781b107fefec0bcead3
+EBUILD akonadi-search-17.12.2.ebuild 1085 BLAKE2B 6f3e305cc83fc0e7e258d8f04cd7672a2a347e127160181622f5236e5972bb2919f4937e7775cd34dfebc1a9446977566194ff4abac92689ca3c3d3057929c8a SHA512 43c58328684563f17fe61360369c9c4908f8b41468ca5e1d9e6db2f4d33a182c63ea07ee36359a9031a67839988ca3db85759d17b4096781b107fefec0bcead3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild b/kde-apps/akonadi-search/akonadi-search-17.12.2.ebuild
index 5504a5b85b7b..5504a5b85b7b 100644
--- a/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.12.2.ebuild
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index e6c12dc0b52f..f32d3371c8d4 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 BLAKE2B a4107b5732d0147e3001484c7c4c5e3bba64909d21656686142cf9d58304d7496dea8d11b72836bbdeee09691d9c1e160445ecf94fc280cca3c35f45c078d969 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7
 DIST akonadi-17.08.3.tar.xz 1427896 BLAKE2B 37e19d5afb0911bf2002392e0579ea33429a5dc8ec5ddbf3c8e8fa5ec21b014dea5267e353cf5ab94927fa8444cacf9948c001de34a9acc730a891b96da7c0a5 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb
-DIST akonadi-17.12.1.tar.xz 1521928 BLAKE2B 9da0f21dfa43578fcef90522c007255a0a039d03d0bdfdfa5dcce52b572a6433800bf55149fb40a75385ee062d64e72d241e11f6fc8277d11414dba61d4e0423 SHA512 5e6ea993b98ee72a5c65156e13734da3b8b34438a1a6b791f616e50eb6274328d9f6331bf2b4b9cd2216ce7977a875174757fbd7c7d1d366759303ce89be8ea5
+DIST akonadi-17.12.2.tar.xz 1521880 BLAKE2B c039036cdc0d63dbb6e4ad4b5c0573fbfccf77bc42c03f0fa9f70cc27d603b79f48af7c1f120bb9d3a6460f288a272afd4843987f205d5baeecc665f24b1beab SHA512 c0004d09cae94b4f8a348c0439830a3ec6e906b04a95e8db7f3d15c6aa159910e764c06e3d92ade20e02c16598378cf2eb3f6e99018f2f47d7505bd0fb968905
 EBUILD akonadi-17.08.3.ebuild 2954 BLAKE2B 6767c7c38275bca9ab36869e077a1dda34e278ff0f162f25e50031f46ea2df202aa934a62ef286e13dae428f741dfedab53db0391898e0b73eb236a757555a55 SHA512 ef19796ef4ac0152e6eb105dbad17373fdf22bf034385d06f4cb9c6cf435285d7469ea1b2f93bd6ee52591c74ea0497d41d1432cf702ea3cc2b786718b208c3a
-EBUILD akonadi-17.12.1.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
+EBUILD akonadi-17.12.2.ebuild 2915 BLAKE2B 8f061eb8ce1bbcc1ef0aa30066ee3b37c902422f0c2f857f425ef4bea6dcfce8d7ddc37245b36d299c64bf41f321a159f4add3eddb5dbb90ccbd504b4bf7749f SHA512 b509bffd7bf710862d48afeaa18b69936800031dadb3a5d22f87559e179305c06e8ed3c4bd21a33346e2984e910d3718384021584d6caeec029e495127aecc21
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-17.12.1.ebuild b/kde-apps/akonadi/akonadi-17.12.2.ebuild
index 99c2e48ae5e8..99c2e48ae5e8 100644
--- a/kde-apps/akonadi/akonadi-17.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-17.12.2.ebuild
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index ddf678ea99a3..53eb2beb77fb 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-17.08.3.tar.xz 185196 BLAKE2B fb630eb12653f8a6d8f4064f0fa6a0deaf6766959db4d55f6a6526be504023d4a08954186924063bc4c6aca00d1523f46517d64b6f81da0f43e0a5878d7815dc SHA512 a9de6c25c9b7dea29595e5ed815e25cd37b715afa2c754c9920cf9c6be4755d5bcf5376cad82853fad75feb1540d29afb9691731c09ec057571e8ed860bf1563
-DIST akonadiconsole-17.12.1.tar.xz 185432 BLAKE2B 9a5f9832aceee800036e24d9140166ac9699fa6549dcb0b41166ad5d94bfd35abb61f3b8fb65d25f2c1d4737a24675b93c74c458623b01796c7380fa16916be0 SHA512 d612c31db21086f301bfa0e60051603655f088edbaf1f3011e6ed485b5657764c8075eb29b1072ee0a3f2c945726e3c545812fb930353310117da9d54bdbf7ea
+DIST akonadiconsole-17.12.2.tar.xz 185436 BLAKE2B 529d6165863cefb6c33264635ba5e830a94399910fec590755fe03e1e0f52c2b5a674a3acc23e8cac6ac5690f0b92ffea261ae07fe8ab4c7aec6f9671b353e29 SHA512 0fb504ef4dcd273308fb947014b2dc1cf475e915f244133b1c542df42b19eec6581e465a635bc3fe3320b753b9aaa8bb314207d1859458178aaf62c55984ac23
 EBUILD akonadiconsole-17.08.3.ebuild 1215 BLAKE2B 6792c88ca4d602d610396e7cfc1ffe12b414b809d3533148beb92fb38632e664fe5d877958632071420abf2d312fd099d539ac183ea0587d5038ed88b1b03938 SHA512 8e9e1551abdee13935394e77c79e99eb1021ba3ec44f1780701381044a4274f954d49df0654948304e6c11296906b4b010a254bc43c107220eb03bec56a6addc
-EBUILD akonadiconsole-17.12.1.ebuild 1259 BLAKE2B 9f584132d63df1c6a73f552d657eff95704ea14770f29c9454f9c69fa80b5c32495ec20697f21f36970e8813102e432ccc022c33c58fb4d9217f200a05dc454b SHA512 8e7ac7d6247985ef91099cb24944a48ecffceeec9016e49ba667411cafd50ba6453ae7ab5b4939492e5329dcc8046620a87af8600ae9014ce97f3b5e2e10e35a
+EBUILD akonadiconsole-17.12.2.ebuild 1259 BLAKE2B 9f584132d63df1c6a73f552d657eff95704ea14770f29c9454f9c69fa80b5c32495ec20697f21f36970e8813102e432ccc022c33c58fb4d9217f200a05dc454b SHA512 8e7ac7d6247985ef91099cb24944a48ecffceeec9016e49ba667411cafd50ba6453ae7ab5b4939492e5329dcc8046620a87af8600ae9014ce97f3b5e2e10e35a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.12.2.ebuild
index d52c05a1db49..d52c05a1db49 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-17.12.2.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index e45cbd9d7d92..e989bdd7284a 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,9 @@
+AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
+AUX akregator-17.12.2-feedlist-corruption.patch 475 BLAKE2B ad57eea2e690f1bf93a47cbd1503e0f40434f8dc22c3e2b63ec9d9758878dc458b6fafb8934c4d3138d5a1229c42aa5d6df8cc0aa7ceaac74429b07918f8f0f9 SHA512 80d6a86eb93bc827f854d2ba9aac666d0a3e1a990df2018e8387da65204ff6edce280b670d4858504da77c642c006c4b9f36898bf8d0b640048f27fa93cad4d9
+AUX akregator-17.12.2-slotSaveFeedList-not-twice.patch 643 BLAKE2B b3eace1fdec71ec42d4a7b4852a6bc6ca7253dac0467794f04fd3f9b2ddc79d6c6849dfed633efe424cfadf48c4085082ba0d98b88a47f04811582ce142046d4 SHA512 97139b83884a6bac61e0df68b4ebd612c8dcd4eab8eebb006c0aebaf539fd531b1b4d9483a5f501bed757fb6d8971d810d06309329d98d0c50e8e91d68d394f4
 DIST akregator-17.08.3.tar.xz 2248228 BLAKE2B a0542cc6a29f14af066507a64a1b5f70c8b95345bf2245d124c7e1b55c39e67e81d87e1b929a96ceb41947fb98cfa14fb3b0bc2654ead5f5516245fa7949fb78 SHA512 1415eea92cd26d6aa39e373d4177b09739479cb8f168f16ffaede7abf47c5a3b5a2e349bb583428ee210a44736cc4d27dde60fab69edf56e0621062512169ca5
-DIST akregator-17.12.1.tar.xz 2253308 BLAKE2B 05d115a568b8979fb834796f4b4ac16d277bc34dfa2f86032a561804c997ccb601d5f96e45b5b5d617e9db4ba8f668f5f16098979aca1dec091b1013425e3237 SHA512 ec52857cae2a07c4fdb0ebebadd8c6212990d5a9c493f380822339c4f5c8e6b2662d81c7f9f1829583b0798af2317aaa2ab1f5b1b7d7bbfe3839f3daf848232a
+DIST akregator-17.12.2.tar.xz 2252928 BLAKE2B 6a0c2f5f9cc6b38c47b860fee9db7bb80614a24b45521502a5e380700c0e15e70bf9c408a4aac4f7cd9826bd06c8372f9d4bf27ce48fe95b84d8e7f61380a86e SHA512 29ce5481566eba58d78a8fa9ce7c0c048d74a7bf316efa78d72f2b873a5616d62d0c1fc8ae82380848aa44a8408b6483174d963fd599894d3796d078189cefc0
 EBUILD akregator-17.08.3.ebuild 1510 BLAKE2B 8e9d46795002a181292daecae419209482ea2b8bf1a6aa512acdc8b0c8123de6620fa56e33e98096271ef8b237a0135ea94083761ea5ab0e734f646ecd7c56be SHA512 12851a81aad27b10ec955597b38252f12637e28b75979d20823658adec4c463145cec01f2c300e5417fa27038924228e8d8bb680b4b65ba38c0029a3bc019a80
-EBUILD akregator-17.12.1.ebuild 1440 BLAKE2B 191a086fe96b658b26a8b40bccc592665ee97e7dec76e339c4b1bfe12b058b5bbab03a094d0745f38c99d960274acc47d499aa8fe3a03fdb4a7eb9773c5f4fe3 SHA512 524c50abd59ee1cf89d4350bf0625cf993a005357ca30a3ff144e8320d503816ffe0da22385a587cf6535da18e9da52eca566b568fb58e2939f3bb379346fb93
+EBUILD akregator-17.12.2-r1.ebuild 1541 BLAKE2B 20c9da5a5fc79f448c4d4702ed3866a9dbd909ae2c4c5842701cacf284f23a9ce5ed6dedc82807e0bc009135e299fc41abc47bbe5eb2bddc6f5b2abb73f49043 SHA512 5b5eafc4a66a44e3aa38d29f1b17ce1e7bb5682d8f401ccb03ebf57d50999bc8b3e36f9b57ccaa5381ffb170299520912d9d35e07d944c30ebcd5547b713fb24
+EBUILD akregator-17.12.2.ebuild 1534 BLAKE2B efd7e37b21b7c31c6c253d1c9926d25ec97a0846265241bed056eb6843a5ff0ced18a3a6235706405d849b3beb6d2b59a7d2f79680844e9e013847153b145102 SHA512 4fb26ba97cfbdcb96f8de565f8cf0606ad1dd820af6d87ee72289cdb3254d56b846560f344c0b7266f61bc13288b0449337fc59ac41cec7c1d5b5a56bfe09474
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-17.12.1.ebuild b/kde-apps/akregator/akregator-17.12.1.ebuild
deleted file mode 100644
index 861bc0c9dc32..000000000000
--- a/kde-apps/akregator/akregator-17.12.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-17.12.2-r1.ebuild b/kde-apps/akregator/akregator-17.12.2-r1.ebuild
new file mode 100644
index 000000000000..5a7d13827cb5
--- /dev/null
+++ b/kde-apps/akregator/akregator-17.12.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/grantlee:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-slotSaveFeedList-not-twice.patch"
+)
diff --git a/kde-apps/akregator/akregator-17.12.2.ebuild b/kde-apps/akregator/akregator-17.12.2.ebuild
new file mode 100644
index 000000000000..a9886e67a926
--- /dev/null
+++ b/kde-apps/akregator/akregator-17.12.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/grantlee:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-feedlist-corruption.patch"
+)
diff --git a/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
new file mode 100644
index 000000000000..c8c872f433bf
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
@@ -0,0 +1,16 @@
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index fd533ecd..2733b273 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -137,9 +137,7 @@ MainWindow::~MainWindow()
+ void MainWindow::saveProperties(KConfigGroup &config)
+ {
+     if (!m_part) {
+-        if (!loadPart()) {
+-            return;
+-        }
++        return;
+     }
+ 
+     m_part->saveProperties(config);
+
diff --git a/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch b/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
new file mode 100644
index 000000000000..eefd844460a3
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
@@ -0,0 +1,17 @@
+diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
+index 94a4e00..3d2d778 100644
+--- a/src/akregator_part.cpp
++++ b/src/akregator_part.cpp
+@@ -514,6 +514,11 @@ void Part::slotSaveFeedList()
+     if (!m_standardListLoaded) {
+         return;
+     }
++
++    QSharedPointer<FeedList> f_list = m_mainWidget->allFeedsList();
++    if (f_list.isNull()) {
++	return;
++    }
+ 
+     // the first time we overwrite the feed list, we create a backup
+     if (!m_backedUpList) {
+
diff --git a/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch b/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
new file mode 100644
index 000000000000..c504e90cb5d9
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
@@ -0,0 +1,24 @@
+From 6dcc0769f61e38580b70a5c29db0d9920f263c6e Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 13 Feb 2018 07:28:44 +0100
+Subject: Don't call it twice
+
+---
+ src/akregator_part.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
+index 94a4e00..2073dce 100644
+--- a/src/akregator_part.cpp
++++ b/src/akregator_part.cpp
+@@ -324,7 +324,6 @@ void Part::slotOnShutdown()
+     m_autosaveTimer->stop();
+     if (m_mainWidget) {
+         saveSettings();
+-        slotSaveFeedList();
+         m_mainWidget->slotOnShutdown();
+     }
+     //delete m_mainWidget;
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index e6c525987f73..43ce3ccc824a 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-17.08.3.tar.xz 329800 BLAKE2B 33c08be1b6459a6949eac99598b05ecafd24718769e97457eb881dd534a93dd9553a2a055170250ac37ac6f89cbee3e5e39fc207d5b8454f94923d670fb3127f SHA512 bc7f8b0d53ffd4fac7a24b457e4732c557589a55f0722e2fa24134563ba124dc89774f39c158d8b2bd5fedee7656f224b7e60b4f87c0246589b84f09d20e991f
-DIST analitza-17.12.1.tar.xz 331232 BLAKE2B be4dfc81063dc7994b17555677fee2079db843c721a713940445e57148752cd880074b4f2e37abc3ef0408285daa38e700f8a7e60c4dd3f99b8399640595d4db SHA512 e02fd9d107e898e1ad076568bea4893a6c82f8e2a9dfb7c5db031f750e8715318dd63a2f5ed6c8b1cf35ceb4634fde07f0e9a2d2e7af2366dde966372ec5a2a9
+DIST analitza-17.12.2.tar.xz 331144 BLAKE2B 4d8984b7ea9f684d4dbc9d76390c149fe54b611c08fe604facac636fac8e825fb4fb988056d25da4296d5b5b1a856424850d82a85c79a7dd7e59fcafdb13e266 SHA512 e326d397db3193492258f156cd71f63e4544abd9724b58769a1593ff57242b18de09291a433ea37658015bd57f75e430ed95bdf99d3863fccfc4b546a9686933
 EBUILD analitza-17.08.3-r1.ebuild 812 BLAKE2B d3331ed979c5027629376ac736663b65f22623aa13d535b399c662b2e939ffea243e0d16a26b8d1b864f1e9dd1bd2b0a699fa48cecbcb410874f62a91fc51f63 SHA512 75366dc6fef5d9d7224cbc93efb0a8b1b4253ff71fd22a97a071211cecf033b9099f78952bc8e587bf17866ced196b5e46245f5c39310bd572ddb1beabd6d38b
-EBUILD analitza-17.12.1.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
+EBUILD analitza-17.12.2.ebuild 814 BLAKE2B ab20e18be9ecc2c7f816a21f9847b704a0cf55fc32c63bbb241ac7f0058fd2671e653a4a615e3fa5d688618a5fdddb434db801a5ebedd3cbb00a2ac2930076ec SHA512 267071d595f3cb78d909f9ef0f814d90e31ec54cf783a484ed59f55cf3e8d1ea4cf66b7fbd215873119ce2566d9cbe5000ef70c1b2f3c9f1e67f16553b3010d8
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-17.12.1.ebuild b/kde-apps/analitza/analitza-17.12.2.ebuild
index dc538401ed67..dc538401ed67 100644
--- a/kde-apps/analitza/analitza-17.12.1.ebuild
+++ b/kde-apps/analitza/analitza-17.12.2.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index c7b68ae24845..0701131eb8ee 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-17.08.3.tar.xz 1966132 BLAKE2B ec17cdd3d9682cbf2f533bb159fcc219c91426997120ac03fa4726123701b6e1d98686cdaa07330e541bd2a1189a920292c13932df824bb9855bc93c38c7c605 SHA512 c28eda02f561391a21723286de2b71b9d985a07edfabd510b690927ac598da7464b56ba6132bb0362a6fd7ddb35d99bcbeb8ef74b801cfbba22f6f6d91262fb8
-DIST ark-17.12.1.tar.xz 1970844 BLAKE2B 5f758bd3d555a75e1c50b29292bb28f637184d7b7af9de5193ab24348845135cc6486a196d16320d11b108eb3f7c83eeedf2a0afa46019a8c09b6f1ea9bb104a SHA512 445b98bc1fe6484cb5f2b6fb78a2d33e6d0d1898968fbcea43574567af3b3d8847fe674a2bdb342bf8ca96b862bb2de25b4f06e82715a3d99899d1279b8a9fca
+DIST ark-17.12.2.tar.xz 1970240 BLAKE2B eb402da08903476f1ae14ff3921742a63242a2fbd1eb5702c794a52a5249342751b1a0a943d10a0516a7cb6da3bfd7a1c886d2d23a09c4b79022d96b86486008 SHA512 8b87bb8e96ed1483503ebd26ce505962cafe96b9294dac9dd548a0659c0ff8795cf1e699c86ec2168f761819906d8958cedbe3858e05d50f7cb41a9d780a78af
 EBUILD ark-17.08.3.ebuild 1869 BLAKE2B 9abc58e04fac49d6f8e9bf24eb058f59d00f179580e8d56821fbccfcafa90b9f2a46c0c0e909d9ea05d57af1c1ccffbec63a0cbfa3fa16f0ff493b480054525b SHA512 e89980b83e2fed67bb018f49ee75b1f31caa2dc8f9fa848925d3392eafe974a6b9d63df7cc46fe7aa340e562347f7da5efc46a7aa242e8900166296b77ca42cc
-EBUILD ark-17.12.1.ebuild 1886 BLAKE2B 6b2e6a929632a753d1858b11279944fd7bb6bde058f128420156c3f7902ff388136ba70930c0a61403b835650e060d77a1094111cac6ad8c03f70f6d58cc28fb SHA512 468f51669409765b049716e85b8ef258acbf2510f43984b8e98d7efe066fdd335a987f3687b85e2fea7141aa6c6b171baeb973b166b5927355a4678e645d3497
+EBUILD ark-17.12.2.ebuild 1886 BLAKE2B 6b2e6a929632a753d1858b11279944fd7bb6bde058f128420156c3f7902ff388136ba70930c0a61403b835650e060d77a1094111cac6ad8c03f70f6d58cc28fb SHA512 468f51669409765b049716e85b8ef258acbf2510f43984b8e98d7efe066fdd335a987f3687b85e2fea7141aa6c6b171baeb973b166b5927355a4678e645d3497
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-17.12.1.ebuild b/kde-apps/ark/ark-17.12.2.ebuild
index c95527b9545e..c95527b9545e 100644
--- a/kde-apps/ark/ark-17.12.1.ebuild
+++ b/kde-apps/ark/ark-17.12.2.ebuild
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index e183e379652e..deb85ef90fc4 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-17.08.3.tar.xz 3749500 BLAKE2B 99cce8d58f10ccaecaeb649b9f59036d4d1d4826e10e3b196e523818cdb925414917a53511640491c5d68a86d6d0a93890af723b54ea893fe6c44a5a355dab7a SHA512 8ee17dbb4a8d3e0ff0537f856a7eb8c918cb909852cf5c48b70c0e281bfb104d3c231053d2aad9368f82182c628c92c267b4f6946164417efea24c589d343ca2
-DIST artikulate-17.12.1.tar.xz 3746124 BLAKE2B fb02fb203cea77e4c20eef77b6b0c4bc62a30b40754ca8de471f5b236b74f0af55b292f5dbbfff6b162558bf4c81afdd7d454b700995ed4768f3cd49ca3c3a5c SHA512 263f9fe1ee053cf546e647f4c805d4b10cd1d71cd14908e20486d68434f964af0fc7e5b641d15529fb18f09608bfe22abcef59c5b93f27f9b0efe4a9646d00d2
+DIST artikulate-17.12.2.tar.xz 3745828 BLAKE2B 9bed3117e49a6053821930b730944badb7c4633085ba84482037c710021ef14fc16329a134f27b1a7392bb089e7e0b572d153241724e714dcb0462db52e33b9f SHA512 a5157cb099e32069e30fdee0be3cbc484a5e13b9f968da8bc04526c49db3ba47d07c5deb9a432bcef9154e616aba9ff7911cbb7bc09307e44fbd2149bfd2e9a9
 EBUILD artikulate-17.08.3.ebuild 1082 BLAKE2B b89446002dbcf972fc79e76c847bdd146b9b276743d845dae99380a1175af4209038721573b720081c41e8b8b33e2b5f80bc0dd20a160899ccd9f2e836d53fd9 SHA512 539f8270c4155cd134e7119daee810c7c92eef4dcb42c09acd62bfaa1e53c5e4ee0f49378e0516e566d203116d96e31ea746ecd09decf28f1a1b5bd26c2efcf3
-EBUILD artikulate-17.12.1.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
+EBUILD artikulate-17.12.2.ebuild 1119 BLAKE2B 394932d35ece9141d9db95a9544bffa0b86bb114040a05a982d22e365054c05cc7689a29d9a170a79716ab00e79a010e0ddf20a933d24f3e380e397d43ec18f4 SHA512 225511e036aea03d1d495c712cb7f52b42621e803ca3e0bbfccb9e5197a977bdedc8366096d77bf947b210dc25cf50f9bb6c93226100cd58dcd0f77dd831f4f0
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-17.12.1.ebuild b/kde-apps/artikulate/artikulate-17.12.2.ebuild
index 9c910d95fd15..9c910d95fd15 100644
--- a/kde-apps/artikulate/artikulate-17.12.1.ebuild
+++ b/kde-apps/artikulate/artikulate-17.12.2.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 29d9c3a545b1..c21cb1c8717e 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-17.08.3.tar.xz 247916 BLAKE2B b95475ff9080af1ba4f06952913c7d9ef8876e4a676237ff916baa33d8950cffad5e529079185fc5af88028b72339f0552a5bd032f941b2ba36ff6da34bed3d4 SHA512 000e344e0a9b8bfc09fdb57f0fa58b996a1a0d8a24b08dcf90210a519c2157774d666e1280291762c9b7bea45656cc93bcc5ae661103e4648260aae5ea4d7a26
-DIST audiocd-kio-17.12.1.tar.xz 247772 BLAKE2B 99ab12d7753c813f768a190a481cf314b246407913004743bcfcc7ccec1fb76e161c19c56e752aa780ac74a2e41eca8ea13571a5b4367aefc6db6b8b98baa040 SHA512 783093e7645cc41731aee1ef38778e2383776c34738b21f8545828996b7c16911114e1309bd863dbcdeb6b3e1f004286b705882ec1530ca4ee050b942e5010f0
+DIST audiocd-kio-17.12.2.tar.xz 248292 BLAKE2B 18f1ae417371a2b1ea3428f723b6ed9f50966c86547745b3c8e4f87458bb0096fbfd77df38193a6e691deec600f774ba7938da5cccdcd89aaf6e1b3e94f2f93b SHA512 df3559a4e80519fd94de1f1b7c18c4e136dda69fc5c6998c57d8095d7534bb02a4fe9af29858e190e71a918f3dce1bad1c0f8f72b2da3e07dc77a359489a7044
 EBUILD audiocd-kio-17.08.3.ebuild 918 BLAKE2B 4670c30e80a156d993ba1d7b2e170ba0f273c2440413fd808415c4f78dfeb97a1826ccf76f52702d03ffaf3befbe349b7f9bada45bc0ae80dac55206a5120ecd SHA512 fc9b602abb71f8b7495424f8541b7c248769de3034cdb22c43ce7f91621fbe5a360b1f2ffbe08449767396498200c0595e91c8be80ad2994907094997096c7b4
-EBUILD audiocd-kio-17.12.1.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
+EBUILD audiocd-kio-17.12.2.ebuild 920 BLAKE2B ecdb36adda2c4ea7c4551405c2f170f7981c17ad04910e3c141ddab9f7db51a6405818c74d66a40110d24b27fc69ffd4cdb010d2d8022a029104b8dc613cd1b7 SHA512 449160c59f5982043e93203e92d8329fbf3aded193adc5d07b55f3b2b5077db596c435c73df58a7cb5123eeffc339fe0ece189c84da48cc868b9345dae195e56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-17.12.2.ebuild
index 6bd5adfbc365..6bd5adfbc365 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-17.12.2.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 463387a9c297..c1b5fbe4b6b0 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-17.08.3.tar.xz 152288 BLAKE2B 0cd9403cb8c730f27db69b03d24434638f0b3d35a5fcc8b08e573968cfbd7012ad4f455224f4841736e59edc589845119b27ad0905970dca8540eb5960d5e0b9 SHA512 5b218230c0778906d35c5070dbb91c84a708c7784059083ad972d6d20931388f531306c700fdfea4a58562b2573ed449cae4cb5bda2ac1bf77024f2827199e82
-DIST baloo-widgets-17.12.1.tar.xz 152260 BLAKE2B ee9d06d77fc5a41207ad33b8b9f82e0089dbe388ffe0c85e905b9a19d72369c2b9a89c3f58f723e96d14ee3d1f983712b8454dcc58627e4492804f5d03ce0308 SHA512 b8f54014c3d3a3f2250034b56e5f4724b85f86e957bdb358251fe5fb7339c3bf950bf8874cf8730f5f9bc8ae46391ac61ad881159fe2845afb2402dbe06eb6eb
+DIST baloo-widgets-17.12.2.tar.xz 151040 BLAKE2B 409f6f212a5254c600f6d295f70d4ea452cfafe6dc366e82748be33eaaeae65c0a8ce4f7b8f63c01be684608bf4bc8c144af250fbc14d83647f3012bb7398cb0 SHA512 6f337328fffe1499edc15a9021a8c90c967188d6df02df037941417c25bcce35bf5c50e50a8386aae397f9139f7cd77fac2863fc48dc6e397784fa131fe56973
 EBUILD baloo-widgets-17.08.3.ebuild 597 BLAKE2B db062748314ae4d4006cca01debe9fbb1ed4c0a4218bc59f977e6dafb5f7d0f4e0e48d22f879c1d4bd32b38da627b7cd6f2fd892c0731a2c3e508955e9bf110c SHA512 afcaee8bc11f72719dea6c08898f3cb6d432807670013a564a3d975d2ca8f7f55d0cb97a5ed4fa41e5cd65bd6012a83bf6f3a3eb5bf8169469a91abf52c3c91d
-EBUILD baloo-widgets-17.12.1.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
+EBUILD baloo-widgets-17.12.2.ebuild 599 BLAKE2B b4e916fedc42a1a0246c38bd926592d912218660bf1c3ca5bc3656dc7eafa4a2a459e3031e9fe70733a5764bc6cd5808f0c755c24a6b0fbd857bd9ae87aa61aa SHA512 cf7018e39257e5b8748ef58f94b868ea8e57fd2c9cbe46ac0ac232b7e822f2d46462c99bc88304c747ee72d51c0707679afcd3ca85c62d208022017b72faea75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-17.12.2.ebuild
index 585c9262ec1e..585c9262ec1e 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-17.12.2.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 1948b931063f..a317110f79e4 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-17.08.3.tar.xz 2505448 BLAKE2B 17c568e461325d779c8217476bbc882142152c642980ac72b0e945cb7b38d8f594c685800d6f16dfb2aca317af7f4d139bf4f32853a3ed0e715f7cc80a3d10ef SHA512 bb4d8c9ec10cb5ba83411217d137f30ffb4a8975e686f8434133134bd18d68fdbb6eab8952eaff6641935fecba19986568281dfbc8cf36fc0a665c7cbcfedebc
-DIST blinken-17.12.1.tar.xz 2505872 BLAKE2B 4d6049c3d028e11300e7b3d8db899f52ebf103d1997cd5d568e74ddd124f9cb4013e3790111286f08ceec5c759e11aebca7800f530d9bdd0b07f61d31809be95 SHA512 d86fd9aa8b1ef4eb447235c5b44a9dd0b789a96be364dbe2a1ffae15b1bb1ec153dad7bc09f10a4b36b789369f957d5ad57197acda0a79dcf54f68a4b13eb0c2
+DIST blinken-17.12.2.tar.xz 2505876 BLAKE2B 146cc46631506c19db724b5884d7f75545de0b836f9a3995596fa65cb69dfc58dd8959a22546efec8b641ef484c47cff20583b2c15193211fc57f7574526adbd SHA512 a09b23b2cc91513c2cbabbdb94b2d45aa987f21d5f135f3f878163d3ee9211eab6a2c26d7e0c979122b6361df7b8f9147f457432bb3a6277eb1e513b1c811dbc
 EBUILD blinken-17.08.3.ebuild 768 BLAKE2B 367f60576b32adb4e0c1ff7d84ecb2c38be4d38dabf8ee2505323d9e9ed336400330eabfa1596ab6b2613e893fbdfd8ed633ff3a4d9e4242f59bda555fb595e9 SHA512 b643e666cf7409dfb0e1356e32bbd9eeef3ccfd6d2e51dea0fe5f8182d4e1894811e48c23cc4b384adcce2dec0b9a1c206e725b10567b091827e003df65d3e82
-EBUILD blinken-17.12.1.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
+EBUILD blinken-17.12.2.ebuild 770 BLAKE2B aeed4cf2f1b1f9f4a45a0492985ecae692d19c7cac1a618b2bac55165901bdb580cc6d521ed458f997e15168824b5dbe0f006f4fadf73e5f9b9627d8bfec52a6 SHA512 1dfc596d4fc692fd22b70a9ebb1e62dc8f71794b6edb328438852a46f103873f4c98fa196c61f8657981f51ca9de06aac6517120c78d67b740c0184820a70998
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-17.12.1.ebuild b/kde-apps/blinken/blinken-17.12.2.ebuild
index 691085603aae..691085603aae 100644
--- a/kde-apps/blinken/blinken-17.12.1.ebuild
+++ b/kde-apps/blinken/blinken-17.12.2.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 43cc9d367958..685c366fc8e2 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-17.08.3.tar.xz 754600 BLAKE2B 8fe272d55026e8925e7587ffc8bf8465ab765805940eed318f4d3accd3876325f7a03a9e993945966e83c78e555699d79fe2a99e87470f6e355a7de6d69e7b87 SHA512 2fb6ad0b91062bfbb8e861493788f4f042d7a2244a0a93d3070109ba30e43653825dd060e65debaddbe7c26f416248e8ca68a2282a9e375fcc225750f35f7520
-DIST bomber-17.12.1.tar.xz 753892 BLAKE2B bb6c68b8d9e89f66bee395fd485afc0c9bbe948f5487b9019a4d3440e1da2678b69ca3aa72150a216b4f4f6e378b16266043e3d95ae7777238a124733fa6d1f3 SHA512 b294c8024de866342ae61c31c8e183306883655f6571b0868466a481fedbcd205b011f206dbb0cee6785c20c1446c09d189c135770814c7bcacc32b4520d74e1
+DIST bomber-17.12.2.tar.xz 753828 BLAKE2B e43230d2d282e9628925a1689f95bb111916a95e89a4c7aa5eb29e23eea7d194cfcd66df55e5c384509844c597fc5f05f3e202f535f08a31dc29eb0e4b95fcbc SHA512 27563ac622e4b3e2eb796ddc9aa7a90b6971775f2873464466e9c82e5c813afcfb2ea4f37bb7d1eb22c42d3f2300e4d75f6fa96ce262ad072710ddc48a27edc1
 EBUILD bomber-17.08.3.ebuild 685 BLAKE2B b7019f66e915f0383f5a207c8695bcced698b2a2f097904f7a3625ebc9e6131b8bf536d9ee42c984dadfb9e468d50dcab9eb772c3a7c90bcc8b80b422c402774 SHA512 bc2b8ee4d40c5b394cef4210faeea9feb6f6566c7fe198fa331dc696bec0da7c544a922b1325bef0e4538fac39cd18808b3101bfaf744a9ca8f5b60719ef98ec
-EBUILD bomber-17.12.1.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
+EBUILD bomber-17.12.2.ebuild 687 BLAKE2B d8b62bfa84ff255f9a0515589a1f0063674340b0ea87486f1a76a1553b0e016dd32928e36799e3608659479a0ee8958783d8a4679e81679055b48a159b68c419 SHA512 9867073869e50018757499d76f4504588b7cdba026763add11849ef309c3e7e197cd5962b67309c7c153b42fa4388551c2425a3c1f655156f5894245c794b5ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-17.12.1.ebuild b/kde-apps/bomber/bomber-17.12.2.ebuild
index 1131554ae2a1..1131554ae2a1 100644
--- a/kde-apps/bomber/bomber-17.12.1.ebuild
+++ b/kde-apps/bomber/bomber-17.12.2.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 2507717930f7..361575338777 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-17.08.3.tar.xz 186460 BLAKE2B dfb74374515a7b5cf88f618e5db04121d776656131ae6aafd63267c8da390092ae9c5793ef6ad47427f2a81503113694f16aed54f7948dd761306bb0af5528a6 SHA512 6d37cd6e687d2ac1c36bb3a9503bbfffc926c5b4d572327315bbdf70db42d956b45390dad74b839d8e6f7a641146ba25c5f84dc67640e1666e0fba19b2760013
-DIST bovo-17.12.1.tar.xz 186448 BLAKE2B e106cf278b9768f29905551454c9c0eea46d4896de792ad9a70b464952effcaacdc53ff79e1f8426eabd3f8efb31f9338456189e4d681c158d7b01db2c3f9884 SHA512 d162ada28c13f6983220e7ca0fb0c1a6276878d7167d4fdf91550c1e4dfce0ad3c23f3c24699d3e302fd63518af36311da9c212e62912336b3d2999a60cce6ff
+DIST bovo-17.12.2.tar.xz 186456 BLAKE2B acdb079ff88965a9d3b39cde6c74c4181a447a504e7de8976cfc51fd1af969902d983be4bf7ab1f08b3b23b758f2b31fb72b39b4ce2062bcfd84c40defabb830 SHA512 42b37cf929755e730b30125977ef19858a9f006582eed62d20646b1fe5428c9731aaf840966d67c6e251c1cf279ee852e5bb4d31e58c2e93e92225a55f407ed0
 EBUILD bovo-17.08.3.ebuild 702 BLAKE2B 619059ba09022f6c858938b261368c2e662b7996c00fca2b832590bcc814f86ca63e62dc5a464014932d925372ae1ac091cf969acf198035eb9c1ceb975e96ad SHA512 56399e966cc24be1aad11b8e1442e66918d0404e43c7247c30e5794c939dcebb8becfc0647ed54145ae4996c33b20bd1b56eb02f2a824d3e38f34dce4063bf10
-EBUILD bovo-17.12.1.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
+EBUILD bovo-17.12.2.ebuild 704 BLAKE2B 7abe20171e86fd1c18b0a5ded391057ca3d1e180f60edb47f9daffcc6192412d9b8aceab2458d15cfb7ba20f7bf5f947d7d69ee2433cb4b941751172b2554ba3 SHA512 31fc53db3f3e0fcdf5f240b9e9c935260ea363226881e90b7ad3f59bdd6c3a3cdef2c10d8fbe0be37de10df47bf525e7de58d56a2b4b3e0172d3aa965624bd78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-17.12.1.ebuild b/kde-apps/bovo/bovo-17.12.2.ebuild
index 8f3de523e8a3..8f3de523e8a3 100644
--- a/kde-apps/bovo/bovo-17.12.1.ebuild
+++ b/kde-apps/bovo/bovo-17.12.2.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index cc6d4125289a..95078c0dfff8 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 BLAKE2B 27b584a5a06c7d5388c4a182f824005e8905b54773dfca8c010faba4d254a73d794ed4b1eebdc516ba7a100d0e3b841f37b4a23e2efeeec6416813c2ed63f949 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40
-DIST akonadi-calendar-tools-17.12.1.tar.xz 224584 BLAKE2B ca816ecc8deb68032b3063cdb777e92b4dc94b9eba782e285a99eacc40742e412f55c6c6f9fca3797b20692a2f516cd2414a0425a2a40a6a3b0ca8bf5bb614e1 SHA512 a7a30b833a835921b071a6288507f131b3688de38262d5fa6f49acfb32148d1625abd5c3e777af6452166d54d374e2991b02c11d328f9aec2ab337581ca38311
+DIST akonadi-calendar-tools-17.12.2.tar.xz 223912 BLAKE2B fbe922df2214d62947380794aa1af6cea40da45709644ee419166864254b296440ebfc1f4e14c3ad976fbf350c5b18ada0eb37c9227131fc1b1911d347ba4d93 SHA512 36c89bf4a3bdae29c727ad6cedf580439ffd9aec3ddf190b74a24c53af270ce173ecbbce02f336e4b2c3f3482670d97cd108d27a12a4aac1df14cd31c91fccce
 EBUILD calendarjanitor-17.08.3.ebuild 1029 BLAKE2B acdd23c3b1b8ca3990583b5a5418c43a764412b48ccb095dc8cabab3078481e7f66267090589db86212afaeaa3a36c9ca96199c36861d182ce01f0cb853e3427 SHA512 55efd1798069155678bb6cdb3b532cd006efc3ce2005b723d8a86d4337675f131dbb516702643ceadf4f63aa5aabd7b3d09a897b50271af9856dbba199282288
-EBUILD calendarjanitor-17.12.1.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
+EBUILD calendarjanitor-17.12.2.ebuild 1031 BLAKE2B 515efde0fe008e2d1625e3a51f4b3ab5ba09fdf0cf10fc40c64e1010456ce13165f30e5443c29fd8a1804a514c41cb7c8080841b776043a49f4572545a9a2779 SHA512 4f2b369eb174348da6ad3cd3958ce363df5efbd3a2d153ac33bcb259db30cd58fe60cd22b2be8e0ee961033c11a6ea94b4eed67284eb72d4041132d4dcbf01ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.12.2.ebuild
index 026dab8a1418..026dab8a1418 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.12.2.ebuild
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index c152dfb4061b..01f74ec35807 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-17.08.3.tar.xz 644224 BLAKE2B 3a995ccb6db2d33abc7264fe0f50ac33b21dc44d76c0008652fdbc1ad7b7187da56879f17e3bc636b7810d679a27a6dcb53cd9a6beed815d4dcf61aaa84f73af SHA512 f7cf312d4e1970fd5d701c26e035443d3505fdbc97d6ca3f4c95c9f193014b3537f09d36c66d159981d22c188c38008ba359a70cf76eac2c3fe291441ee17587
-DIST calendarsupport-17.12.1.tar.xz 644840 BLAKE2B 2fd723c13bf89d3047c1dda3ba16550edf27d209f6aab9c01709315045a9e81eb62e37c57124a952d0677b03cd7163def266d91942e3f79d1da345f9e3dd9a74 SHA512 689d9b6b1d68542f586199297d3713bf052878440f3e4b76b97f78c11b2c69efa567a6252d582d09612922628560d870b342db6b143578a4a76f8ebc567199e2
+DIST calendarsupport-17.12.2.tar.xz 645772 BLAKE2B 2b6bb17f5c286307f9ca461d2d91cd46efcdf1e433d27c5d9b85b6f2013b754ac962ffad0ec494925555106185d3371a555d2917581b267722954079d0134dae SHA512 c3a801b0a03281a6512a83b879297442b2c94fa960f0da12f511f2f302a34ff4db3b25aca91cdd9010a96777cc7782914f87c40f93efc068ef54ab4e06db5bd8
 EBUILD calendarsupport-17.08.3.ebuild 1192 BLAKE2B 7816a15d93e0ede8d94e7667d93c37f7427fac14ba99634fce55f04b88e9a956daf6e3c61484bd71100f2f59e19827d3744951929f5e592ddfe4ea223a829d62 SHA512 1c982180928d0dfe38b75f118f28e21b0805619d39249957cc0b13582bb533bbcf1f8eaebc788b3bd0eb858a607613059d6def8cfc0ebe45ab7bb8b46777bcb7
-EBUILD calendarsupport-17.12.1.ebuild 1098 BLAKE2B 3fc32a388183d2afab5e56acae48cc3898a72ea9458fd869fd1aab08f5d52329120689668edb29202fd5a5b243827fe9207136bbcc411555294fadecbdc12db3 SHA512 d39e71b23195e5d7dc54257b2480c43ebff33fe8b8baafd3f97bf889b39c6bd519eb1d62a6474548dd048094dfaa8b697ca57c70ab846c60d91018026f640bb8
+EBUILD calendarsupport-17.12.2.ebuild 1101 BLAKE2B 06c987a38a03ce150d785d86eb8a358b82a001501ab1aed6e48bfb8ba139cf82fec277ce8e33d4b158d85a98ef0f4e7c41d5ba0213517b65ff78d5b490cfef02 SHA512 f93a5be882627278bbbb52cb4677308d1999b73d9b08776361ff3d0287d9317173ebf629c3e0e4fd9696ef9c9985414f0317928e5c472a87569b11427cbd653d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
deleted file mode 100644
index cbb63540f6a6..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarsupport/calendarsupport-17.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-17.12.2.ebuild
new file mode 100644
index 000000000000..04abac8577ef
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-17.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Calendar support library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index e0df672b0a67..dab07ac0bdd4 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-17.08.3.tar.xz 1062400 BLAKE2B c9ee9ca23679566c7e8b1895a6ef5a332d486f8abea75242529cd5a5f99f506cd1b3dfef5591a6275272a5a0b8441ff9ef1cf8621c236a7357c5391d187e60be SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b
-DIST cantor-17.12.1.tar.xz 1064476 BLAKE2B 64eb91b1f0f033c5d6d33c21c9077cac1eb3ccfe33f25047dd18af8fec029cf1b5b26c5f68908eb3d12741ea48857639bb38db97748e48a6880993d37568711a SHA512 d15d9699e05a01fe5f376942dd39fdc9f6e8189819d44b11dbadb7ac43638766a233a361d107aa572e16df598eec4e220bfb9740d741d60a10ea7b00bb6fe095
+DIST cantor-17.12.2.tar.xz 1064220 BLAKE2B 45315ff528d7e032f1dc49f13be53f81f819d7cac8d85e6f8d1d32ebd94207e0885ba951412ad3f1602eaac59b5b6ef227b124afbb1caa6674e6204acb874d62 SHA512 3ee1d8eb845b2637a83545e28566d55d361204d21a698acc24017a2d639387b6804508fad8c533975dff80c4a4779d282333f6321447fd906fe2ff733be5b6e0
 EBUILD cantor-17.08.3.ebuild 3143 BLAKE2B 0d62ce2827824722dfae67bdb336f3e8cab3286d531d760dd94475fba809d4d23c76cf02860cc43df394f7b4e5d71a6e54ac80b3142d6496b1609aea6cfcd9d3 SHA512 e4e6b053a23b08a21775b42a7e6022c9c57245570d3d252a9b486bfa419f17e072b2907218731a41538cf44555b260d07206dd7f891891e8210717bddbb0c5e0
-EBUILD cantor-17.12.1.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
+EBUILD cantor-17.12.2.ebuild 3181 BLAKE2B 0261eb7e7526a73152dbfc6474218b6ec81eb8a6d612f8de2be2a53e0871492303704b93ee74d57b8ffedd2f5fcd7900f199c2016656693cb3da7fcbcb2290ca SHA512 c6acfee7b2aa258b16d66d885f6ff231ca3eb5c5d58dd4939e15f444bd33273610bada28119e8252e3c5e67c8d9dee81bbf2e4fe0b2a6576b538f1c0ef6e4200
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-17.12.1.ebuild b/kde-apps/cantor/cantor-17.12.2.ebuild
index cd2bf41394b4..cd2bf41394b4 100644
--- a/kde-apps/cantor/cantor-17.12.1.ebuild
+++ b/kde-apps/cantor/cantor-17.12.2.ebuild
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 999daee78b97..905bb654d06b 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-17.08.3.tar.xz 1905528 BLAKE2B f6780929aebebbda7ea1cfabc239d9b293c3de50363c9677b2bb6cb2486a4d239febc066d24c52d99716ccc8c2a7442f29b096da90d3db88be0af489d78f23be SHA512 0e9c5136745da6b6a7ace7bc009b87d697915b7fc39689c6c4b562d8a2e70212091e650043cf30abd453f1c59c64b4580e2df61ea5af3551ac3c9d45c15aa263
-DIST cervisia-17.12.1.tar.xz 1905836 BLAKE2B 8e7faa64a635767ddd8fc9bc2ad4882d624ec43d0a97d056a272f4879102dbf4e541065d35f38cd7d126e941a5dc05e207940426e47387b608cdd50ab72c7fb5 SHA512 eb4e2b615a73e5e59c9c6d38346721658f2864c8cacd32c08dbb555e767d0dd21967fa17bc98c524211d84f87b2b849ec9d23108795f6436dcef49c23c405e04
+DIST cervisia-17.12.2.tar.xz 1905744 BLAKE2B 4352ba20f26aa0efeccbe83c98623a3141f469a05ccefb189f46da8ee681576fcbd4f2c0acc1ca0681981606b4fa0ba0be498eb548a6854a0d61c80dec033aac SHA512 6aa1ec99f3c60b1e17aada9adc6911405ae5ec6145c1e4347aed27e4728440be7cfe717264be1e56fed19b25848da1a9664090f2e724b0aaf644c50a1fa7d053
 EBUILD cervisia-17.08.3.ebuild 899 BLAKE2B c9e548c35aec8de47377ed41f26792cbd64e6dbe186b4b7a0b96f91f4aa36b983f8c3e6a0b260a92581e6ba42d27257b28c7201c7dc00b2bcc3c8ec121e09162 SHA512 683851aed8d3e486fe348f1c644d583126c9b2ae11ebf89bf91f721613188831a007d9fcb9266750fe07c890bff1fbbd307fac8da683d9bf15baaa787e417b34
-EBUILD cervisia-17.12.1.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
+EBUILD cervisia-17.12.2.ebuild 901 BLAKE2B 02b65ad97b02ffb248a9cc1c42ed5a62133a31c558efc84a3c14db0d146c1c5582d06ce2b1954abe006c9400495ffc37d134d5bef38fa87a5eb11a967bde718e SHA512 8f92984ac5c39c53e755a9cdb48951436b49dbb5f2ebdf23d69bc667c398fea1578eaa99d0a1252f9425334e3d477192bbc19fcfb8355ae5724acb60d12a7f40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-17.12.1.ebuild b/kde-apps/cervisia/cervisia-17.12.2.ebuild
index fe35d7708a72..fe35d7708a72 100644
--- a/kde-apps/cervisia/cervisia-17.12.1.ebuild
+++ b/kde-apps/cervisia/cervisia-17.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index 81403e435e57..065981315e7e 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-17.08.3.tar.xz 187084 BLAKE2B abe392d68e622c8cc02aaae31d71ffa28bc19544e7b9306ae3cfcc73a18ae9d4b453626274158d94d52140bff16e39c987a68423d4e24dfcac38efcab65cefef SHA512 49bd9b9059a129e9276d2cc216679abbdec595a98aa3ee950164fafcef30a2206b18e3b7487a6665aa3da6c643d92017309fedcfad0caacdadd7433126690970
-DIST dolphin-plugins-17.12.1.tar.xz 187316 BLAKE2B 36c1f8e264daa021f27aea9675784443d7d223f779822d05e077e93c232ba828527042507ee081758c958a9cf9aaad6d0f5a1551a30941b9ac9820fbfd6127bc SHA512 e0e63cac17211ab8390e62274ba69e5706dd0ff3df5a3c91adbfb4cc276cd79f73e6209b7c1fc8c1d4ffd804a974547d58f79bd1a4cf7363783a9eb1a510a8cf
+DIST dolphin-plugins-17.12.2.tar.xz 187312 BLAKE2B cd791a0124cf7e38ce491fc08f891d2774f76af335e2483068890652e2f408caafeda901e5cceed6ff41643dc107dc47d5768c6dd080c70ed1426f25ffba44c9 SHA512 54336bcd7f31fbda1ba241917dfd6381cddae2854f2d974ffe4a104103228903467e27799624bc718cd6daa001329b97418483cfbf13e31f6075bbbf3b098213
 EBUILD dolphin-plugins-17.08.3.ebuild 1841 BLAKE2B 8471e65d62c01837a46cee08ae434db7cfac3cbd67703456f393ea564da8ba1ff328b581b817255918a1d719a827a77fdf8ec5042521dd4d00e3abf4c999176b SHA512 7bec4439e60cd13a01eb08098859a685d11022435f091b06bb9ef93eb60976305b026d8efa36e7f42e749e7b2b7764d1fab4065cc65b30812246f0e1afbbb255
-EBUILD dolphin-plugins-17.12.1.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
+EBUILD dolphin-plugins-17.12.2.ebuild 1843 BLAKE2B e299b83b8d1b9dce59785dc4ee02bf83cec2e48a7708aef8f22d985ed30dac73dc6ab45381d12ab0294569f7b2c7226b55f5c81773692c5baab81172bfb69537 SHA512 8d79773f4279d957f465532c9f3e0fc75d182701550ddc50ffa1989b05747e08d70074ad3593826879bc1000cd800c6e404f84527dcaca8ce87fb98d1f16a23e
 MISC metadata.xml 532 BLAKE2B f874175daea65b92744c45f776610d0f5964737008bebd51e791dcd308126fa4e943ac51ba20bf8d69ef75c0846d925e4e8e724b6bbc03176c407e09a6d636f1 SHA512 9dda51a623ccbdda9ea7f5eaf24ac67df732bd97f510e524dc23f2cf2785d4c3dd7359f1f208520aa09899f5f049ada99f75ec186f4c89f27a18f4f697a444fb
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.2.ebuild
index 125d149d68cf..125d149d68cf 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.2.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 30f2fbedc108..0e0a9ca5e5cb 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-17.08.3.tar.xz 4832732 BLAKE2B 8fcb23bdac474ed4c0e8cb220f28443ae759ed5d818935ec96eee02121855173ef905938dbf0ef024daafd3e946bc1c544a3b82a10447aadd5fc3a17eb4de241 SHA512 c2b0a41b29bc0370b7e9614edb5cf80585748c3fe2179b40799e5922dd7370c75608b756384d2155b1a1a7e8cec599e94539174a615239303bd6ee002050b662
-DIST dolphin-17.12.1.tar.xz 4840748 BLAKE2B 803f27c3a8b5bd0dfa1ca9eab01c3a3ea7c28479ad7c4ace72b74b1a5565adeda5ff8c1a6f25625bd3dfc263605401808c595613d834d89ac0b433286130c6a3 SHA512 0780eeb1bb730ac797532cf52411ad1036633565ed1e098b35828252f1a393554489367a136029b5b43f4783c4b5f16dbde1ab38314df997f206a91ddb540837
+DIST dolphin-17.12.2.tar.xz 4840736 BLAKE2B 0adc8f7d6e981890c9665d575a7187a44aee80629429a849a392423aa1ab5f2710021c3c661052e8e15f9d20f821544fc92750898cad5e61b15ecf0b0719b3eb SHA512 3c576d6eeb373790b8b4c6a13b01df606bbfde7b0c08da5965d31e77a1f88a3ccc79387b0546bfc039a1abc65b4bc466b39f7e128e67ecfe0f613c3d51e85d21
 EBUILD dolphin-17.08.3.ebuild 2230 BLAKE2B 3d8c7e7c23da9441de0cc948df6db2879d633e71bc0b573501dfcdfa651d5f76fdc674278bece6f36ce8785e80ea40e2f15bfeb8c6a0317c8b56a71fa16dff29 SHA512 3b1c38355522d0c5d8ce83ef9f5ba69ad5745db4b157e649773cf6dc9f5e9b4414728e6ea77e8d8ea33d0ef3fbc241bc48edebef2bd36609b79a7840de476c53
-EBUILD dolphin-17.12.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
+EBUILD dolphin-17.12.2.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
 MISC metadata.xml 331 BLAKE2B a91c4bcb2198a9547445e94220760e327f2cfd2225e4189b4d5ec23ade31bd0c2560403cd085d91430fcde303df0cf25477b840aeda3010f332a3f053aa5aeaf SHA512 2946556cf6d92f1d2c33c44b4b261003d6e26f2829944082422afceab77f7a504dac7cc945fddaa0539953884b57a41dcc8f2f8b972b48fb4dca502b8a92d367
diff --git a/kde-apps/dolphin/dolphin-17.12.1.ebuild b/kde-apps/dolphin/dolphin-17.12.2.ebuild
index 256cdd947622..256cdd947622 100644
--- a/kde-apps/dolphin/dolphin-17.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-17.12.2.ebuild
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 581d74868caa..4ed61b66a910 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-17.08.3.tar.xz 1463028 BLAKE2B b5804388182fc916d458d0c08d5cc3f39ce59222732f282199d1b57e543abebbd79fe1b1ec894935c4cc95bdd04e2b038a10c1ed62339fcb1eb49f545a568f35 SHA512 ca71a17ea38f5ea28c53f7b10a050c25b12f7e02da36dad8140868cb6a86d10b2d4efb25df28ea05ae65d36bffb074177db56c4b6a2505364dee060f8e47b5ff
-DIST dragon-17.12.1.tar.xz 1463184 BLAKE2B d43bce2a65301d0f93faaa849c69093523831273410032247c96073b5e1b0acda0dbc133d4a6fd16aef3dd7252133eddfbd886c4efdcb9c2d14779e93a3fe72c SHA512 3326c0485ca505e75c4c41e53ded1a23909c045335674b489eac181bc4aee00b167fd4338456882236034045568630b985f8dd52beee70f35f1adab8bebf6860
+DIST dragon-17.12.2.tar.xz 1464104 BLAKE2B df98710a5839809312fa69711dfc7e55eee629b8b4ec5b53185fc3ad81a76d45e9bee20c32be38d1e93c95172f555354894ff7d7a24cdf882c931fc78031679d SHA512 8df5e3b846b01cf56fe19413aa16ec99933fe85bc15a5e04d3203d6020c335c715e7ce23a424edb3f3544f12a0f647988777f7c0ac213b618008f270edb7ffd9
 EBUILD dragon-17.08.3.ebuild 956 BLAKE2B 67d59ef9b6c6f1a9d28a0d2a81569e33c36795ae381cada1506d26fc5b5eea67f39b30dd3c210f31de8d6fbb49a278cb0075842482ba9d99025cd7a017b1c793 SHA512 7c738d318eea4475b27258dd5347d4cdb596a48e13c6f51a1b1d986143d4808b74ec3f1a1beaceaee483a6bbf3d3c5b13141ab5cc0fe53e36c1ede64ba9f6bf5
-EBUILD dragon-17.12.1.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
+EBUILD dragon-17.12.2.ebuild 996 BLAKE2B afbf32c22cf17e0b45aa6b44b60827253d0dda4566ae1095043e1c37f9b7a7478ac12ba8a0f7003cd07fbbc9eb7ec756728c7af77dd9a128bde9fa1ea85d06e8 SHA512 ca172c2c600e8090fc60e5495cbb1bc23857fd3e536122ee6e4de6d6cc505c0691c2139242f58ca42c7e16ad3ad787090147fd516e1ef3a346c6e2d7499cff01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-17.12.1.ebuild b/kde-apps/dragon/dragon-17.12.2.ebuild
index e97559abf858..e97559abf858 100644
--- a/kde-apps/dragon/dragon-17.12.1.ebuild
+++ b/kde-apps/dragon/dragon-17.12.2.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index d9c2db796023..414cca48759d 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-17.08.3.tar.xz 433968 BLAKE2B 3ce619b1f5498dbf434e396eda47274c834e65a12b4899b5eb5bd3bb9e09a7887ceb0cd92b2bbda240f1c2b58a59293001ddefe619b945030d8b6288fa91de7b SHA512 ac44d1657293430ef4edd0ea8119529fea56fffc0c88dac3a928a37a4191f345ee5f035b2a70bcae22d6da0c3fc9f8642ee56c050da91bffccf7864816a4786c
-DIST eventviews-17.12.1.tar.xz 438316 BLAKE2B 8b1747d8e44a2858ea9528e788a130fb1eed8a6457ee39bc7aaf1a9ef3a866cc2625d7e8f75e5ae6f42b941a4355b5747e4407f898f3e5d51934cbb4647cfa13 SHA512 4c02d634c8fc7b2efdf54f4954548b082d7e50b74f754d3291ce4fbfdf25a7be6dce98060e9e25985020d4a8ff12d500f5fe38079fa5fb7f034de87e40216dd4
+DIST eventviews-17.12.2.tar.xz 438312 BLAKE2B 4f39e10e550a4a8646b7508aba187f97e01a681b035f67f14db3ba039a535e9b8ab99f26408c84f6bbe03b48d35b3480ab041bf43270623696a1aaaed800435c SHA512 60b065457d7bbaedf9d5008b0631e40a88a729329ed4207d679ac468c575b89aeae8d369cdd0a4b4e33b9d7ef861a7eefdb6170160835062ab722eb1bf87e6d8
 EBUILD eventviews-17.08.3.ebuild 1067 BLAKE2B 3200fea53e6d0e2f938c98717856883eff676bdb42c2390b8a7bda09a35c4a6616445d0f12422f5c7c7f280e67aa952b76edba6c1435c449372ecadcef824621 SHA512 7a822d5340684929578c57869d6e154d35eeb5a5aa0bc1874c12c9bfd8f7099d802834faf13a8eb4e01756ab773526e641f81ee2cd2afbdcb82f0df920888885
-EBUILD eventviews-17.12.1.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
+EBUILD eventviews-17.12.2.ebuild 1030 BLAKE2B 41627fe735e93e3eb21510097bba83d17b3bf65a9aec177e1df89c4265bc535eb4cb636895d235cf954040748d0abb432b8662334772058ce982bca7046319d3 SHA512 0d47ceae795d0b382eafa7be4a75e6e1a611a36bd94e0cd5a15dc72c698d8d2ab3b81e8f2c5e94fbcad7a0a47921a0f4906f54a48904bb8c8e9d75fa394cbede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-17.12.1.ebuild b/kde-apps/eventviews/eventviews-17.12.2.ebuild
index 8b6b5841912a..8b6b5841912a 100644
--- a/kde-apps/eventviews/eventviews-17.12.1.ebuild
+++ b/kde-apps/eventviews/eventviews-17.12.2.ebuild
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index af1df42dd8e8..037e35dd091d 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-17.08.3.tar.xz 21100 BLAKE2B 29f53acf700c15423a27b9616d6fa3151ab7282aaa158d21f5a396857d7889f14b8b1030913f9a5151c427490140ca2bf35097327abad41566eadd8c90ac1075 SHA512 81ac9b17395fd07bd49200393eba409d7d5c3fae3ca78772dca1f2d24ce7f7a1162ff1be1df7fd1f7dbfc055af4163562c3a890c89eabaed7eb000afcbcf74e0
-DIST ffmpegthumbs-17.12.1.tar.xz 21108 BLAKE2B 46b4c53ebb3d7113340b30048b657d015c3583210caff256f9a2780e9dca09b41fdbc1727c55f44c87be599a37789871a11409fbc990354ff35d7fac31982922 SHA512 534b9b8a85bf02bc2f58f5491b1bc7f977d9b3031042cd1b0ba2b4adea5a36e6e47c7e650e4aeccf41b0836a633c2b4812dbea9d700cce87953027edd990e5a3
+DIST ffmpegthumbs-17.12.2.tar.xz 21088 BLAKE2B d7711947606716add92ef8edbf32ce5d7924a1db061377eddaba65be7ccde43551b4b72994b582301f350797406a7c47a7339d202072bb64d798d3f3c439ee55 SHA512 7b29638f0264ae6a8aa174563750e7d9028e543f54d9b10fd92e2d0ffab730300582483db1f916456d396e79504964e41e64fe4247935f1a5476a1496f45129e
 EBUILD ffmpegthumbs-17.08.3.ebuild 436 BLAKE2B 333b7d3fcad5fad63e694856f910d530d51c78c4b09cb05000f8d7b69854f2e48572bc6f83d9c1a794c58e3ff564370825b85c630550dfc26243667d0de7402d SHA512 f4e5759b45ad5e9c387f59e56bea8606ceaef0d3e8e8908d6536b2ecd3e040c8630dbcddd55d9f03c582570961d5c751049f2323e085c11eae896be05cbed678
-EBUILD ffmpegthumbs-17.12.1.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
+EBUILD ffmpegthumbs-17.12.2.ebuild 438 BLAKE2B 7f5d2339b4c958231a44f54a6ad61e538d9872e3cf51f464778d6629b2882373ee5cd5f2f2f6408a700c2f11d88a52bd71522720d71a3be47d42e70cdeebc17e SHA512 3fd443e1dcd4ff7800067f636fd464d11f59798bf715fae3c12697443d1012a8a6f7e39ab350de8e32fd7661dae42adb36790ff098902b0a90c88055a689d8d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.2.ebuild
index a00942c7569b..a00942c7569b 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.2.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 515f885ffa0a..068d67421964 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-17.08.3.tar.xz 650248 BLAKE2B a8d41a4c65e27b435ae00f71db150bb5db5d88a1dbeae866a32b3e014fa3ff087950cf69e6627a338b36105589ac2e5da3101c9ff64c219a90f8a19d7be4ead6 SHA512 e1da378d1dcf1ca7f6ec38900a0909768cf6c0de34524f7e35bcb44767a35adeb76d9c59ba5e079cabaa40f5cadbed68b10631b65457d1f40eb8b2be6064471d
-DIST filelight-17.12.1.tar.xz 654724 BLAKE2B 3f0833dea22080acd705d131d5e0bdcfaefb0822f4622885f0ee6b8d174821f6a49d6077ac61b5639346200272ed777024f45c6fb4f01c06ee8b00ef78e6c410 SHA512 9282dd4ed14ae8880af5ea97760ceea2011af5c6789fb166855afbdc8da002017153988549d7b49a1e38d184da2f92a6bace907858dadd9f04738456b882439e
+DIST filelight-17.12.2.tar.xz 654932 BLAKE2B 1bacb9e744410b1d181853da5d740a4c0f3b0e05f4b72622be3f025e33d4ea6b8acc090a57ea39aa549e8f3c80e902756e727dc4907d592d7e622b67b7eb9b3a SHA512 a4ec049012b24f901fb6817af7fdf8fd6829167129746910d236168c70ae0ce1f2e7a671d03b89b93be28cb54b18e5eca231f1bced37384cd44a08fd43b5a4fc
 EBUILD filelight-17.08.3.ebuild 702 BLAKE2B 20122f5cece77e79db52988d1351674f7efdb3517a16a780a2a2320afb2f36bcae53b0a643d4214fe209535a60836b925858aaef644aff6f75a3c1dbe829a4d0 SHA512 149162e50db40eac8a78fa1bced7849ea43a8b11e77199bc4a496b14bf52c6fecd11a0cfe52d87992bdd774204cf73aa81903f454d4f8eb527a223bff861d7f5
-EBUILD filelight-17.12.1.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
+EBUILD filelight-17.12.2.ebuild 699 BLAKE2B 6e9b88c7f2f2e90a799caca7ec74a45f4132600c0b0a35a2074e7ffa7e5b9a450b839ac83be89045da2f79f9c4b47443630159117d7847010a817501eb24b7bb SHA512 e1045b8e20af7a4394d171aed98c14f371198e394863bf13e8eb3aecab2ff8e3d653f396c046e06f163a7ef0f687699991a91ed207689670d65d0c9596f0adf0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-17.12.1.ebuild b/kde-apps/filelight/filelight-17.12.2.ebuild
index 03b58843a55e..03b58843a55e 100644
--- a/kde-apps/filelight/filelight-17.12.1.ebuild
+++ b/kde-apps/filelight/filelight-17.12.2.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index f1aa6ab9ed4d..f216d4b2a867 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-17.08.3.tar.xz 1959756 BLAKE2B 41695a3bed6c767bfc5a776bba44cf473d3cf00ebcdbf2badb0221247582183626462c4db1374ba0bc9884b10a132cd68972aa71f3dc742433a00350504e436d SHA512 0edf00c3523fbad518ab757812ff217a1841ebf712f001f9007ba158c73a7994f5aa94b94f5a9efd813097a242204c87b8103795f29f3058946ce6f969931e56
-DIST granatier-17.12.1.tar.xz 1959924 BLAKE2B a4561499a01cee69d6f1bad48bbf5214967f4e199ed6590d60fc13efdf7f6cd614f3348c1e6c0a649b1d6d5735a8df2d1239f177b50d62d131b7875c2d74902d SHA512 945bd6ab6c69d67abeba2ff4a5e0da6e2c5acf639c9543d57b2b77a430b44710b1892f3909c1a583fa9dd5cc3755545c367d8e9f54c010333c18fc00017a3b0f
+DIST granatier-17.12.2.tar.xz 1960052 BLAKE2B 964aaea6b457392fe9eda9d77994ae8d6415abfdcfa98cc67f08bb08a6f047da4629dbc990b1a4d91406548792880adfe673ac0c49d9d96ce5b2c9f0c668561a SHA512 0a7747d65918c90d47d83bb3056c3e05a4ecb560c64b37dc4eb52b7e7329ce76ec45e99bbfa102e21f3877d147d8121e97c858bcb4804832187c5e41723a8217
 EBUILD granatier-17.08.3.ebuild 734 BLAKE2B 85fc42390403111ab20f710b73a47ff088f751a50b19cdc211afbf24c2c1a559c78bbec63f6cb7446c444382655141570cfd087ba07686cab447ddec20886848 SHA512 057edd7b01b338a87db19244e1d3ac3804cdf8d90bb6c64944455bba87bead0b4642732021eff03bc03d8d7634b8dcb2489068a929091194d56da0b734de3b8b
-EBUILD granatier-17.12.1.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
+EBUILD granatier-17.12.2.ebuild 736 BLAKE2B 8dcc7076fb8e0969030d2221fada5003c4ec9dee303883c19075ea90e2381c51f0eaeaf669c588d9d13ee365723ddd28ec8c9f55909dba8e808af15d7430890a SHA512 07cdcde27cbab58c48e4f68ba9817677e049cc872a6e0223183cceafc29d47f1492e1bb35c77a55c023d6fd396b1fe83c151f0546d318c8d63ae4c0329b8dde2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-17.12.1.ebuild b/kde-apps/granatier/granatier-17.12.2.ebuild
index 28cef3517e33..28cef3517e33 100644
--- a/kde-apps/granatier/granatier-17.12.1.ebuild
+++ b/kde-apps/granatier/granatier-17.12.2.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 5ea597f16746..8f7147b6318e 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-17.08.3.tar.xz 110740 BLAKE2B 0eccacb3a0b30a776305ab7d76f6f7e384ffd07c30747b72622bfe0d2e7d465d4fe18631e7365c8edb523744f722c420ef64fb1182755284280d70f0638c2100 SHA512 696168482e3c9368156e34e932010cbd5587f72e642ff07eec024e008b95178c296edc89f6cf50a0a94d29385279590fea3aaabd2de067b69e129c0a1a65d6db
-DIST grantlee-editor-17.12.1.tar.xz 110572 BLAKE2B 5d0b5fe027aba60b002fa31ff665442266ba08409d15bebff4e28e278d42b13127cb2a50fb99105479a9a0c20fe770d7aaec812737f598a937154c0b38862bba SHA512 ff4ab90013ee855c2d70c1223cdbba5fe0d2eae8eff0cd0f6c1def4dfe2cddcd62697b9790a3598fd4b91fcd65d89339c0e1d3fdc07bebfb2750cf51ccd984aa
+DIST grantlee-editor-17.12.2.tar.xz 110804 BLAKE2B 7f19268eccf2bf1056a28fd897e617a8620cee17685ad9fa3c9985aa5a22265fd294c48298faf3d152389a6b28d324644907ede9c8926ef5ef4f0cc695790637 SHA512 c518b42ea4ea7ee47666c6b3208cbfc84a7d7ba21b35b76c0c698215708bd9d7f55604ae4ad2dabcb35da14ae6fb108372ffab0341baa912d9c721a258cacb49
 EBUILD grantlee-editor-17.08.3.ebuild 1166 BLAKE2B 23f42caeaa63a4b3f0c7196739a677f49c56b92f8a77b80e6f84143422a0ae3706438f28d457319186bce175063f80638e9e68bb82300aa1ce68afa9cccc314d SHA512 80228d35d4a5f95e5a81f382eeeea4d3a7952d6fd57d4b31cbb11a70e7421987167699e886e24290d703327ea0a08a12197606c8d24babae60a7bbe03dc3f993
-EBUILD grantlee-editor-17.12.1.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
+EBUILD grantlee-editor-17.12.2.ebuild 1168 BLAKE2B 4afa0384819169395f10f3744458a899afcbbb4c249e3af665da9f5cb33abc1577fc673702698cb0f6e2aec6ee9fadc3c7d0b8084411b8dbc7eed83a51ead388 SHA512 63f60380af87437f2e2005a896d07712278f3906e703c3a093caf6a703ba40077790dcd112922351feb6d093b4be5c7baf14f0012f10951b66dfe8fec7e623a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.12.2.ebuild
index 53bf85082a4f..53bf85082a4f 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.12.2.ebuild
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 295b94a38216..0351763558ee 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-17.08.3.tar.xz 51180 BLAKE2B 3531f6edffe0bd0605c839d1c58f37216736704b4562caf1c3da917f0ee459b476888703c14acc85f980c7b052c096aa7bbc93b8b56f43370226048c0ee79e93 SHA512 ef859d8a4ddd201abdf0f4e51757b948593aea4ba751d9eb9a98ad41692a5322d088044bffdfbb778e3d17f91bc31b1be1218f45d5aa15595eb8aac2adcffec9
-DIST grantleetheme-17.12.1.tar.xz 51392 BLAKE2B db694f7784914bffc08b394b8c926114672b35cd77d69259b36ae61d0fcc0c9df5f75c812a330c48bb51121ca9753510bb465ce3c4b02b147368a977302cbf9a SHA512 89aca54e01b406bd0f56fa16b1c43e5c882015a3c16524d37473d917f622fb9abb2ff1e6d5f43e3cc5c5e7fbf49ee25087f790ccdb61cf1284b201f55c8b2f60
+DIST grantleetheme-17.12.2.tar.xz 51364 BLAKE2B a158ba35094346494ff941384722f4b1b956f38698592fcae4805240d6a98e2bdf83da5d11f8aa2442d5ba8ef241b8a0fc0fe3c0dbb05b7e919b2fce764c629f SHA512 413ce8fbb72c8844f9264111d5a1f93f07dd9d079e41597b932920f9e9e4e0b91522e6462423a8122a5d8de66bbb0882f727d715370f6baa6c91c967c959635a
 EBUILD grantleetheme-17.08.3.ebuild 735 BLAKE2B cf8c120c004ac22469f7de05ce94a7579a303f2b6daff790f7fcbe278e0b6a3b578e8718bc26d16b6800dc9fd5237c7aa2c2d4d1b3767e6b9475b6940df9ea96 SHA512 0845145b7785c70f1e059ffc2de00ea76c18009e24672074f536d40bd13f4a46a35211bd3c53a41667d4e386ed8836c71be53bf16b8ba69f63702dbbfea0f006
-EBUILD grantleetheme-17.12.1.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
+EBUILD grantleetheme-17.12.2.ebuild 737 BLAKE2B 6134740a08dec66d4e42a7ec86acfe10733ba8e26fe5cc86a1592b01bcf5c57329e75229eec68f909f690955fe57bc8e47ddfd1287978ea8f5f939381531c6a4 SHA512 02701da3f71bc003c95b4d9d9487620e83f6fe0d9915c24a9178e6f59433c2be86b809fe5db82d08b17ac795ca59c02ac04c28874816457352c67985167a9866
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-17.12.2.ebuild
index 605753b034bb..605753b034bb 100644
--- a/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-17.12.2.ebuild
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 024abc8c3261..88dd8325435a 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-17.08.3.tar.xz 5909172 BLAKE2B 013660d574e6dfeeac5685f2af7c14536be02f4d77f008c9426cbd052be5086832d8399ca5bae7dcaad0b38c8b6a9f4bd08a63d91c2e4baf4c8d3c8346928550 SHA512 3961e331aefde8625943720e740e324a82fcd72e298a21d77e05b59b3f62681ed7af9c24343a9827e01454f050ec8f1631bd63c863ac3e6a2015df83a2c286ab
-DIST gwenview-17.12.1.tar.xz 6021296 BLAKE2B 9e3ba61536ca92de76c474d71c09f8ef897efcc0d0ef11e8c06daefa85acf887121b565938e4887929edc45a36f8126f40902772568c414394aeaa307f924cae SHA512 cc436e6fb99fa41f58c7f93856c1ce2abcbcfb986cb45705fdf34b85dd85b27a0c0c7cdf7b2df06694a271ba3119a6f5b933b90346c4f1fb8668e12df78137f8
+DIST gwenview-17.12.2.tar.xz 6021616 BLAKE2B 7171c9dde6094b5a36a19e4199901c71da62244e6cf4eb36f43aaf9e8f68c3729879ee770d73711fa971f626a28e712882ab0662d0bc711aba7a53be63f5cedb SHA512 d6fca3dc4435f2bcd77ad8428edbee022af88a6a2d959f5b142ab91e0ed2514b51ba34dc214f808bdf44dc0e3c2eb4992f1918499f36b194eca6b78dc5b4b1ea
 EBUILD gwenview-17.08.3.ebuild 2340 BLAKE2B e01c1fdc5d3f82b0cc9244a84a9fb65e3abaffea8dfa7a417efda19baf3312a05b57f5e70677f25079338122c05f78391402583039451e4834a127703c27a658 SHA512 46a859a892b704a107c0a3b64c5d721203882dc18be51cc9b0f794fed15b7bd60a9acf43c5479783b08ba9e9670f8673d1f5f561f1ca2f7d9ee662154d99ed50
-EBUILD gwenview-17.12.1.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
+EBUILD gwenview-17.12.2.ebuild 2415 BLAKE2B fd42f42af00e5afa906b6e195e55a940642ef9f50fc856a2b33276c41dd527ec2f038b0541ba6af1931d2cfa39634d7720423d15514bf72ca2f366cc05a552cb SHA512 6d41d0865b4f50825bcdc1041e21b69c00d42fd9bc325b2f0a29e8750c14b7c7d57fd336a6abf7f61d115668dcefdffb0578503730de566c23edae58df008497
 MISC metadata.xml 423 BLAKE2B 2e0463d65a7476da0e5a28420f235108b3367b9adfcda7fc2d47c1a5ae0e7f1ca49859d7ac213e3434c7d846c78af041d90da5767bf68e24be5a3e8eb80ad37b SHA512 19d70c59c116bfff13a062076e18d094d77ff06e30a01cc2c1439d464439616f2b758a250ff45c5a792926800906f1de8588a752317b7272e3a1223e543ff680
diff --git a/kde-apps/gwenview/gwenview-17.12.1.ebuild b/kde-apps/gwenview/gwenview-17.12.2.ebuild
index 87a4835bbcaf..87a4835bbcaf 100644
--- a/kde-apps/gwenview/gwenview-17.12.1.ebuild
+++ b/kde-apps/gwenview/gwenview-17.12.2.ebuild
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index a98658bfebbb..446563900302 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-17.08.3.tar.xz 518168 BLAKE2B ab2e87bb3a32da79106cadce073f71f41dd0a7b0d1cbe25176ca27d05887430a8c68d17ca0744899fe63b0936f168495ce8d5b13762289a280f941bd844221bf SHA512 51c641c91a783dac7c25d857b19cc2579fa36f79f0660d2bc41af91b6a5d23478b4b722a412477b5716be836fa708a2c149e97cd42aa6965a360b9e3d7cd2514
-DIST incidenceeditor-17.12.1.tar.xz 518252 BLAKE2B 6a1627b6dd134c97147938e3504f4b8e280666882a71e3c131a6127628bfc8ba18ce0e944647b2e8847b77b39d894f8570b71b161c9e50b9589d55d4f0d5dc52 SHA512 1776a4ab785da9e17293786325ab0cb206f7d7547d9219db51a95dff42d5cb6c2c3de796dfd6c1746b5d2d63cb97ec1ece03de5db29fb4dd320518c57abe5c0c
+DIST incidenceeditor-17.12.2.tar.xz 517448 BLAKE2B 21ed469738f19c48f0cf7f67deb13167dd6e0c66b706eaf8a4a02028d4d9d89d5947b9e7c7ec1c66d40e87f1f1d9559ab44d11e16a67c6637d642d9f5fd76d1b SHA512 8fbc7b92ed991e9b2cdcc7c984cc635df7f524cbd875b8b0c20dabd791aa32a33f12d4850e4bf0cbfa9e39123c4e2dff46707248e9a233616a5c20f8f1f7c6f7
 EBUILD incidenceeditor-17.08.3.ebuild 1441 BLAKE2B 2c3b9c9327561562c6026f6d3370957f88b71461f03705fad928a25ebcd5c12d90677afc282d9fe553bbc9bc96e5b07bc653f28659383868bdaba97abfb95aa6 SHA512 20a9e6ef111f7de5b65df4aaf070823fedf6f80bce3182bce805c881a1da536f59d789a29c1b70d04d3c538eefb47d27935290d61569fb4376f9f55c433bce3e
-EBUILD incidenceeditor-17.12.1.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
+EBUILD incidenceeditor-17.12.2.ebuild 1395 BLAKE2B 1bcc6beb89ab64942a405802b1aa18c079f537e027f51decbff9d491687c9585e25b653d93b9da32c6e4e2697482b0ba5a7cc57efc4c71e282baa384281285b6 SHA512 6fc54dfd46dd7210bdba607ed93a8d22da85eae56aa3e718cb151243c4e373eb69d9afc96d3be12cd9c140c082f590e1eb6578b93bbdc3c1c73da16448f9d6af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.12.2.ebuild
index 8cdf4d1b3dc2..8cdf4d1b3dc2 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.12.2.ebuild
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index d927b96d1373..862ecf091d35 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-17.08.3.tar.xz 446096 BLAKE2B a43a44b1d8d7b3a7a347d5f383786d7b48fda65cfefb2f330402e8abfbde663b58b2131732dbd2ca2866a443fe6efb77d412db8cce6e656ad50ebc53019f2542 SHA512 888d260ac707c7f39740840d2aef1e10ceba1b8973fdf987e4f58da1e12c3c457e8c20a225517e5e7f6110ae907a7786425d3b2c3db0703df9912cb19a7f8f9a
-DIST juk-17.12.1.tar.xz 1868340 BLAKE2B fca369a89fc1f8b71a5ab8cdcb05cea702cf04606edc8ef87cd3f8bfad794de205b1218e0dd8a41953e584c94646761acb67dee59569f5e476fff8d2da809f6b SHA512 3fa76b768d75bd19246f776895030b870f4ca5c776bbc843898ed64cd76ae5904a0c6268ff1a77c92763a11ac5e7e87797354df6e8ffd086163b6ccb12747f4d
+DIST juk-17.12.2.tar.xz 1868172 BLAKE2B cf9a48494a5d32f55d2da252ec8a6d81a6445628c2769c67964ab326072bf5f49fc1926601cd314b3af8224be265dbc2f1d22987f3057298f58e267bb4dbc194 SHA512 32f35ba5d1f7bc0d38555ab5a1da3deda0055e96ec2ca993f18f5339b3e231d903fa73d1a26a72413a159708cd08575b111bae8046603672f80f20678c36a362
 EBUILD juk-17.08.3.ebuild 558 BLAKE2B b8007bcf8fa7ffa74c195030fcf6eb1ec13ab608b3494e981abc0d1181aa5783551b17f2fa14ce156991996ddf2ee56dd92fcee70893e4d7d8f9cd545b06e45b SHA512 0eb436664d5e10e9f99d6e85340c0212391b9d48b3af03b983e7980ff8609095d5e577f0eebd4f95c1d1a0afe4148fe341e52818852c2607181bc5a15430439c
-EBUILD juk-17.12.1.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
+EBUILD juk-17.12.2.ebuild 1106 BLAKE2B b8c9bb34ba9e7b5f2e93b171bcfd425bf88fb11e881029ac2042bf635abd12751b4aa68f9331e39aa6aea969102fdf0229294aa09d7522e5c2c635d749657822 SHA512 f27f6a8d0df3b89d37a18123f42fcb0e16a2ff4bdbbb8d17c4a1cfdaf930e865cefdb4c55604f88d13994c7c72b37da6bca575472870e3fc850120094ba55578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-17.12.1.ebuild b/kde-apps/juk/juk-17.12.2.ebuild
index b5a9daf6e7f6..b5a9daf6e7f6 100644
--- a/kde-apps/juk/juk-17.12.1.ebuild
+++ b/kde-apps/juk/juk-17.12.2.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 75d1e5cc50a5..26cd7019a349 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-17.08.3.tar.xz 10565760 BLAKE2B 75d98ab39ff4691baadc1c8a26f635981d7bb086c154a7c4e06dda79d4756f781c76b126838d3b0ea141f98750df09dd16a5dd9978340eedd1dc3a7acff45ed3 SHA512 91038cc862bdebad1cfa843e8688a71494140cdf59fc8f9815a6e6eef2dca40b94ee7d0a8e7c6b277004ff0945431bb7873113e6e7fc5649b8120ef03b1564ba
-DIST k3b-17.12.1.tar.xz 10575632 BLAKE2B 41c8703c8792240335037a134114713e3727c992fb595d2e791bba5b2325da85687896c6517ab482c78c69ca2576ffeca3beaa8881fd2fcf719ce980ede96820 SHA512 ab778d992f07ecb6a2626b815e5d1d91c814f2d15b59fa976a0008e08dc6479a2fc8d6a30036d7c2a64ecf884d01be0d4e2be74e6479ce35350813448a903773
+DIST k3b-17.12.2.tar.xz 10574600 BLAKE2B 9eed0034872b3509510cfa78e7f3e8fe2bfbed0004568e2c80a18972d02c255b1f5e287202e7fabbd24a6f0e43f60042b19042485e75b1c40a42d88b49a587ee SHA512 2e1de62fab8e1e702b9a7c3431e44c2809376a329ba9236e056336d26c885b37e956059375d5f26f1b5c94093ccca80524d497a4b0328f277204293461b249de
 EBUILD k3b-17.08.3.ebuild 3407 BLAKE2B c886597e80d59e1dc5ea7b8f76a95f2f52b970aaee28eb552a8653943bb376374ea505a89d21d1f397b0064daae1fd66752155cc423c5337d527797474468e43 SHA512 eb1ac09d344ac6eb4a1c2df12d47e8ca617c83ddde54a78d903407c0466330f016b02865e0e645291f7791cd32214372f1920f4f6e8fd81b19e158ad4c02b040
-EBUILD k3b-17.12.1.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
+EBUILD k3b-17.12.2.ebuild 3336 BLAKE2B fe17d3a2c96208ab7b4c2b76f3b4be7d9e306da7117295587b353a0362feb3d004c9e03f166d90d79c691499f488c78e17aa6b671dacdfb2f6eb21f3ab119efd SHA512 5816ea681d2966021098d5f85a5c484d59fef6282093528a9cecc3114845103df157796bd1d9edd8669444b2e995f59b1ebe42ed248a469c6f1666c0441933dd
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-17.12.1.ebuild b/kde-apps/k3b/k3b-17.12.2.ebuild
index 33ccd3437be8..33ccd3437be8 100644
--- a/kde-apps/k3b/k3b-17.12.1.ebuild
+++ b/kde-apps/k3b/k3b-17.12.2.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 3e3fc894b417..8dd0d5cfe8ee 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-17.08.3.tar.xz 69016 BLAKE2B a94d70053620bc41ab094b071d9cc33eb620bda4c99f3e9ea998174a7379a644a012f6ae5e00f0aad3ccdbdc7ca9805a381fbfc0038bb67d1c1eba2af27dfcf9 SHA512 00210737f43b7d4808bafd1899630989ece2ef65e23e0849717fa8fb2cd93881099fe670591025f44b8d901130e6ee0a2843af40f49c6ee7adbcec6cf163aa55
-DIST kaccounts-integration-17.12.1.tar.xz 71364 BLAKE2B e2a3e541079c77a58200d66e597c883ea48cea58016bcafad3dbc38dd33e7fa4120bfc316bf6912c509aa985d2e8de86a45ce46829cc5f12976e95babb43dcc1 SHA512 c167786079f55f29b74757fd84669ec2678ea1d1639e333be74cd66bb1a9aec2d6ab52dd68f22d5675e6562115b7a266f813e7b5a2dacc6303af8c5d66c44c34
+DIST kaccounts-integration-17.12.2.tar.xz 70836 BLAKE2B eeb341e7ff1ad2035cd3df6ef3acd11fbf8cda9b423cd675f89acd0848b5ba20fc0a03e822a6256fc4dfc74796aa28428ae07ce553c69c7c54b2777e7173fcac SHA512 82146501a44c0e1974d17fd1cfb9b8b6337cf76c2606b40ef90770668b471384562e58e82f1a8e09f24043a123cbd2617e53cf9ff600c92c8da883134ad29436
 EBUILD kaccounts-integration-17.08.3.ebuild 860 BLAKE2B e4b808ffe29009cd5f00b1b8903b1f5b99642c482496837e97dab90e9063275805361b444c48254374faeb8e1a3fcd543bd89bef0365fb177227d39d9e5253ce SHA512 744a162133fd83bf597e72b507a36dfcefe003666d6d71f62680ee76b2dd1c69da6db0896c0ca9bf97f69bd586bab76f6b036cfb113425feb0c267d588eb5a81
-EBUILD kaccounts-integration-17.12.1.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
+EBUILD kaccounts-integration-17.12.2.ebuild 900 BLAKE2B b854b476c9fe33b9c4d3baf1bb9433817e17e29b0b9f4870a4af8fcb24e9ad07eb96e85ef68a5e0c8412c43c0fb94423c02d515f5971b719a6bc8a7bd3b33ea9 SHA512 de398edd8633782c3c32cfc218a29199d5017024f6c417110770db2af2f5bfda5d8a56158bff025694ce4dc16ceaa7cc7b4cb2ca1eac51a5784c786735a867f7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.2.ebuild
index d30f9c20dd11..d30f9c20dd11 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.2.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 11fb9a4e0b63..5d33d2855a03 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-17.08.3.tar.xz 31924 BLAKE2B 5016ce8a614fecda734da661a74ddf2a0c24f687fc53546870429cd5f683ab3201da5e3a57d04f2be660101ceb7584ee44da2f16a9cf04abafcd49d7a3bf38c5 SHA512 75248f6e3cae47cb6587895724a52dd38d4ebf88995b937506be992399740ac89cb0bf7a64a3769d18200b96968ef4b7c3b3f281b539bde86dee331639473570
-DIST kaccounts-providers-17.12.1.tar.xz 31944 BLAKE2B 54772fe2dd438f7d0d803a9744a11fa26f66fe162b0dffc2336d10969778f9c906efc406c3429a23c6a0a9f60f694a3c189ed57d0585576224cb7072d4302a1a SHA512 ed204c6783299ffa3554c3052a79ae26541e9ae9050d9425d9b91ff6e6f562ad5b8a524a08f93f26d6e6f5a95d9bc2f0e3028ff1d6984a58a1e35f155c4267c9
+DIST kaccounts-providers-17.12.2.tar.xz 31768 BLAKE2B 67fce76be123d8f6af203d65ad19274304a60114d87f9962d7bc18574b1a2f31ce4f6a92414a145532cd480e0eaec6662d6eb4741d99f5ab5b04ef6c6b2df47c SHA512 55b53b458689f4805ef393cc55b88b8a3c4b5472c78820d80aad7e5bc68e845476126610e93542b82faee447ae862f2b194554dc56cd6b44d19ef9721a8f6082
 EBUILD kaccounts-providers-17.08.3.ebuild 666 BLAKE2B c665c86535d7fbb59af224b51580abb79fc7940fb1c9da3bfb00dfa1b73ad80da5fc7eddd6deec5ce2d0de4497309e4e3835fc1ea1b9361fc3eb4698be87dcdf SHA512 57a53d7128527bc5d4b0bc4e729e327aefd25496fa2e93dba4eba8cae8cae8130f713feabfb7728a938fa29658a718ca2590e64137feeac3c1cd8922f9ffde91
-EBUILD kaccounts-providers-17.12.1.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
+EBUILD kaccounts-providers-17.12.2.ebuild 668 BLAKE2B f56d4db5a9321690909cb3ea6f960018c914a86f484fb62a17997d6afb7ff2970a4a8607026b9b876db5021d73fef7e2056da516151d20f7eecfc018d61e0217 SHA512 50f2c4f6102995d364559f04e6cd20ab3ec9f5dfbe30c2f04977137b5705efec0435026392d59665e6e5d1410e6a85971738acad7eb1bf3ea457a825aabfb554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.2.ebuild
index da4738ab4dba..da4738ab4dba 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.2.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index b3e54e4013b6..b1862df8ffa5 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-17.08.3.tar.xz 546868 BLAKE2B f6394c2bd27429ff8cf302c05f27757bd03ef310479fab9cf589d8a265e9f773d488aa0cb792cff93b6fbdbd16a19ed5e585f2aaabc7af25cab72186c1eef24d SHA512 baffd3f377dc33cc4bc3402f4f814f630efa1b152e2cfe02698cb0d2237011f7b3fa1c7ceff0eb83b5a10ef2ef038f5fa89a07609db8e009da2df3f080903757
-DIST kaddressbook-17.12.1.tar.xz 546856 BLAKE2B 690574b4f655ad71f26ea8d946ee619f4e49ae04e36ebe852e62fd7eb329d047d55808217beac9924a2dc39d04cf6dbcaab9204f06dfc4520244adc914600230 SHA512 efb9c3e51e5bab149518dacd64d1e96d5fedab79941b540e2934f19a52fd18f003e315a805db1c0bd5484ca916eac4bb7aecda7959511da17b8ecfa144f45534
+DIST kaddressbook-17.12.2.tar.xz 544348 BLAKE2B 2d2415f6847a26922dbd7bfdcb11cf8504b6b59b7bfe1cd64d0be02cdeae36ad5e5a3e5a7e54ebd730d0fa03ad0aa79da018f0d175c98e28640ceebd24b42dbc SHA512 f771c78939afa8a39144fd82ddf6c114b601584edf2f960d14d99f10b75f5a9a4e27957437ad23e5ff65119111afdd1c9b135cc852f3dc072bf01caac4dbbaf2
 EBUILD kaddressbook-17.08.3.ebuild 1717 BLAKE2B a760be2a7930bb9f80e7739075b760a012a5605c31fa8334cf1992b03868c07cb66ec7d2fcb2c44c6a23fd56493610a4e513dc6b874d5718842f532d65d1f080 SHA512 6b347d5fa2f00a4876fa6ab3528368c6507894a7718d532edf453dbe582b1e5ab144156bc05b1eeda1ceb31d277f79f5669301c6c540473710917a4cbcf6d73d
-EBUILD kaddressbook-17.12.1.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
+EBUILD kaddressbook-17.12.2.ebuild 1708 BLAKE2B 519004808433bc563ce8368db1e4ddba8955f50cda9173022563ddbe06cfd232c6b2252a62de76bd57d1d15bd088ce29aea8c68efbd949d36d69f4d762fb1dbc SHA512 a04055dd89f4a29df33b1df154b1841518abce13bbd6fa4b228c0110f906f6a215d2502c901cd2c8e546cc1ae217c97c5fdd22581c81fb612a6340f545fb3a50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-17.12.2.ebuild
index 23715c549f96..23715c549f96 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.12.2.ebuild
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 40db1a6413de..334e57ed3e3b 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-17.08.3.tar.xz 4239184 BLAKE2B 5e8db5a3f11f8f820a9aea7ae587e703e21cee34816cc56980cf499ad5e411dcf90cf738b0d0ef2d8267639ffa4988a31c0b9fe87351a29c8898da96e7560288 SHA512 e4e595988da98cd2f7dbf089c8c29a88e1df57bfaab98e8efddcc0e69ea5c7cfd74c7557661e6b6b86649ebb8a487c6609a05e16a7fcd272048140ff22389402
-DIST kajongg-17.12.1.tar.xz 4239736 BLAKE2B 8de212ebcbd4ce24124d1b7904bd33fe7a737ebfbb8352f464341bd0d138a395d3cb8aa631df79e140bfdbd250bd35339732856f4f76b2d345be42421e885126 SHA512 beddcd6be75b022d6209d91337cddefdd6b8734b6d8bd7eeb1585544bb5f204a119904016f12e2c6cabbfed46b3b5d8d46ee7e82e3efe31e90712d0a07f00d01
+DIST kajongg-17.12.2.tar.xz 4238932 BLAKE2B 94ffebef2b67c08e79f8c6f6eaeb9406e07e86bae7bb535ed639af69c1a8c2e430bb6474771177a99bc4062c0dc0bb369ee373184eb9f470c8a32456ce2050cf SHA512 63cb6286320c138da0e2a851af683012038d4cc78ee870f5cafa97da99ace968b695a9e8c8ca8f51eb16099fa7b94bcd30895b4f3c0af32358719e6b220bb946
 EBUILD kajongg-17.08.3.ebuild 1280 BLAKE2B 71be5379c4b9728a7f2b11dd1d9c0d3f7bcf179dff181618e276aa0659027cf57c76ee29a8fc1a111a199934fa23a43cb206ed2f9c82f1353aeb19e8c040431e SHA512 9db9c9c1c2493f36f1a450195b1687797bc20dc798d155550439228625610523a870caa3709b6d1e2cb53c5700dd1fe754ce5fc4bd532f76cca81627ef6177a0
-EBUILD kajongg-17.12.1.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
+EBUILD kajongg-17.12.2.ebuild 1282 BLAKE2B a2e4042d2ea6c95c2ec2245b43130d69a3edc75be2c280e5cfb8f3282aa02e7008b77a8b069d18e82f24918ba8658d3fab280520ba30319682131e776ab88e72 SHA512 b6fe89aee6537ff838da6682bf2a9ad59218b8fbea752857c54e0552d5fee10fc9501e8405e53b4d7a3316d24051eb20a70e10c98a3506a79ccbe8041c159c1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-17.12.1.ebuild b/kde-apps/kajongg/kajongg-17.12.2.ebuild
index 1c531f3048e1..1c531f3048e1 100644
--- a/kde-apps/kajongg/kajongg-17.12.1.ebuild
+++ b/kde-apps/kajongg/kajongg-17.12.2.ebuild
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 4d222ae3f93d..be599162c7f8 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-17.08.3.tar.xz 1823924 BLAKE2B 1b4528ede1e8e2be77a6b52a2bfd9b7e627f6328196803714aeb22b62266ed113689ffbd07432cc3137188f989fc9d3e1c3ba5f505da95bac7a76d7da2931ad7 SHA512 827c2eeef667d42fc691fba0fd6d458fa245eb5fb9e6abb1926137c5e1a66bf309e0e9739cd9fb62f95a14d7f46f96f2ad864434edb1e8bbcccbf8172a5f4b6e
-DIST kalarm-17.12.1.tar.xz 1798540 BLAKE2B f439e46d444d12aed10d4d2d96077e84ecc6ba285c4396be200fd5ff8206278310eb0377e4db2ba328f4177b931f076f5c0939d672f2dde45c5483de25529dd3 SHA512 f2b2f1f4477359d66f8974b76f4cd612666e129b73b0179fbfee94805e31661392526926e57710427402709d0a0fe22a1c726576f8ba37afa2a09e29e67ea8a2
+DIST kalarm-17.12.2.tar.xz 1798216 BLAKE2B eca01ba5a8cb2bf8da2999b328229c398649a95a2c0f2e098622642307715677b1aad8c910593b484291d63b2fb5ab1feaa7ee6eee623d5a6a9ecc58951b0074 SHA512 f21a7ef086339d5a66bbad73faf8fc81e4068ec8cde64846cafe02440a52b290c2a472dbdfc9714f55b2a724eb300afe6d832033e22f00aa52b2694b2fe4da93
 EBUILD kalarm-17.08.3.ebuild 2059 BLAKE2B 4f40a1bbf57efc88bdd5973fff2c490c009ec3bddcf6ccd2a41254b76154a5da6a5425073d6b94752c968fa8429ab9b5f10941576f596f656f868fefa80af80e SHA512 a6423d092ab9a21288bfa1957d3b77236a57134fb354781aca0938749befe8ed03606ab29859896637fbbc8c222c6f63025f34dc0357038267e62512805f1e09
-EBUILD kalarm-17.12.1.ebuild 2061 BLAKE2B b72d4d000ead2afe4776ff9cca04da556270c6f6e1261195802ce227d8c92ccea32096d2beccf427dbf7ea67283e3e1e388b8ea558c2ed3cf75ded7379414b5e SHA512 77b450403542788429db7a1760f7c17c356e509823ea688dfbdbe904c92b625b37af1c90395286828be0b806d16a3bd26ad96f4c71b743091beeb2df1fa7eac2
+EBUILD kalarm-17.12.2.ebuild 2064 BLAKE2B 7afe46797d3a943191a8480cf1f59550d4aea809a6ee8826fa5fc41a8713f79aa5b10d873e43e25e791e398c76696448463f2118822e710059f2e6f1116e4732 SHA512 9a2ff1b84bd084fd6ec98b3990df5ae54ae6f5557da53f850b0cde21869758f89c61d208f89d5baafd72810ad81e3d7613f18597693cff0650586d6ed7283f93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-17.12.1.ebuild b/kde-apps/kalarm/kalarm-17.12.1.ebuild
deleted file mode 100644
index e60f652d848d..000000000000
--- a/kde-apps/kalarm/kalarm-17.12.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-17.12.2.ebuild b/kde-apps/kalarm/kalarm-17.12.2.ebuild
new file mode 100644
index 000000000000..dd0bc7c1fc8f
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-17.12.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE+=" https://userbase.kde.org/KAlarm"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index daa1ca9b492c..78fa1061f26a 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-17.08.3.tar.xz 493312 BLAKE2B 81424df85dbb8fc22d7b33e70dd97f8994b3476d199dbec303e92b04ee96f5b3a8c3d77d785a636b472fd1f0cff23fa69d5f0f6b2657f74d4b13c2619ecb8cc6 SHA512 685501eb7afceed63598d6a2cb9642b9d902d3c331f46943ed2fa708cd24e857a13a7055261f23389aa0dfa0ae02c5a71dc6d1ca41af8f30339a28b62e19e5ea
-DIST kalarmcal-17.12.1.tar.xz 494996 BLAKE2B 1dcefb1c94618a546fd4354ca6043ea50f9af45dccfff04e4f18147ec20a575b7c063ed7a35900da07d9b49e01a6ed8c7206f5077acb48dc43c08dd0d2dd3348 SHA512 b7c264787ddfd317558d3091a733131655f32d7123a86df17750ef37bc9685c550123dc2c6ca1fe967d9e2ec467af701218465646a3a25cb5e18117539411d92
+DIST kalarmcal-17.12.2.tar.xz 495016 BLAKE2B 71d17b4e19800e130810bfc013f113dd8b67beebd0ec66c9342214cf07a306d679c55aa7e8b23bb94f334db5a978dfba90cd6566c024c42abdb553922d171bbf SHA512 c3946dde1609e8925c4bcfbfb3403e2e536eb84724dd5007d8d0ef14210c14e7aaadd6349117d55a57d522904b90413052200790d060553058684f0c2f01c5b4
 EBUILD kalarmcal-17.08.3.ebuild 534 BLAKE2B cbf42a858be460a9f1fab08e5329c8bd54d78b8971d6782e893d5800e6de21b03c8f48859928ac49522799b3632ac810ae46cb4fe173ed91c6e752c72e7e5582 SHA512 f77b901f5b12bcd90f0ba3ae5967663b93cf205c23d3811f254e7690f5595e64276efc382d9fd69e4021e4852f3d729f1598a9be88020b2fbecd22cb89f7a9b5
-EBUILD kalarmcal-17.12.1.ebuild 536 BLAKE2B 540ac4a3c6a3a125e7582d728870c627a8e57c8b278d096d9f672c05cf42cc881f0e8619346219d2b5a43bdd53b807645a4dc88907c3974ebbf9bae3e2976c46 SHA512 5c870a341275612720e765a99803e3e0e0c1759ffd325812bd47d8505f516107a886e569d3726027994627e7665034b4d49c9d27b075f71cb3a7bc85e3b2cfd1
+EBUILD kalarmcal-17.12.2.ebuild 539 BLAKE2B c131009f3a83a23e568094567bc3ab1c1ffefe7e44a534828f8c00873f00384351b9fe1cc38c5a4650e917d27a52b0816c53e511735d5715ad194a62d9a131b6 SHA512 90614b07bd319af650b16fb714b6a077ca6c30cac1328dde42315813ab839c820cf0fc3f3c0c4c9cf3744234f83963e01d4fd4b248268baf04fba35a2db9a038
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild
deleted file mode 100644
index 1fd6cb9486c6..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-17.12.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kalarmcal/kalarmcal-17.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-17.12.2.ebuild
new file mode 100644
index 000000000000..9a1da8232f20
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-17.12.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 346e33d59c43..30ea37e9dbd9 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-17.08.3.tar.xz 689240 BLAKE2B b9aed304991578b662bc56d82db1f943cb81b0496a914e30756bd717c1885f31df9f65b3709960c8adfb118eef424ef7a500fe3ead7a5b5d4cdfde0a8db74403 SHA512 a6955e612c72e16badd32f30bff55f0f8dca818acfa633fc9c706781267c35cfc5857415b35134e7a2eb89d7bb9ae1bf045c1c145616cefd8f38dbccdd5c2fb2
-DIST kalgebra-17.12.1.tar.xz 690544 BLAKE2B 1fe55c5a055cb374e87e94dca68ed810449073d01e45cb1ddfa5b17e658943a495570545601e9758ceb9cdd68c32689d276d5e4e9eb805b081bec2e370515289 SHA512 7b4f281e2fe7cb30ea323eedb0ee1ddf934c49cfefc78cc3fd3563ab263d89bc2cb2213281f9ffadfff31c54e44b98fadae852707d04f64e530f066031c6bea2
+DIST kalgebra-17.12.2.tar.xz 690452 BLAKE2B 9e61684e083adcd024404e669525ef2464da88ee433223086142e1bf1cda4b0a56e6a59b05a7b48dd25b82d2b9661f18b45b090714648870b5c2b4facd67dca3 SHA512 28263c27a8f26c880237ab0fabc103dd4810e1bd42ce28a5890319105178289c96579dd15c6ef511b60860ebea5f8080bc5a5c0d3984fe3976375abbfc839fc7
 EBUILD kalgebra-17.08.3.ebuild 1007 BLAKE2B 9a71bd6ddf9b8f7179484f909a7613c46fe75dd2a67feff3ebe6aa7c22449d35dc212825c18477336c1ccb5b8dba1d112227a9a309b29015f03ab3a1f6dab998 SHA512 61a6673e6c1fa2407a823ddff193e47b9940d8752424e117fed097b6d7de97921d66306f30f127fb388dd68467991acbc45e98cdb5228ce58c5238e18102cedf
-EBUILD kalgebra-17.12.1.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
+EBUILD kalgebra-17.12.2.ebuild 1009 BLAKE2B 4d7166da92fca274a74aebae0c802c009d8a42573b1e8b2a7f3235c955be49a499fd883e8856f3dfb00e199e41b41a8db7c7af9d1d6ede56b63bacca984fd635 SHA512 7e47687b5b3482e1b147f0c8978c24d9fdd43b3d10764ab5999fe35f0165b33fcf9b8946fe57210431935347534745966bd59859d0f8f6823532e1c0ef7c1fef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-17.12.1.ebuild b/kde-apps/kalgebra/kalgebra-17.12.2.ebuild
index 8cdb5cfa3a59..8cdb5cfa3a59 100644
--- a/kde-apps/kalgebra/kalgebra-17.12.1.ebuild
+++ b/kde-apps/kalgebra/kalgebra-17.12.2.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 7ad78c0bf445..875dba1609d4 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,6 +1,5 @@
-AUX kalzium-17.12.1-knewstuff-optional.patch 1614 BLAKE2B 66cb70494818194741b53e979292bb018730f0e21d5054d156fac7b77e4820172e3b7a449bd2ac4ba5c6af1d5b4e8ffec4070fabcb0c7141e0cfce837738aa5c SHA512 20b0278fe8d569bd609be10cbfdb6a95951616d2cee448d51b286c5d745af4e20fc4c4effec0afe82aee098992ab97f250f004906a588966e307f00b07b14f22
 DIST kalzium-17.08.3.tar.xz 24450828 BLAKE2B 2586dd46a0847e6ef7becb5773e6b32f67bc24e3d91166287fd6df10c498eaeb0f8d2ba777d951db3226b47b2a94a7ef1e01a5623ee7c3c89ee6f035ae3567f5 SHA512 a421091154d9de89ce70c79b093e716c925c6573958bb8b3f02279d890d0c7c7dbf91ff3ee455688df6628059804a377d571bb8b75a68748d1b9f4eb003b1dbe
-DIST kalzium-17.12.1.tar.xz 24451344 BLAKE2B 0bd94b87dec53c37f170765e302e2b8cb948c8a4bd2203bc0ba293552f1dbabd4cf0d8668ab63d7b840b34e88692e539165cd946f2992929427cb89a0ef5bfa8 SHA512 35d5cdb803d261da248276746fea8eedf2eb16b62cfdde7320a6c1383b14b4b13654671e5775a1db00b533a645a98b1638f05009b661894554c6bd5539a4af50
+DIST kalzium-17.12.2.tar.xz 24448980 BLAKE2B 649388a6135c4e4584838bdf28639dc426e3255990bb8139c45d6bedfe9e5fed40eb3440acc6641cf720157c4cdf9ce8559e94169463524f6d0847d582dc6bcf SHA512 2f2c4ed44cd0302b63819a4b6ec0ec15038aae74f825b30ae84ccb15eb593380b77a6de84a11d94dd20ae9e66225ad977e8d127b3c120bcaa02950ffe62737c7
 EBUILD kalzium-17.08.3.ebuild 1559 BLAKE2B 308da3c1790106361a169df03109b8f60666763e36f1d8d39fa3e094b402cad5ae4839195909237fca26f9899faee2bc63b6bf990fd1b65c21d4b306cafb4df5 SHA512 6a21f9fde13a7f7d36df5b99a70dc5c58f7e4c4b27e338b61117a72832fcc5fdd087f89e72b763265cd3b59f4b38dced9345a667d7ce47376e0c157e779cd02b
-EBUILD kalzium-17.12.1-r1.ebuild 1622 BLAKE2B 89ab7537e35ae06da459c2c8060f1fe9b7f812d29ccd3bec8d3c6e9863f0cc7af582f78e2629eb318b5a548473a7902530d0a4b25ec243be5019457aca313f52 SHA512 5af6784cf7ba5a4295492c136b73cd4891f87cf999c670e9db5d56dbd5e84d8394eb4198acabd9149c4465dad29a2c22a090443b3d41d09e03205814e120c10d
+EBUILD kalzium-17.12.2.ebuild 1565 BLAKE2B 82ff5893bb85a36dfde441498f18b06c40065bb016f34258ac89847d01342c6a4d4b5c59b2b913f7ce4bf3044ec562a1568e37581c0947ff0b9bdae903f4322c SHA512 9fa365ee681ff9c3d906fe027280eabc0bd7c5a343450fce9c550d00d14e2b140213da51bcf092e7ec7db6a09b9356aaa8f46f7f996b83d2ef51e940af671866
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
deleted file mode 100644
index e60a6594a34c..000000000000
--- a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4f7922a93bbea8582d29eebb194932708f9e21cd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 16 Jan 2018 12:53:56 +0100
-Subject: [PATCH] KF5NewStuff is only used in moleculeview, conditional on
- Eigen3 and AvogadroLibs
-
----
- CMakeLists.txt     | 2 +-
- src/CMakeLists.txt | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4309a683..a12d4e36 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,7 +55,6 @@ find_package(KF5 REQUIRED COMPONENTS
-     I18n
-     KDELibs4Support
-     KHtml
--    NewStuff
-     Parts
-     Plotting
-     Solid
-@@ -93,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
- endif(MSVC)
- 
- if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
-+  find_package(KF5NewStuff REQUIRED)
-   # avoid compilerwarnings about redefinitions
-   # todo: use check_function_exits() ?
-   message(STATUS "Kalzium molecular editor enabled")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 623ba2e5..0b1936eb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -139,18 +139,17 @@ target_link_libraries(kalzium
-     KF5::Plotting
-     KF5::KHtml
-     KF5::KDELibs4Support
--    KF5::NewStuff
-     KF5::UnitConversion
-     Qt5::Script
-     Qt5::Svg
-     Qt5::Quick
-     science
--    ${OPENBABEL2_LIBRARIES}
- )
- if (OPENBABEL2_FOUND)
-    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
-    if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
-       target_link_libraries(kalzium
-+         KF5::NewStuff
-          Qt5::OpenGL
-          compoundviewer
-          AvogadroQtGui
--- 
-2.15.1
-
diff --git a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
deleted file mode 100644
index 9aa752c327f0..000000000000
--- a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		$(add_frameworks_dep knewstuff)
-		dev-cpp/eigen:3
-		sci-chemistry/openbabel
-		sci-libs/avogadrolibs
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-PATCHES=( "${FILESDIR}/${P}-knewstuff-optional.patch" )
-
-src_configure(){
-	# Fix missing finite()
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalzium/kalzium-17.12.2.ebuild b/kde-apps/kalzium/kalzium-17.12.2.ebuild
new file mode 100644
index 000000000000..18d761888717
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-17.12.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		$(add_frameworks_dep knewstuff)
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		sci-libs/avogadrolibs
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 4e06e2fb452d..0b50e372419f 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-17.08.3.tar.xz 96768 BLAKE2B d017120056d84416c0dd6f7e22e3d3088d41d12e5b2a224405d6b7b9bada7a8166cf1a5db06734478849b8158d3123970b6de81ab17638f33cf524a9fa5e5966 SHA512 a3787502f4b100f9cdde63905ef22cd83699a861fa71105bad870f0f86c040151bf28d6e0049f61c98e5978460967126807e60ca2cacffc0147a1e4d6b5835ef
-DIST kamera-17.12.1.tar.xz 96648 BLAKE2B 2eaf3babb29efbc77119ed61d642b33a2d565759716aaf88ac60872c590e173fe6b3ee616673dc03265f6e0ae2c7bff304fd693ecfdd5fd6160d03bfd7e68731 SHA512 caea639b5377e918286f06d962f464b4f4b14988cce478b22d291b9419e1722ce3390dc986298f0a165defde833f765851fa7adb0cd23447715041fa4c3f01e2
+DIST kamera-17.12.2.tar.xz 96720 BLAKE2B c2cb98877fd987acb089e158e60fe8e9b1f743fd751031459590426f428dc260eac5f14eb55a62ab479becd8b32aaf95b884cd381a2604a55eb84347f7d74512 SHA512 89f37d990f7d2b784737abb8acb4c373e2e6d560c242dee8fd70e75e67f46176a453ce49e101cf9e335818d17c847bfd4ea9940eb068493a60159bff37b08053
 EBUILD kamera-17.08.3.ebuild 633 BLAKE2B b8fced90bf21fc47b47f56a516c517d5ff9f1b4ab25ca126b512f8c2802211752ad0a80c81f315551d038988b99aacc48affc8533557567b59041435e8f17605 SHA512 a6d30ea1d82c1af933a4cd687975176c2c69d9258563ed068deeb7649dde04b8f91bb741ca94730d7e900955e90023cb62ff4ece8b644fc9aca597ab836e12db
-EBUILD kamera-17.12.1.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
+EBUILD kamera-17.12.2.ebuild 635 BLAKE2B cbb7cff569e8363c4890f8650d00abc5b0eaf13c99f6c1e6cc2642dccb428e312061d12c51f176bac0e13e18fa089e94dce086f8399d1280b15e124050a8f709 SHA512 07aeb04539362960a5644022defb5ef6693b6e559099fbe13d4e66c278ac84f7afc2cac57130d9498188f735a622d19c33488ed236727e4f943e92ef28d1dec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-17.12.1.ebuild b/kde-apps/kamera/kamera-17.12.2.ebuild
index 8e527cf2d876..8e527cf2d876 100644
--- a/kde-apps/kamera/kamera-17.12.1.ebuild
+++ b/kde-apps/kamera/kamera-17.12.2.ebuild
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 1280c8f3a8b6..6a0af5eab0c4 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-17.08.3.tar.xz 7605188 BLAKE2B dc7f19f4b5f02588a6e8cedc3a075cd64efaf14e6283f173c1776363329d6091a18ad24883c2881f16241e8ba775a319b6bc3b4fd4b3dbfa107d7786f84c3b42 SHA512 8a1bb05f16c6b4fdaaed3957e20405ca47c26a8e1232fd65ec2beb47b5b7ebb19e671316f5cb07463f045255baacb89904d9d8713160d0cd0a7d6d7c192b2565
-DIST kanagram-17.12.1.tar.xz 7523320 BLAKE2B 7e21b835db6f6795b4e2db7250173dfa9f286876db53deafbf449919f7c818e10dbc4be6e225dd47e2f8b781a22b677708b13fe655c57463711e262ab32e034a SHA512 0dbf117a066e4e28f74cf3343280e899d0107cad5f2f39f16bab609d571907bd878733a5a52e4f4954f921a86a2f88bc72206fcaa2f6088b4da65faffbb62b9a
+DIST kanagram-17.12.2.tar.xz 7523528 BLAKE2B 624bc7733fb6075c841cff60ecf19bdc89d4c61429a9598d4f2f512a03f1707367789e769c389229ce300b996c86d8ed85f25bbac33f9f1050e4ecf4885a573e SHA512 3de3df86c5f2b7c4a1590e9c3cb16509b5ef4f36e63981e1842c30e8034d34cac5626eb8ac00d3c8137a90975f64c14bc69dc6bf53551faf94d7e7991d3e5fe4
 EBUILD kanagram-17.08.3.ebuild 1085 BLAKE2B 4cf052a0543b3135984642a8dd2228a1a00478bd75ddc7fe04eaa16fdc9d6e0b4974dfac98f22ce27ff92fa33da031f92c59bc23046a24c417a385a991334c05 SHA512 ee453a77e2637416e42cf096052fa1e98b1f100d961e1abdee8123bfef9f0dc50e09aa56b6cbb8904f96c6e168935479ff3600e891943ad16d328274a039af62
-EBUILD kanagram-17.12.1.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
+EBUILD kanagram-17.12.2.ebuild 1087 BLAKE2B 72a439633d7576ff80de9499839fc378c210407e9ee93ea9f1d59af7863b0b78d81d88915be91d70c728886472b2ca1a9a1439fc263293fd3468b5522e8b1301 SHA512 c08816e9005583539f5bbd84d1621a0aec0933ff13089a176a61fa1494690b33f777dcb3edff3ce6e50eb8a189ea4977ebc82fa7870ae4bbd40e3f51b9e59822
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-17.12.1.ebuild b/kde-apps/kanagram/kanagram-17.12.2.ebuild
index 9899faffa5a1..9899faffa5a1 100644
--- a/kde-apps/kanagram/kanagram-17.12.1.ebuild
+++ b/kde-apps/kanagram/kanagram-17.12.2.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index f1c1d0db563a..8b23379b2591 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-17.08.3.tar.xz 2525132 BLAKE2B 08279014b3985ded7c824eb2f6d0ca9e33318ad3f9c35f3169a95c0d9dd4e5bbc8d3a425d1d6c8df0caa60b0d1d282b4162ef875641e574b48738247a8f4bf04 SHA512 6b173e116832123b900c71b6611ef1e268143799217d64d5d6204d4ba88845662509fa482ca69fbb6f135c5f708071683f0302b187499939c6e08964c1a706b5
-DIST kapman-17.12.1.tar.xz 2525160 BLAKE2B e44e7fa58ee40fcbd5193c49d7f211258f70af246458d284dff3f508ca08a409d8f925efc1d6427571ac30c01d7346244375cb16c096f98c590255598b2f118f SHA512 99b70637ce6d71efa5dc6fc345080ea5a4451fff61006f52bb25f0fe90a30f4f00cd895bd8d8a88411f9a71c4216a56795938f2aaf3c43cb136559aef3c7d8d4
+DIST kapman-17.12.2.tar.xz 2525224 BLAKE2B a580bfc2dfd3a3deeeeea77194a169e934097e00f70797a4c0d34e201c2d1b54f56059875ca975e6fc57c551f8671123d96bcde0192ab951aeba3ef13800495e SHA512 718f4ed82d71be259cc07f0b0001004e28880db6b0cc1a3931f641653a318d289b6b70687ff8a9815baa20181553d8713eb2f800dc462f116fa8ec831dcb964b
 EBUILD kapman-17.08.3.ebuild 700 BLAKE2B 2762adfd5d9af87e900d395995ef2fe31eaa6ccf64378e585145fb567892b09f3ffa0db27a47bf21bce000ae583265a251985add59f1c230c480d52f36abf054 SHA512 3a513e2785b504925361640cb3c3f07085345ded4f86ff56624bd4afebff32bf8523103f99493da89ad4f52770cd51c051c6fb160f74676a889f959650e92786
-EBUILD kapman-17.12.1.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
+EBUILD kapman-17.12.2.ebuild 702 BLAKE2B abea90278a162819302c51909e084e29690a89eac38e9800773d24727de9c058fe6b098d224e5b7f2e027b283d09badc57de20585642be5dcb3c37d6dae92a7b SHA512 326b9e2437f143dbb0505afed2f92aa3466219f49698f378ddedf3e69c66f3948b878027be12e4b64f201b8594016d1e81d03ce5a91b08df68eb06f7cded8eec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-17.12.1.ebuild b/kde-apps/kapman/kapman-17.12.2.ebuild
index 1bb9a2b6f7e2..1bb9a2b6f7e2 100644
--- a/kde-apps/kapman/kapman-17.12.1.ebuild
+++ b/kde-apps/kapman/kapman-17.12.2.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index c4de57be7772..0859e363c60d 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-17.08.3.tar.xz 446664 BLAKE2B 3678f68c27b07124b4bdc6ddc99720e9515c89c282b60f4084b1d30860686c8c56a4a8089937f271441278cb719ec39beb46a58c6191a39e068becfd28664261 SHA512 2058831a8b60214567c8d8f74ce5871968f2e2b9f2831202e09a9ea79ad2d5a61b2ec64c8e38cd28bf15291e6bc80376339c7999e3e8119aedb1388e9290990f
-DIST kapptemplate-17.12.1.tar.xz 352552 BLAKE2B f05765e56fbb6867aa21ea5fb18e9ba383823789e1ed7b6c53bd1a348b3690521f968d7a9e533ee58a8b42a4bcc5d9d3a3d89b11ca753e0c1df7bec8aa4d0e15 SHA512 d55f05bc4e5e30dd05d16653a0e71a59d7873565f8814275d303f02981602bbca6604906106e5862f6c1a6ec4d76abf5687ce62ea2d5fa3267d68b79b5f6f060
+DIST kapptemplate-17.12.2.tar.xz 352476 BLAKE2B 132f2e71e0d657a11f9819d9956f5b9f33d5105d6a46762014be205b70044fe23821b5cd60a583932e1213545fd0c9d4f50c795b333824d609e2449dd3047880 SHA512 59b7c133c4025a17e8fd52bc13d22739e9572fe5f942bf3e17024c6028c6e5910c11f314f3d024ea91e00ff3843cfb0bf49e25b47b8dab5070fff9e6ddc7f801
 EBUILD kapptemplate-17.08.3.ebuild 716 BLAKE2B 368a4affb8673ed20eb7c3ee3491a3e7e0364d978760ac574e427af70fd02c82e5125ebad9e9c087ed1ca72119b43203e5c4db039f68742e4b4c0935bb28611b SHA512 30e80278cec9f24715edb9195dbfe8dee55a20d56fef649ff742ca0773785601cf351d505ec46c87bcbe10ee8ed0a3ee5560b3ee5a4ff54d9d6df0b10202fd7d
-EBUILD kapptemplate-17.12.1.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
+EBUILD kapptemplate-17.12.2.ebuild 718 BLAKE2B 23610fc718bdee4457340700b0fff333413814a206c84b89d903715a050b7d3688dad2454f3c28cb37409a60a69cba31d9491ff44045d9b147341b18fe5e3e11 SHA512 4f0b319c78a4ee1f0e2b6a138f16578ed0d366f0063d4b1575d46da47ae06e7b4b3e1d9a6dc27d1a0c887980e36daebbb9b2380974f187ae8abc1547bd2ea5d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-17.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-17.12.2.ebuild
index a1bbc2a3c37a..a1bbc2a3c37a 100644
--- a/kde-apps/kapptemplate/kapptemplate-17.12.1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-17.12.2.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index de8f1b6fb66d..de893d9e79ef 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 AUX kate-17.12.1-deps.patch 3101 BLAKE2B 6cb0a6762041c6f6f2b02d921cee39b9f8eba1f3104d05a4e9565f7e9c7287f1e3ad5cb51bf07ff2f93d1c826c646102ae47c4f67d3e34dc82524ad102fba784 SHA512 abdfce9b12de6b254fecfa8d5f9e532e01212711962c88a02ab099f81ab68ef02a95c6afbae22057467562b37fcb1036b4edd2e8d8f1bde3919c4cba171de38b
 DIST kate-17.08.3.tar.xz 5617380 BLAKE2B 582c128e1904fbd0cec6ff177296aca68c36749581b57b6d71fce3e251838699c5068945a6e43abc05339eca3c2ac9dd5ec53891c20e208e3634771d5a859dd0 SHA512 cf4be33ec05a5451322141beeb4b2a66ff34da9f34fbc1038d7303d707012ffc477510164a65837ea0b94733b0e2812b747109a78049b5e4d31a75887c66bd46
-DIST kate-17.12.1.tar.xz 5630360 BLAKE2B 69f9855fbdb71c4215de58f046fcd88253d2edb7678633f07de4803aff8fc34dad975970e1f3d4800fd3f798d46ea30b0bdfef96ca11e22cacc53b0455d58fad SHA512 63644c093316f864390a67f419be047d9ae7eea8113f5a030bef047ccd2636ba4c8e2aeadcfb71cbebc675f91babef427b23bfbd96df310ff4ac5ad3e82d5e64
+DIST kate-17.12.2.tar.xz 5630528 BLAKE2B 29e0cfe6b25aef849f03e2a87bbdef4e64b1a9ee7ec3550c5257a6902e7fffd0f011ed08a89457f8215750ce8ec22c00b203734161902ee7a75a77fc349f6768 SHA512 cb71a569e4bd04c9ca1aeed81a7261b3838bf78d6bd731e31163f1eb254d81e78b13889d2118483de0d9cae6a92ebbc4e4dec9f3c62e29444ac1c3fd8dc7efe1
 EBUILD kate-17.08.3.ebuild 1954 BLAKE2B e56b1037dc2086e035559ae054099eac3f83e832f58df68441644948d444e8db358b72209eb65e0a5a7b88381da3e92c7f1ad82874d0e1ccdf69669102e5cdf6 SHA512 05a9fa841e53979f9537499c2460e44caff377dabb6e7f93c5bd7521e8faeacf300f0579d1b261af8ab2cab401602a5ef8d90fc6f6aa2beb05e48099ac8fa346
-EBUILD kate-17.12.1-r1.ebuild 1940 BLAKE2B 228f52e0e74e42fa9d47371b4c81420b74fb2bb5d4a09a5506609979a1f7a786a35b4476adbd7eae8f02dcadf989a5e5d35b272fdf5864b70ed05599755d1a02 SHA512 2f660686f97bb6e9b20a67152f6f8c99a74b6fac443edede4cdee19fb8069cfdff42367653246a81d7ef2ef257f632faf31d058d39c0121bd028553efe2a61e1
+EBUILD kate-17.12.2.ebuild 1973 BLAKE2B 47db54a4a4b7e9c8a4daadae3851909e864e6382765cc51925bdbaaae9485bea00318607e6caabf9980fa90611bd010798dd2c5b43bc174a1d55160b3aecd70e SHA512 f3e3b8d8e4f7e4b61e27c9bcacc8553b638271e13fd31706bda74dca2924f9c8a313fe35ad6251e48f841ede28493018a8ee611f7671c6aa371a6061f4534947
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-17.12.1-r1.ebuild b/kde-apps/kate/kate-17.12.1-r1.ebuild
deleted file mode 100644
index d3e0aa0fc853..000000000000
--- a/kde-apps/kate/kate-17.12.1-r1.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
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(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_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# delete colliding kwrite translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kwrite || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kate/kate-17.12.2.ebuild b/kde-apps/kate/kate-17.12.2.ebuild
new file mode 100644
index 000000000000..490ab95c9114
--- /dev/null
+++ b/kde-apps/kate/kate-17.12.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(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_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	addons? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep plasma)
+		$(add_frameworks_dep threadweaver)
+		$(add_qt_dep qtsql)
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/ktexteditorpreviewplugin
+"
+
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-deps.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	# test hangs
+	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index e380109930a3..0f51c3e08e9b 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-17.08.3.tar.xz 1236144 BLAKE2B 7fea5c19cc6c4839f63990f6cc93de7bc88e8ce8d16b496d78131490a810cf91133e9c8d46be51f89cc61138600324731c706b78c6a82d3aeb604723d78e9e8e SHA512 37640c3b26fe53842f23bb7048cbbab6a704901ea7c4fa93014f244bc381d7845fff5f61f7838397b30c51bfa0760a510ebefcc6596e376d5fe14ffc71bed74a
-DIST katomic-17.12.1.tar.xz 1236176 BLAKE2B e2f6ebc9960d3fe34646043107a2009b3f69fa47065295b987ae63ea08a1dc9ff4a04501e4a6aedf2f26f384739c2f4f4c08e713f68d4e79a948d55548eb53e1 SHA512 195a2ab94c29026c513365ac25265bf8152c09474262fb005e638153986a5850aea3bf2f0a3d0ffd2ec93ffb2b906162a021384ccdb79a67e678411ff3b1a37b
+DIST katomic-17.12.2.tar.xz 1236112 BLAKE2B 0f54137a64381d00e8c59a2f1d4a11906a7c30bf4dec97fa18e4ec56850f774a5c1b05da22dcbd9a367c8032f75f59f436a7602e0c8f3b43c9a641a07238aa65 SHA512 4d6129fabab44cb9b5eea083e7ba3c406581c3b382fda417aad3988de8321b5a17f5ea8af6fc2437a5eb04f87311b964551e54547edbfb854fd2e19e0658dafd
 EBUILD katomic-17.08.3.ebuild 738 BLAKE2B 9c4b7f46d17e59ac37c45c93a7d1fa1540177e4cd5d0d4f3d48de7a7170ad56cde03184d5223ae0bb9730d92b140e8c7060d5361a14c06f95cf75c8414e87b45 SHA512 a2bd8faa9aebcbed6cd6e8bcf750e3782c5e78801e31e21a6b3d535ebbcff41e307d8676e3c69ab06b5053edb9ab88d7f22cc8eb890cda9a08c2254f91098642
-EBUILD katomic-17.12.1.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
+EBUILD katomic-17.12.2.ebuild 740 BLAKE2B 715396c041dc1e0916a87d511e5007e06ac78ae9e50161a0ffeb1d6da6e7a067746afa26ede22a08c9785587ae77d1f427710422968a0221abc4a88b173ba61c SHA512 1e9f2dee9b0a85a9b0d201b537869d9831767b0349417774ddcc6d488c1227b9486bb6e3e12f5ab80d92505cf1b3e74c3911125913ccbf4ef3416916f345fcab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-17.12.1.ebuild b/kde-apps/katomic/katomic-17.12.2.ebuild
index 8385fb375b83..8385fb375b83 100644
--- a/kde-apps/katomic/katomic-17.12.1.ebuild
+++ b/kde-apps/katomic/katomic-17.12.2.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 5b79e0f4079b..379c6d5b5c74 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-17.08.3.tar.xz 401844 BLAKE2B 71788aefbfaf819e64690ac38c25151ba03704d3c1448198943349b41b6fc4c9e5465d6e49630234c0a564bef64e27d6b870cad2a3c3d5497a28acc0711d0750 SHA512 fadc0966a59fc4850e4598592a2fed9f014414d7eaaa654b753bab2fa5a82615310b6b3f2f38996754712afea81954a9f188912c16b594273c9737b5aa332828
-DIST kblackbox-17.12.1.tar.xz 401700 BLAKE2B 3fdd54c7a5b78f5aeb2326af458014747e5773a76db40faaa5ea68963c7cbb709ada526c3c8b95d4e1437b039cd177c51e6c9b444a88e1bf29378ccc4cc20ddb SHA512 98f2dde8262180eece380eb06d9a858e617b84d39154fa2ebae8cbaa5d91e002c857ab50f24390a40539867aac1e4601585045725cb726314e4e74ffe96ee370
+DIST kblackbox-17.12.2.tar.xz 401664 BLAKE2B a7f4982460c7e96f5ea291102617f60356e1234c83b0bde76d979ef903414bde1b631de7092e06481587cf0dc43a26443f02cfebdd4550b10bdce3203b3ff3f5 SHA512 fe68f2162233f77a734099a4520d53c9a404900076d474ad93f98b3fe1c818ff7e04b8a51530f887cb0565d8032dc7902f91c112a0f8d7ea55a99d803f91eac0
 EBUILD kblackbox-17.08.3.ebuild 734 BLAKE2B 296b51ef8cb423318dab75dada0560f78218acd0125102064ef05ab28e9e82bb77f41946e2e23e56eda5b26189c7994e35399d5263a45ddbf3439b97a0462062 SHA512 9b9ad6cdc67efea11dc110fb9461fd9c2953c1d089d73600968aa0e33be88ddc125296264cd27d9ab608b9dfd88b155d0f78d3337289f7688bd920428df83bdf
-EBUILD kblackbox-17.12.1.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
+EBUILD kblackbox-17.12.2.ebuild 736 BLAKE2B 3d98feee0ff07151beab896ce705fa66bd351f4a2b1916b111ad11e1b218b3696d540c0eda5d1dd066da969f30e71f20b0a8cbc26bd4847ec3510cb97633acbf SHA512 cb87ffeabfc2872538ceda0d78c029257f9effeccfb71c9681f087e839676f71ee866044b7c77a5f9994405239b110593fa4aa45a96f45e2ce8d90402c683bb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-17.12.1.ebuild b/kde-apps/kblackbox/kblackbox-17.12.2.ebuild
index f595a51a7bbc..f595a51a7bbc 100644
--- a/kde-apps/kblackbox/kblackbox-17.12.1.ebuild
+++ b/kde-apps/kblackbox/kblackbox-17.12.2.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 4671822ab82f..fdc3b7419d23 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-17.08.3.tar.xz 1750244 BLAKE2B a543c4751c27f695c053a8af310895471379d125bcaf0d6eb3d49c6d09fd36fef89ffcacd0ed2a35961bc22c1926b5bda4694134e46777fa201975e7ea8bea4f SHA512 c83afdbf618550caa7a939e7c556c36a57c7612c3b225ab3849dd6eecc3f933da0cfa2519bd2777d39699553028999b26fec10422ceff5db9684d4eaebb7e8ac
-DIST kblocks-17.12.1.tar.xz 1750400 BLAKE2B 31b529412bc89b68a65f4737e667484fc89ad955ff3cb8dbec54c10c34aa3da02cd801bf2690b3efa1305f64fa91cbc09930ecd63807b8eda5e7e0b3def8d833 SHA512 d4729f91dd42e2d9e9b1e553bee960d85221509426a8a9d708e3fbeae63a65d5c17475dd1fb130e8567974987392edae380ecefd3fcabd6a12266dc689bc70e3
+DIST kblocks-17.12.2.tar.xz 1749880 BLAKE2B 8dfc4f1cdb9f2665e4d920f3d5886a29f8426be2e891556dde4dbd208a81618fe1f11c45309eb2d2d96eb8839824b7049a8e1b5f835975d39ba42637cc956eb9 SHA512 6f36b752a4313f8b8345cb54d18e145cf06dbdc00954adfb54831f93643d94e9da130417433aeccfc537d383d60002fc979b2f3b9dd55b7e43808c4e7a760b7f
 EBUILD kblocks-17.08.3.ebuild 686 BLAKE2B 494c8566cf9d120a783b5f34d4d187f212dcf757b8539aaa81c7edae0a497cc71091234e8b0ae557fd6de195f4413e29c83924853c5fa9b64ef99dd56fa3b737 SHA512 cec0e0a47497f1ea6ecbc7653bee8b4d8f6b81d87f4419e3dfdd2a2b252b0dc9a8c93dca582fbc621d59490d2ddc68030b1a72b080152f2b952f198c60fe23ce
-EBUILD kblocks-17.12.1.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
+EBUILD kblocks-17.12.2.ebuild 688 BLAKE2B b997825b2465fcba231a66f409136b932b7e8a14d6d098efcdb4736b913171f1230cb9827c816fe588e71d0675a58c77467d1469c576ba41100acc9d40f8496e SHA512 a7434eef2ccaf3f52bd5a9ec681959b7c5d8a9519fc7eb4e1183fe607a00f0d3b5d3cd3a9397fa247537bea3dcb34a30672efc858d1eba9031c7ac55688a735d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-17.12.1.ebuild b/kde-apps/kblocks/kblocks-17.12.2.ebuild
index 864dc454ad9d..864dc454ad9d 100644
--- a/kde-apps/kblocks/kblocks-17.12.1.ebuild
+++ b/kde-apps/kblocks/kblocks-17.12.2.ebuild
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 426e6c66cee6..12ee585da785 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-17.08.3.tar.xz 72504 BLAKE2B 4d0cf23d8bbfa4a108d8d451148b0e6696b8d9ba4b804caab84296a6ef0af21e9d54a45f4b915055740be83d94f53b10feb14e552b15ef58b2ee8ff43c4214e9 SHA512 da1caf92765f87b8371084b7f7bba080577c02146339dc45cbf151e93973b6b64d7d421a2d10545567a0e7d802608a422ea8fc43c6863a95df9fc1f4c7644cc2
-DIST kblog-17.12.1.tar.xz 72488 BLAKE2B ecd0f87caf80ff13ec7b3443530d0c5b499e63d627487898a05eb259d2c0084a931b320231ada0e7e1bcbe0be5f2d55c5df585bea4a287c7d7d927f60a7fd83f SHA512 91deb0a4c361249a9383b9ea722ab83c184113c31fc6f62a93519554392cf0722b90664a9d67b2e4fe69dbcbfd932e96b8bdb1e267ea2da46ad4c248ecfe708c
+DIST kblog-17.12.2.tar.xz 72416 BLAKE2B 1429ca504277d7d5b355e7e5b267187ee223c26471ff1884b17e0807799cf40923de9dc8f05512752fb2798060d08a36c148277ed8dd1117fd626181a4a9f22e SHA512 3d1605e287e05df9fde39b96b1df224b6ce98272df78b246a40b181a99d848571ca31f907bf5aed799535bb2e82c40ee28cfd0d10d36435b26280a16febacc67
 EBUILD kblog-17.08.3.ebuild 571 BLAKE2B 138e63c468288d6effa3d50db8e2c7ce3ef12c95df966b122da91bfed819966019abb6db1c852e94c35654bee66ca6d775af1433f97466f3d9969a2779a70723 SHA512 d8e9158f06e4f9d4cc4b774adeb46c33b826f6ce32feb456b2320abf4e985130fd5175775ddcf238ec91ea3300920c5cd6c604f3a15f36ad96b49b355a9a566b
-EBUILD kblog-17.12.1.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
+EBUILD kblog-17.12.2.ebuild 532 BLAKE2B f3dfd672526dcdb8262f6afdc6926c58f752c6f2a7f9cb8131fd8ffcf76805d8e68e2fa4ff1408dbc8faf1cc2bed8a01595c4cc70739a5852890630f1970d8b6 SHA512 43b74ae97733e3869b19fb4e87e5efe7b6b14ad0bfe57d99b7bffac35f4af783d8129753f2cec3ad4b41f013e60057f254df00603cc0fe2fee75d5b304af2baa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-17.12.1.ebuild b/kde-apps/kblog/kblog-17.12.2.ebuild
index 52fe4d617ecc..52fe4d617ecc 100644
--- a/kde-apps/kblog/kblog-17.12.1.ebuild
+++ b/kde-apps/kblog/kblog-17.12.2.ebuild
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index af5d68c9fd00..24c0ce42c8de 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-17.08.3.tar.xz 3481768 BLAKE2B 28cb83e8945a87829cdba08f2ad2cc0f119da2548eabff26a6caed500529fd4452dae8b6e1dd958415f4221131a28108eed4c9243794076d11317f2153a2de42 SHA512 9eb00ad6337d410dddfbf9e709246b62579593685aea53bda707dd62ba0199a3e0648ae276b049f7290d7d6a4b377cabb7cfeee8d64d6765ebf1ae2bd9c17c41
-DIST kbounce-17.12.1.tar.xz 3481612 BLAKE2B a359f1899d33d0ab5ffe5f9191e99d2508f8cdd3cc7959e204603c19f5f38a3a5f3a5a816502704db0529651c9b7ba237827d203d72b2c9fee19d23486d5129e SHA512 5963bf5c258189df53275bf51a42b1bd273287c608cd88fb052b4cbb09aff9b083a6e4edbc821f8e88e159b928aa18b33635698042a97c8023d31832060d4187
+DIST kbounce-17.12.2.tar.xz 3482356 BLAKE2B b31b4c5dcf5401a7baeb75a558914db10d947bf689397240f65d79a501d76c4aae34335aa545286488df8f1e93644d4e31f923ca282344ce9be44e5ca3d2525c SHA512 d680381f4c63eee640befbca643948f6671b1601e0d2a700b42f366af9cc242f2446d862f43b1876f3c62653863a54aced101f729314240e66454b7cdaba5436
 EBUILD kbounce-17.08.3.ebuild 817 BLAKE2B 955c99aebc3259e7cfc666153940fc986c20f1f8d2307ad5e8f9b844e32bfbade83e68dbcf9f521256a60b88c8a4796f7e87f56d45f8674e92e4983794db48be SHA512 8f1ea05812b932efff730d5c1516bd787e88a3955569dd628eab3f4564520b4a44e46a7947bc0082d0a42a951a5c28f8296965bd79d88d4bc2a9b8f7a107b1ce
-EBUILD kbounce-17.12.1.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
+EBUILD kbounce-17.12.2.ebuild 819 BLAKE2B 6ca3462e7839a2e970005270fa502924e937e115b6684493af8f5fda8804c3ca4ef032ede4885e18e6d6670b0006f5b323530ed3741f8e2ef0fb550838775d8f SHA512 da01056eb58c0178d1cfe3162f3ffbbb02ace4f6fa97d06086f0a5d3c84a5d61a4280db65125ddfcff7067a691debc7d0c2416de9327a713b532ee5c12b4638f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-17.12.1.ebuild b/kde-apps/kbounce/kbounce-17.12.2.ebuild
index eccbc67cbbbb..eccbc67cbbbb 100644
--- a/kde-apps/kbounce/kbounce-17.12.1.ebuild
+++ b/kde-apps/kbounce/kbounce-17.12.2.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 1aa9727ef6ef..21d0663442fb 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-17.08.3.tar.xz 2053628 BLAKE2B ad9e78fea031578dcacf0fb77550b6a5604b327acb1124b1f02b9479c2ddc4fc352a09ba7c19e9332787605decf66bc071868a2d4925ee56964b69b4dfa9940a SHA512 9c1eaddc77d599e6992a62ad76751469eb52fbc0346aacaa20996ee9914e11dfc139084b1a7829268219873a83b158165c7050d7315e533e77934f6a7ba1dd70
-DIST kbreakout-17.12.1.tar.xz 2021136 BLAKE2B 58cefedd143ef9c28f989d16e12ace4a2814783d9494fac896ec7f387a532aa1bcad59e48801f245931555cfc08b731cb4ddc6a151192c9f8243ca4dd16daf9b SHA512 10a995c3b6e08a533877da9fb1ef47ec08d8176854b72bb4ed558a84bb66adb900e17e7d0e998cb20a706e7d8f9e8dedcd78781e21282d322f2ace43ccb6b64e
+DIST kbreakout-17.12.2.tar.xz 2020784 BLAKE2B 7222ec88ace39aa4d7731ce6814b700f2bd0ef6ea3777cdb932fb383b33a2be18bcb7d053547f944c2070e1b1d29bb173fd67cd7e7e35ec1bd2d889edf44d152 SHA512 d14a0a0493f5f265578c62a403e7f422efcb322e5de2657d1461c027599b13b43e35ef296b29ddcf0db4147caeee70d8f0cbe44dd4141d37d9fc8fdc19f1f5e2
 EBUILD kbreakout-17.08.3.ebuild 766 BLAKE2B 0e6127ee626d25aea1864aaa90f814678812739cdba87d2091e69072eaba94334d695d6249332ed46b3c99ffe80090ade7ab39c79aa23a4056c5abaceac0f8c0 SHA512 c95638f42e5d68d3d50fefc11067d078c56bd484651273393fcb8b12b085c69f01200d6fde0ea6653020c5528b561a72464c706ec989015f67bc598d053f52cb
-EBUILD kbreakout-17.12.1.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
+EBUILD kbreakout-17.12.2.ebuild 768 BLAKE2B fc85517ecc7e80c9f666512a2543624fd415599b1842acbd0d9c0315c8aaaf6106b4d9c332de0fe28be4c7c9d7eb4bdba61f3f4c3c7826a57fb4a1d2811e314c SHA512 11bed8e4809be58b9b273a03df5ac0bc20ce6367008ac09e0c4dd2f3d531b512c8c01a98924ea0ba8ffab695b6e5d0fb4945575ab39233fc68e517010ee73357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-17.12.1.ebuild b/kde-apps/kbreakout/kbreakout-17.12.2.ebuild
index df3e421e986d..df3e421e986d 100644
--- a/kde-apps/kbreakout/kbreakout-17.12.1.ebuild
+++ b/kde-apps/kbreakout/kbreakout-17.12.2.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 4795451d9cb4..c473f152dcc3 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-17.08.3.tar.xz 5601140 BLAKE2B 9ca35db68c26df61b098d9c04232c611c7dab8e84c63927f49d094c334b357d8f0b689077754ddb98a441e268161dbb6a0301bb2b12cce9e201a563eff19f1a5 SHA512 2a55f007b272463de5bb59ec2bf7b6efe3e33320f9373f7b14fd4f738b8831718720a6e451988b04dc364f39c4706484a413ff2ba35826afcf1c8ae94507142f
-DIST kbruch-17.12.1.tar.xz 5601072 BLAKE2B 4d4127efc1c3cc864808d17376001a935f3601d2ab247feba8eb80ca242bccd4b1e7fbb032e510778027ccdc076e908a541a7d53fa5d834f56bf869ff75df1a6 SHA512 a96cf389a120d2e4ecac6138bc2604640ba622820e41fb728f229e59b1644da98ce5c4eeac12c669ddf1006d16d0d5f9b8ed1c7e35ddbc82cedfc7d3c5b665a9
+DIST kbruch-17.12.2.tar.xz 5600920 BLAKE2B 83cac10e3052f0bc3eb76da90560127c785ece9bc716ab1b4a5fbc821ad829ca102b00d2a608f04440c38fea12426ccd5ed268ced8f8dd1c6e7ee5f381d8be0a SHA512 fe8d14961034f6f85e568803ce5c12976d5396e8025cd6d53927edc83e10cb4b145fda18793798fcf91b3879aa2f093e41611d569acb709e2e5bcf9a30e43d2d
 EBUILD kbruch-17.08.3.ebuild 630 BLAKE2B b41e111bbc5eb946a47b025de1bd7cfb5051d995ff5a1f3bc43a09f1bd8522b2ae1ab8817b433e4100bc18a3c6d2e1939ea3f5158b241454788b66ce6aaf0cf2 SHA512 067523d8102a1164ccdfb67f349b0514bcc8c86646ed624c450c6ffc7caa6cda75daee73d1bf34708088131edb399bbd583cc08000d593bed78ce22bbcc23108
-EBUILD kbruch-17.12.1.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
+EBUILD kbruch-17.12.2.ebuild 632 BLAKE2B 0a6b5ebf28c609236ab86ebc58bf09dcae519f505d6a0d27f44409b2c60ca01e038cff251fc60432e96a76c94f4f52d67bd482f049bf15c00b35ab33b92bdcb6 SHA512 953945f0d5366e10c8f2783cd25e98f4f415ab9dd3e3378788edb835b96a93954be6f3121795c7076bdbf4ab57bdb373e7a3b94433a6b80bf9041a73a42d44f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-17.12.1.ebuild b/kde-apps/kbruch/kbruch-17.12.2.ebuild
index cdaad6a4a6c1..cdaad6a4a6c1 100644
--- a/kde-apps/kbruch/kbruch-17.12.1.ebuild
+++ b/kde-apps/kbruch/kbruch-17.12.2.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 84ca2a31fd13..1c4ef578a2dd 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-17.08.3.tar.xz 813804 BLAKE2B e04d4fa90b9e0027bb9610e10fe66f4029ae81194f4ee47a0388da947cf2496a109655302fc27a103b2c9d3f8854d6088ed7205b2cd10076155d98cd6b4a79a2 SHA512 0b94dd1a5342b0dfa9dc3c6a6f2af46d494597b9fe7b53a92752fa87dfb27a75d0ae4642f36bb69ee3d05a01b7ba88007fdc5f81bc9a9b1cd7d320fb2bf22062
-DIST kcachegrind-17.12.1.tar.xz 813988 BLAKE2B efbdee4d67b2b266e8d8b9fd6235988989f984597e63d5ef7ab2fdfe7a849ca8347457022d2a71a463f2a9db8dfc522131971f7f1238c9cdee86ceccf635977f SHA512 ddbe8a577ce1268fd04df90bdbaf6cf0d0f6bc181a7fd29be30a333f0a3429992884f64d2c44e635c18c8dd3ac74febcfd30ad9043ae574d05b9be981de5ee83
+DIST kcachegrind-17.12.2.tar.xz 813840 BLAKE2B 767031e64a0500b6285b8ab860639260470ddebf5002b2a8c70663a7e8f469770db70ffd1a7b7b3254ef880399cb2d751567dededfd0d43f1bbac5addcd65f4f SHA512 572faa3e8228272781e616a8d661f5ff5752547134aabaa85a1898eb314907bd269c574b00dab95f8f7fe7b0ae3cbca6e2885042b16a4e712cc11d533d825dff
 EBUILD kcachegrind-17.08.3.ebuild 879 BLAKE2B b134be242c173cd8f947049c480702df5f317e98ebcd193e7331aa25673238e3fdb5ac7861980add29118dc1dd6c2b130219e1c7240e4965447bf642e02b59ee SHA512 b834d90af255334f9180122053bec7efb5701ab8e640717df447d3e1b512c8bb67d3b313895d3de887287d90ec5156776877e5a9f35855a03e888ad6e77eb3bc
-EBUILD kcachegrind-17.12.1.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
+EBUILD kcachegrind-17.12.2.ebuild 881 BLAKE2B 0ca911c9cc2beede7e7b59392cb9d6bfe0eaff3b6c98b1be10f896c84cc7fb923293d1fad1f8a7fa9afc835bf1789b34d6f6a7339e1f6fefa2a9602529398a34 SHA512 57fc2642442e1bdc5f4fe3188f84a061d5c2c1cfc8b11e3fda8448d6cc3b9209e49b2c5517680f2c75c684fbbe340e5f41ef51f8d0a1c2f32b9adea51471c4d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-17.12.1.ebuild b/kde-apps/kcachegrind/kcachegrind-17.12.2.ebuild
index e373c6a3ab5c..e373c6a3ab5c 100644
--- a/kde-apps/kcachegrind/kcachegrind-17.12.1.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-17.12.2.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 630a0d6198f7..687e6597766d 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-17.08.3.tar.xz 360228 BLAKE2B 14fc73f8ade4335f356dde995477bd526c499cd1420a314f53e2fca930f03644d71c8bd1b0ae98b9fffc9bd43c041bd1cf918921c4dbb91f92da76321b1063b0 SHA512 b578fa8fe38034eed09d9be012a824449b75a5d99bcd4eaf96378de444e976534fffc385db4c0209782bfabdbf55b7d9cf3a2a63b836f023adde92782e6a945b
-DIST kcalc-17.12.1.tar.xz 360280 BLAKE2B bc5d43a3082e5027da6c698c45a92b93640863f42bb5c720fbf8d413ba714ee5e9141464b4db0df1d08b7700f1ce4bb589bebca031cae330de1a24c2d7db218b SHA512 36aa3e39ffc64a6e829e077a8705e6afbcb8f570ccca7b612b0b204140e87d07b3fb57a3b59921fcf72f425810cda9a5b2a1d52b4804662f5489add565f7e859
+DIST kcalc-17.12.2.tar.xz 360236 BLAKE2B 7ac51399e963347c414b2bf01b2360d91e1497e2110fe5060c35db0f892d2334b7abac16df4b2544787470780e2bcc0d0b35d9e62a1b94a9febbb7ec1187f36f SHA512 902e64eb0bca993b557be9ca2c4807645913fbbfb8cbd3964df18de84d8a90c62fc0a0dedca10c9aa709bfb82d1be0cbd63087d79be92866947af938feb6d631
 EBUILD kcalc-17.08.3.ebuild 771 BLAKE2B 8cfc11bd45eee3c09d03060efbb9eeb9ae8a63da41f8bd6ac9847597f0d5bfbb41a7390cf12b604530b91f153c9fa5fd3630b3485fe9ec78629b40a8e9b82086 SHA512 6d77bbde854c65be877f872434123e7be2789c7a8770e1214765c06bc51af9307260aeb122d58c59d8b458f44b4aa7ee278f2f21f9940f744fbd39240c60774a
-EBUILD kcalc-17.12.1.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
+EBUILD kcalc-17.12.2.ebuild 773 BLAKE2B d4b788d176928f7d3ed49ab3b985439209cc6279e816e2a99ccf0a7d7584484ad7a139845dc6feac14291d0f2059cf45ef19e472313bac7a41db04ed3acc2605 SHA512 db3ad31717a281b74585bcaf1f48d7b739decb4978579c428ad5e1beded5cb269416011d3340a081ca26347304e6610721689a060de7a88802ce59a29e03f33f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-17.12.1.ebuild b/kde-apps/kcalc/kcalc-17.12.2.ebuild
index 2877d5cef5ce..2877d5cef5ce 100644
--- a/kde-apps/kcalc/kcalc-17.12.1.ebuild
+++ b/kde-apps/kcalc/kcalc-17.12.2.ebuild
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index e53a04c26b0f..54a7ea2e8bfa 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-17.08.3.tar.xz 283052 BLAKE2B 6c6d9c694a3d97ced72d3ae59b88cb35aa3452857d5d82ba004b2d3c09452c5e5346b013d22726737581cdbb88be33ee0b515f9c586ebd7819bf628bcf7c02cd SHA512 485331c0bd8695b58b1b5d756f525bdaa5906a1ac64399e1f74cc6eca04a073834519cc1d4baecc7c054fbe79663262e6785642478c95e5be5052d87f4cef546
-DIST kcalcore-17.12.1.tar.xz 279300 BLAKE2B 54e06ad35e0a0c84aaffb5c637494c18aa7c4eddebb60fb51d81c8e7c9ec4074ed8787b2710674c3dd13b7286abe0f4a3e1a5a4d0dd800c6eb865730319a8b2c SHA512 5b836c4cda0b70f2050e74c568b5d2d18ce16e4a0316eb01bce5ac83616230a017b3f20bbecf327aefdf37b3890fee33be1e18a6ad48642d4d938707410879e4
+DIST kcalcore-17.12.2.tar.xz 277480 BLAKE2B e9a2568cda343a73ffb469a1d8b4ac3f8fc19ee9f301fa3e7970fc89b8268011eb4230df124151ad7a95e9a86b5e154d76270b30c95501db5f0910544a84ee0c SHA512 ed9195e902cbeff2d48a013cb4c7cade458109696476496a4f8a7a340016c46c9e90d707292d16dde9d80b19290c6d4562297b71f81a5bfdea0eefe76889943c
 EBUILD kcalcore-17.08.3.ebuild 564 BLAKE2B fcb5a24a835d7612088f1efca024d6b3ff6d88ef54d1b87b9403ea11a69abf92f478102810851bde64e65b6209c26137ecb01a19ff08e608656cc3eadb52cfe7 SHA512 fe5ef5cf8069ba5ee11cd6580227c06a4abea580873509e86a03e5e1752919d39da915b5dd5a908a96b2629dce0e8dbb58a1f921d916c97c092ee04f9d125ad3
-EBUILD kcalcore-17.12.1.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
+EBUILD kcalcore-17.12.2.ebuild 440 BLAKE2B eaf468e17f97f98ae4ac9f39bb6e159edae27965ab693af16cb79ea82f9eac5716cd561e525012fab7d28e1dbabf7d14e8c7577df1929b62ad4d32a2b014fcfe SHA512 d27034f46a439a58a06002885e255f2a1ec6054c3e2d84581082547a1431e2b0b44470563f295a1ab47a47e7d579dcd7fb04c47d3aa3386746b7850e8ae0eafd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-17.12.1.ebuild b/kde-apps/kcalcore/kcalcore-17.12.2.ebuild
index 88a4662dc2d7..88a4662dc2d7 100644
--- a/kde-apps/kcalcore/kcalcore-17.12.1.ebuild
+++ b/kde-apps/kcalcore/kcalcore-17.12.2.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 0db640974be4..f9cf9f734f3d 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-17.08.3.tar.xz 325564 BLAKE2B a49bb9828bf7f1066d95338a04b84674d91b87c8bfc07c367e0dded38ab1db2ba0c2e6a010ea7f36083a7d55a1e41e5c7438e6d0690bcbca656197cf051c7c7d SHA512 aa22d1726f835f4bb33024fe33212f4f44bd9c0ed91e38cb514fe4666811cfd5d5a7fa23454f26f15ddea2921aa1be3c953729f03432c645a519662efab8b879
-DIST kcalutils-17.12.1.tar.xz 326280 BLAKE2B 57a20de8b8f423c005fe8f8a69d42ecec77a31cc083464cf3e31b6ab36e8d8987667389c33753840c30005181becf26f6a781df3d02f3f4dcb584c933e490a98 SHA512 92c1cf5ff386de3055a335f73974f0793888d3d10aba26695a52716b4f077f52f9e9285e83e30eed987cf8c7b0b50400937b3928154cbaecbff8c95248444c8c
+DIST kcalutils-17.12.2.tar.xz 325048 BLAKE2B 023bd5d6025db6b32f94262f2309833742078e1f5d46b68db74076445a451910bfdb9944d407fb61a19a2c8ef3f4eda2b088a768577d440d9d786659302b8505 SHA512 51f5b1fa076360c6b6ffd30af4a94970905cc14d5c23017ba4a163cdd1e27d762674403d2b78473cdb4c671a8190e0e4f8f5003d687fb873b7e4f5abbd2d3d7a
 EBUILD kcalutils-17.08.3.ebuild 760 BLAKE2B d859b076b969e1b395264691c6bf665590dd1f9a906a1643b3895df38f7c0c52ff3faeded89f1969736dc0f2508c7c78023bbe019d6154e1a8ec4ce81c16bb5b SHA512 6d5913f8bd4d5059ce0c32aee135b55ab76da22cb141dc7b47696dc88e79b9272004e037281f36d3a117b8fd93e97f8248bc295bcafb47dda841213142754425
-EBUILD kcalutils-17.12.1.ebuild 761 BLAKE2B fbdd7bc9e9a8c2d47e30dff4eb862380e1dd0be0012956156f31ba52a399cfb1adcf4f95d19615812b04c2dbb404140f338d5a37184c7ff3fcc4e641a1f33b52 SHA512 27efeb88296f32c83a551a5dcdd95b99084a4342260c39175e7f8fd4cca7704b05f2518addcbc4aa6ecb0417dae8e79e3ea07986b39b91a46132c36e209c6048
+EBUILD kcalutils-17.12.2.ebuild 761 BLAKE2B fbdd7bc9e9a8c2d47e30dff4eb862380e1dd0be0012956156f31ba52a399cfb1adcf4f95d19615812b04c2dbb404140f338d5a37184c7ff3fcc4e641a1f33b52 SHA512 27efeb88296f32c83a551a5dcdd95b99084a4342260c39175e7f8fd4cca7704b05f2518addcbc4aa6ecb0417dae8e79e3ea07986b39b91a46132c36e209c6048
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-17.12.1.ebuild b/kde-apps/kcalutils/kcalutils-17.12.2.ebuild
index 5d61e1ec298e..5d61e1ec298e 100644
--- a/kde-apps/kcalutils/kcalutils-17.12.1.ebuild
+++ b/kde-apps/kcalutils/kcalutils-17.12.2.ebuild
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 14f0cd537530..56f5c220d267 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-17.08.3.tar.xz 350700 BLAKE2B 09e984bb27b9d472911bbd2f8b1213a820f4fab0abeffe9ee8feb50feddf1a72712aa9c8d6818c1ac6e28ee994a5349ba44581a779db1a7d9a4effaaae64ea28 SHA512 831f9a91bfa4df2e78fa0d138d04ad3d06050a8454cbf8b5f8c6cfcee2c9fc2be691d67b71de9df20aa62b9ae4d1f6d3eab18a5aa1bb203bc33cad6674cae2ce
-DIST kcharselect-17.12.1.tar.xz 351120 BLAKE2B d7fb53a867f34f6bc480f0d545acdd28ad438bf9226bfe24a6a061996f5783fde8903972dcddf603326bd2a5892e368413d141964281c62e5b0c97d5a9060a42 SHA512 7c848adcfa72c385d3409a03e4cfe36e036d4da6addbcf11b4e0170a380afe7d6b333bc99d68a61de6ae165df646b3430cdc759c0fb5c8ca07c22060f981ef73
+DIST kcharselect-17.12.2.tar.xz 351316 BLAKE2B 5e3255325e071a3bf533db006375ec812f51c6dbb484e12753369078944d8871237d483067ebdcade2969069159d798faf9a238b3333b548cf161387c5f161e5 SHA512 9b4bce1fbabc8b51b8d18a1d9b9a754fed7de3809c7bdc392a875061344ab213cd7c1b06c2e30fafb6bbd4e1e7923bebd5a688ca00c9e00323977f39e4206509
 EBUILD kcharselect-17.08.3.ebuild 657 BLAKE2B dee6f0579765703c129a7926d4ceb26f28089789c0f2cde3b69c62059776e13fabd24b33d05f0a4041f61926e4bb8be25f35ceeff0e8edcdff2f5204c625cd1b SHA512 7f8ecc7aa1a9c707242185604390a95ed59d46036350ee414b420e0a1d5f9be7872283570ebf4b2bdf677c3cfe3719d1bb3a39009e27feff5bae2faa3627b5a7
-EBUILD kcharselect-17.12.1.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
+EBUILD kcharselect-17.12.2.ebuild 659 BLAKE2B 770987371ea06f0106bd6c902f80d968cf0122cc4914067f2b7378c93d47b83e850b4e79a63e18c0faa7769baefffa998da9e044deb6efeddb3cbffe7fe59230 SHA512 fead3ce266fd1936720aa135138cfd21fa3f02efa9b1a18339d9f99c155e240962e1d81a81994da3583a261635c5bce505a084c7f39e09cdaacb77140f07c725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-17.12.1.ebuild b/kde-apps/kcharselect/kcharselect-17.12.2.ebuild
index d7ccc94ca3cb..d7ccc94ca3cb 100644
--- a/kde-apps/kcharselect/kcharselect-17.12.1.ebuild
+++ b/kde-apps/kcharselect/kcharselect-17.12.2.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index e0f20691def2..97fa4ddbd5e1 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-17.08.3.tar.xz 16240 BLAKE2B 12b1247a927b6e880716bf4388933f599a82a22985c4a2229a7c01bc2adaeca56f6de825f17f29ab0928fb5290aa791e92daf116f4699c032861555633979360 SHA512 3c495e3848ba23a3aaf411ecd802df9128bc0dfb84e1f0da71af84803d3f572bd259a026527fb28fb14abd3b8147f68174421a71700d9f3150bb4783e839871c
-DIST kcolorchooser-17.12.1.tar.xz 16656 BLAKE2B c0af1cb34caa0ef95674baccb46348598a998a90546c9e0f462214526fd6f487e99a7e3b25d4a80849face9a8cbe2d0b1086f68ddabe682a986a3b2047b998e0 SHA512 9422032433f99f273d309c5551849ab873af02520b7cf295b7b41544322609ce6d9c98495313fec81c00493c8e8714612f655002c11a026150eef5bbbd4a20a6
+DIST kcolorchooser-17.12.2.tar.xz 16752 BLAKE2B 95e4a48d7e036beb209e4095cb5cd37b539af3e2e85cca82b53e15fe2a7e93b113e7f6a5a6452046eebaa9ca799594aa3e1914db5793b1508b8b9986b34622cd SHA512 1b3e75f86d0db24d0d32e831a5a95fec32adfc546b63f8def341f4a8844e21177e68ecda7e6f1d5603013af3ea983fff1a9f44df4d7197ab37c25c792b059792
 EBUILD kcolorchooser-17.08.3.ebuild 455 BLAKE2B e19d84ffa48d9d29eabf2b5e7ad34fdf6f7352e0dbb765a6598c300c0f5df0dd620de02c1464dcc5455d2a198e7d5e268bf7734408e16b02550e657be6bb59cd SHA512 68af923d8ccb8e537707b6019f7d8ce5f568458143a2889531fc08a9bf323720f294da39d906559de2642a4b5f4109c5e40c8a28f4382c2d04bc56fd2b737c6c
-EBUILD kcolorchooser-17.12.1.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
+EBUILD kcolorchooser-17.12.2.ebuild 457 BLAKE2B 06ca4df8902e0b76632924fa9c5a26127656cac7939f9eeaea8955c6636f96a45cf3d2e71386fbe6e76d7ee394b52901298a9db5ed02c7b8553c0d63c936c22b SHA512 cd5b9c8296cf2ee12e9fa84afe8a5d65f1171410946fb435522ca8c991d8c4339ec7d34aba1c0109c952ad54dc4a889a0323d55e228c71824906d652530df1d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-17.12.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-17.12.2.ebuild
index fdbb64c54d27..fdbb64c54d27 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-17.12.1.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-17.12.2.ebuild
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 5471755610d3..fab8829ad040 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-17.08.3.tar.xz 207344 BLAKE2B 3b59cacc2e76e113b5b6f164ef61f9de0d8960702d0a8ee1db38af5cf01155338a626bcbf47a4d67d5e8a4ddd359d71d94634d2338c0c44cbc53631a84678bf5 SHA512 ca33eb9c130c947ae9347c02093c380f1dee4bb813406d5f2849eecd52b21e78d259085bddf8d2a0e00519b479c3c9afe3e7730f5a7a9da639b0c01308b48487
-DIST kcontacts-17.12.1.tar.xz 207048 BLAKE2B 65028f13eaa4cff28836fdd4bae141b4058fefd9ac5083946ff24e00f1cd9f062c59021466f237db6468977c7ef43b0b2ebc690bf42f4531ad92208bf8669bbe SHA512 3639376c1a9fe2a09156d6abb9d912e582438bf13c90cf4330f0eb0af3068690f82d1ee5f786cbe66b74267cc852fd487f39644140964b3793a27c427e1a88a3
+DIST kcontacts-17.12.2.tar.xz 206740 BLAKE2B 2eee99cac9c1ab2962e328c4eacf7d05b1630ba29d8aeb9db651358f5dc11e655d13b76919f9f9a4a946d6ea01ef27765dca999213f3167b634cb2e50929f493 SHA512 f6b18421b06d6991c0f99921ccfbe30b8ff79e6912fb1dda2fde06da21600ebcf231549176192ee6ff7f4ca043045a3134389c0b6189c8876a999b4d4d4a2a40
 EBUILD kcontacts-17.08.3.ebuild 853 BLAKE2B 1e3fec2f10401eed10d6e0278de7c4b514304829027d8732967b4618f8fec71dbf06f411bc7dc569b6a884400db149220bb097d2f19b4f8ef87231b80540095c SHA512 e12ba02b9d774d70b4930629187d141d0f8b566ef034ccac2866db536a2b126419f5942978e76793261dec6dd87b6bccd4f438b350efee41594248b833ee5b93
-EBUILD kcontacts-17.12.1.ebuild 855 BLAKE2B f2cbbe2d73e8c7d644edc3e7103bd526f0fef72312d513931f7a90e304d4f4214529a489578f390b40ce48f952f503094d73ec4d64d081ae4da3fbdb208e8ad5 SHA512 e41dfc6c90d9bd0c84c0623a74e23dad2dace61a1e0694d7a54ad4b80f9af0d0b6fcc774dbc5545a17979eb95a07a3706f25dc9fbff8b3ff74d3b52524e3e824
+EBUILD kcontacts-17.12.2.ebuild 855 BLAKE2B f2cbbe2d73e8c7d644edc3e7103bd526f0fef72312d513931f7a90e304d4f4214529a489578f390b40ce48f952f503094d73ec4d64d081ae4da3fbdb208e8ad5 SHA512 e41dfc6c90d9bd0c84c0623a74e23dad2dace61a1e0694d7a54ad4b80f9af0d0b6fcc774dbc5545a17979eb95a07a3706f25dc9fbff8b3ff74d3b52524e3e824
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-17.12.1.ebuild b/kde-apps/kcontacts/kcontacts-17.12.2.ebuild
index 620bf281c410..620bf281c410 100644
--- a/kde-apps/kcontacts/kcontacts-17.12.1.ebuild
+++ b/kde-apps/kcontacts/kcontacts-17.12.2.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index f670d5cde88d..23bb9acc23b8 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-17.08.3.tar.xz 1054744 BLAKE2B 8d6eacdf8bb82d77d9e556b0b8ed9088d40cdf54856a5c0069c2e103f4cc703aa36d0a41c3c0aef493d5e3fd864f42bdf3da8523d633ade6e948cddfedc79ab1 SHA512 4e947869a1342759c5950968bd8c90a46e4c5bdd13197dcd55fbc407ce700d177640becd4418895e7786ecb9919a815651895e7da7a8f35f8f2e9fcdcad7d405
-DIST kcron-17.12.1.tar.xz 1054760 BLAKE2B 4e40a69f49d0250420460c764a589aba9a5dbf04936eae131a5e1a5f23cf8e1a20458ec58f7ff5343a997544d2d351741f4451d25adcda2a853ce8b3edec3ede SHA512 cd3faf1cce88bfe81a64b844cbf4b1939d6f2fc3d52cd0004f3736a6ff558b143024f3288f1b05281441cf1ca3aea4f4638f66748d4e28fbd111e5e0f182a694
+DIST kcron-17.12.2.tar.xz 1054808 BLAKE2B fc71cf2370e2cd3fe26268213e81f0f922b71c862b09ec39326107520848f1223594d471eda37ed4b4faf988f2eeb012795d94e6a7503dbb22bf69caf0ca7204 SHA512 6dde1722c8e490fce200ad6793d149b93722bc93a8492487b61c6297dd811a321da0d57c22594aeebfa48decd9d4378fd5a832514c41c94bae0a48e1fddfffee
 EBUILD kcron-17.08.3.ebuild 559 BLAKE2B beef6ae83f205521402d68f19ab15b21eda3ef861898d7802328d930599e6fc9bbae3e02fd531692e3a81cf76b292d50f2342920fc48dad38a72fb54a54b0e17 SHA512 e07ac5a2b342a53c366724296d446c9321170ed2a048e28f4195e73625dbaa33f94b5f76f3f92ec1e6c18573321b25d457cf52afccb12e15dd57c0aa0fc6aba0
-EBUILD kcron-17.12.1.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
+EBUILD kcron-17.12.2.ebuild 561 BLAKE2B 78a41d26a37cc0faa24fb78f2248dee0a1b4ece7172155e74cec967d582805c9da6e3349e533b089589ac4acf750c3e1b923a87db9fda9cffbdcadddcb7a0cee SHA512 1e34d2a8bdf8e7a509e3cbf4f636fb4c272ca615c5feabffb354547ad56f6170b54b0f72d13945bf487a4866ff2f6af5ba13a13e93000bbe9e7dc65880a5d81f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-17.12.1.ebuild b/kde-apps/kcron/kcron-17.12.2.ebuild
index eb1f317ce6db..eb1f317ce6db 100644
--- a/kde-apps/kcron/kcron-17.12.1.ebuild
+++ b/kde-apps/kcron/kcron-17.12.2.ebuild
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index 7b6ee12e98b2..c6d8afda6695 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-17.08.3.tar.xz 37856 BLAKE2B 3060c76de7a286ed71468a961e887f7b1c31b7beb511485495cd862e5d7d06ce7bc3d5661b48f97dea481883eaca82eece8f339b742fa5c9fb4d13f265c1507e SHA512 07b39b5d9472041600d11711b861c532af3882e6c554346c58e5fb5d1a3ed79fee44ad1b9e3076acad55ae98b81d0a580f81ca2e2bf5d7caf7677f5e2b02b706
-DIST kdav-17.12.1.tar.xz 37800 BLAKE2B 65798befca6e13e99a13c3e874c1ad59538417a0c604644bd2b2f96b4484cd66da747d23ff7a813a27eb898ba455da66c9b45e2d02c4ef9075f6d3582c9cdaf7 SHA512 2e63a6992dfc9dd8d9695e831a417b0c1386a83f6bbec8744318db614104c9ab6b9560ed5c8fa19ed7711a5057fabba5917e2a05d23fb4f6d3b15590e1844c3c
+DIST kdav-17.12.2.tar.xz 37792 BLAKE2B fff198f5bb226157f9fb4c389d48833908ac08d508f7827d5ba1e8dff834c81ac3e94f92c93e3ebfa9812e56a1792143372e14789f758c9956a71faf543b7db4 SHA512 8699db89d051ad701cf2d62460a29779c9be39b536b24b0c77e5f0c00d99e778952c84028f558a9ae9ae3bde42da981fbd1723ae6771db46e00b17348e846e73
 EBUILD kdav-17.08.3.ebuild 603 BLAKE2B b240641f40623aeb9b486301e409085696aae5101625b5e868310b6659d326619284580ad2c3023da618fe8a38e16b430d798f466f76f73625d140185f45c7e5 SHA512 848f3fb9a0e6c0f88cdc7b10b7d825fa15f77793220ca723c57450c282bf5ccc0b4963bebeeb6c80e65b49cfd2d1f9ad1a0d2775bf3fa8135576ce687742a607
-EBUILD kdav-17.12.1.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
+EBUILD kdav-17.12.2.ebuild 605 BLAKE2B 8bdcdf35534f2e0aacbbe4f73e502c54ff995a43c7888636386e519c049e6e9be7b1f07448e99efbb6a30296b7e06b1351c7b2e8d33068246bf3bdca8b6dcf12 SHA512 d3a37e5c4b1dd98412f1b713a408400cc2b697de00cc82b15afc25e2a432b9b2620f61d2067f64f5fddf8af2c1083ca777c4c2d5950bdf752dbcd0ce72404168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-17.12.1.ebuild b/kde-apps/kdav/kdav-17.12.2.ebuild
index 4c5706c9bda2..4c5706c9bda2 100644
--- a/kde-apps/kdav/kdav-17.12.1.ebuild
+++ b/kde-apps/kdav/kdav-17.12.2.ebuild
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 512141b4b957..8f4eba9ae017 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-17.08.3.ebuild 712 BLAKE2B 90622b5449159d050860fce6d4ebe8d8ef53e1c167aea664752efacc80a652bf5cf7a08d143d2d59134ff91666890b8d36c5b74c4972d8052792955d3d49905e SHA512 1e5de17cdab976198f54402cb9058f588facc2febc67bcf8bf6dd81e1881cbe2773259a3f22892568d8dd75b1613fbe2506cd5b23d4d0097f6359fc0280ff1d7
-EBUILD kde-apps-meta-17.12.1.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
+EBUILD kde-apps-meta-17.12.2.ebuild 714 BLAKE2B 32ffba5e5a2cade7fae5a2ee06ca245f813350412e257eea8517729c06acc1404f4fd50bec458fb5422c352d82e92765d7bf9752b86731f47b82f358cbc5963e SHA512 4840e2c4ac65f5b9688d6dccf69982716c01622179bad74db168bb9f8146efd2e7ba5729d14c7a360744d944394086fdb59315fd6074ae418b6fb530021b546b
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.2.ebuild
index e528dfd0deda..e528dfd0deda 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-17.12.1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-17.12.2.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index da3be66297b9..d776186eb48f 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-17.08.3.tar.xz 315072 BLAKE2B 586840c3d77958eef54b3bb2e7fcd951e65f464d012430da44b95195ffed10b4db9beedd76566bcc7222f941a4885a6332f2c72f16b983974bd1166d932792b2 SHA512 53bcd3c17a52fb51065708b5d55b0465b652719d0a8f087f41a139d7f4b120bdee01cb61de296edc4d275a053762445cc51253f20fd7cfbd723c861658ce6055
-DIST kde-dev-scripts-17.12.1.tar.xz 375864 BLAKE2B 1b56013514d77ef1c7e201d6a936d250cef7f340cc95ddaeba3e7a31608d089425f5b286439688e3239d069d9700bacc5c05bd97106db2b0508ae92ec94bfafe SHA512 04c85b1569791349ccd4eeb385f0d77cce6eebb0419adb968fdc63bf5ef491e6848ce3275d6da970a7022f790bfb9a172afac475693f1cec77eeba263bb75987
+DIST kde-dev-scripts-17.12.2.tar.xz 375880 BLAKE2B 42083a56c01a6abb5f655c7eb1cd09e95486c1b5e627b777fa98326013b0b52b59d196eeb3ea10082deeb8172511a284d564a67f6474ee7b94c2a5aaee8e21e1 SHA512 f19968dad9fa79300d7bba7987bdde92fba8e7e4e51b9cc093341673a7d37f39f72f9faccaa99907dba7443422e94e178719f1f71f4239a72164e0e155146d46
 EBUILD kde-dev-scripts-17.08.3.ebuild 557 BLAKE2B 859db3a3907eb8dca41f03dbc258ca0341f1f38654d1af083e469ab388d99a952164a72c5e1237f298d0cde77daa6b72e98c26bca8f4d3c2e2a59e1d78d92906 SHA512 fbd85b2edb6957e1837dcaf58ce8c34362963f09337444b55fa75887ee660d616a33ff62dc2fd89e24143dab268af917db57f5a92e285f1a3e2a778dbc6733d3
-EBUILD kde-dev-scripts-17.12.1.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
+EBUILD kde-dev-scripts-17.12.2.ebuild 580 BLAKE2B 368809e818a99848f0a705ef0eec0939a7277e0e7a1606ca239b230fc3f629ef5b737089ceefb693a8adc931ea318f2cab4713a49a4629d90563303d4cc6ec9b SHA512 cefe74b979f7a9d9f13b9a2057a7b46a726626968f70845a818c2f7191d327915ff1e016cfb52df598e72b15ecdb48c1910b977c46981f61a135437e89a52d75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.2.ebuild
index 8f878b4fe584..8f878b4fe584 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.1.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.12.2.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 4238ef29ad42..65ea1cd77db1 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-17.08.3.tar.xz 59156 BLAKE2B acb9960b82f31f0dda4b79786516aa617b0fd72a59bd4ead4e747eb2be90a01f9e9fdf33c11bef1a9d84d4c611856ac6a94eaf95a9ddb11592ebf4e6044c1e0b SHA512 ce44b082a572c86cb65ed745dffe53d282678327df41023e52aa7e1f50f007db286ba5ab37d2a99fa823a312e422dfbf3d40a412f8d98ad64a2e6e7499553113
-DIST kde-dev-utils-17.12.1.tar.xz 61060 BLAKE2B 29eaa0b205781da783ae858bf92e793b03b62ded1c40259e3c68d903982222289ba6a5f4d3174874acfa0113e81e93f550d9330cb4c9ba29084c829a9bf8e853 SHA512 e3f76adbe43c4c2a9646bd46c7d65e7b5decea9a2caceee362e8327fb6e4b51573e5cec01fc3032e92dc8a7b64355e8d2aa22c5ae0536eca5bbf1f0f7ebdfc28
+DIST kde-dev-utils-17.12.2.tar.xz 61076 BLAKE2B 1a384f72fed47a372a17daed7cc9dbb6be67403b6352cc44f8fdad68f7e11d7514c262ad17c07b958c3ff9b68657c15161bb1e1cce35dbfa99306e1810ae2831 SHA512 f2292a29e14fdc4024c77c3fe07ffde2ca0428bfde6af5a6c698429609ba9a688bfac2c405580e86fb6a4e66769a9b257c5f19dd10d35180fb75e83dd32339cd
 EBUILD kde-dev-utils-17.08.3.ebuild 646 BLAKE2B 9b208add8c2c25a66ef52bd5cc9cb7a71d9ca290a2488752f0bb4e78697fec198990f348e04e77c28c7f406b93da380fc5f6d54db872fdc5b9968dc8ba8ec488 SHA512 1173ff6b8c95de095696a4b770a03981410316b3b94bc39db2555c01b69852f1de9046f54a3cbec75f8bd1db2b78450e7caf8d872a1112393fd079de72c3a6e8
-EBUILD kde-dev-utils-17.12.1.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
+EBUILD kde-dev-utils-17.12.2.ebuild 648 BLAKE2B 19217c351ecc0af8fa5caa88cdd12ca5ab246208a3b9a62d6fd414ada8b526da1fe805722096f977ccad904650a88cbe1dd04c0aeb5d8097d0d5c83dfc9f78dd SHA512 855dfc8e3a1cff2a81a73c1e4dc2d346870d1324c16fae618ab05c3b4d9ca1834b2c5cda2498aab16a74bb07d8494fbed2f20445702944abbc1094f50bb3a29b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.2.ebuild
index fd428260d4a6..fd428260d4a6 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-17.12.1.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-17.12.2.ebuild
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index a6925554314b..93648054f1ec 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-17.08.3.ebuild 323 BLAKE2B f20e3cbb8d67900f627a252356e82e0155fae8bc56eb8538d7091fff077fe1f68c081a57fc49278ee8c9670d6e727c7adf91dc5638bb368d4664e7b13d41f0d3 SHA512 f458ccd9852d5a06ce01fcb9ae4168ef1e716a14532e8cd84a53f489b0c9f740d5dc1a8b548b89697086467cc355e5048c57ce3d492971b67c70e78395f04680
-EBUILD kde-meta-17.12.1.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
+EBUILD kde-meta-17.12.2.ebuild 325 BLAKE2B 7346e974fbc6478b6f5a4d315f22b039c298240fd295d8e2c3bc0dc8ef2588f4f33ebf7297a1dabdb6e13fb827d9c1492bcd92dfe33e801a32f6e20e383c1a53 SHA512 63388dfb92585daa39acb4edd10c0770ede4c944680b18d16b69a4bb0c3ad5faee718f232289ac517da14676780920ebc1a04cd2c3ea443dc4a1a4b6c62ad285
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-17.12.1.ebuild b/kde-apps/kde-meta/kde-meta-17.12.2.ebuild
index e986cfd70609..e986cfd70609 100644
--- a/kde-apps/kde-meta/kde-meta-17.12.1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-17.12.2.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 679086876ef9..60bfc0c24cb1 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-17.08.3.ebuild 503 BLAKE2B def9f8e3733788910cb7aa3ec2fa322e4df3a0bf5dc538e433acb2f54cb39e5fcf253ce02a09fee3cdcd7d661f0deeccdd69b75d3ebcccefecdd0c71146237c8 SHA512 f48746c98faec2549558d1c88bb4a88077ab24d3ebffc8e8ca1bfcea43d5cc150953ef0e2b177c0669b8de333ed6f39c8880dee6bef38bc05725b190473924a7
-EBUILD kdeaccessibility-meta-17.12.1.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
+EBUILD kdeaccessibility-meta-17.12.2.ebuild 358 BLAKE2B 3985014c80cb5c3bc775e122a8432bb1d2794d837d90178d49123fb6df37fb955f862956be9c41844e163344a317d2d0af46725e0cf5ef67f03daf84b14244ec SHA512 6440329116502f8f4e04a34737579fe3ba91a9fc9fdc8dc45ee37bbab585ba0086876cdde4a326c323ec8b5a791fe6a045bdb349d210d79289507bc6d84b016c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.2.ebuild
index f9f04c8582be..f9f04c8582be 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.1.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.12.2.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index f0194f93a28d..1f9e188900eb 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-17.08.3.ebuild 346 BLAKE2B 32e1d3349fdc87a7c05359ba7074646a8366ee6166e2b029474cac32344674dc452a32048919e429a491b6c5dab5ca758ad1d63f58b848f81b78a93bc09859ae SHA512 0770f04b564530b32fb51cf92c4ccd98d1cdab217dc5cb2a384768489b5d493082d70aef016f0c69ce372d320fc873f35316db21da5917465e3e2aed5ca09d10
-EBUILD kdeadmin-meta-17.12.1.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
+EBUILD kdeadmin-meta-17.12.2.ebuild 348 BLAKE2B 219e53eaea47534f1da3284a67db0b3b3276d66f17a503e2f63fea13a4488549c0e87d8edf2ac54ee0fe210db5b6f66c3cd1b77695848e674b8707a407d09eea SHA512 2b0e1bb6625ea97eb83d074ffdd7d824a45a3fb8cf5b629447122cf7bc4b3d9e2bf99b56095c75a7df1313588007cf8e273785096efa5f6914b0d2742293cf0e
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.2.ebuild
index d87b170fdc44..d87b170fdc44 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.1.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.12.2.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index 5497e026a807..367d38cf2547 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-17.08.3.ebuild 327 BLAKE2B acd82c827b3e0c629d4fd1b2a037f92bc996a4664b5fe3540ae77e8975118caecda6b754de52ee481f6df0f7807ae388bb5c847d6c120725d2c020aa6f1bf05b SHA512 038909e0068c8fb6ffefded7c1c1bd682836d4e0d35c6c2685b7c8c20064b33b2cbbaae62aa238b79eba68fc36a3eba7d68985a67dd937b6c3fd11e4061c47a0
-EBUILD kdebase-meta-17.12.1.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
+EBUILD kdebase-meta-17.12.2.ebuild 329 BLAKE2B 304a36e03db7599e610c961bd51291db1a4540ba958c47788201a3a278bf2f3524dec8848e8af4c9d90a55f4150728af9b03d0785fec6642e57ff2f5b5252a20 SHA512 b96417b6b44a56cd3c46ee998588ad7b69ef99893435b7dfb58299c55383381c252541dd8df88ec08caf55cc9ed8878c8f953e5f5440bcb042a2380d54ac208a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-17.12.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-17.12.2.ebuild
index 37f06d26788d..37f06d26788d 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-17.12.1.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-17.12.2.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 536b362f7614..273800da55d6 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-17.08.3.tar.xz 47608 BLAKE2B 4576bd143a5c3210a68f7f40a11ad3cbabc782c9599e572f87c4d635eeb3749600c4ee945477c1850ff923979ec248279e3aed10223581e4e4a6c6a132cdae8c SHA512 4ef137527c16c57d8cde676c58be1eba7d150e60007e49ef11278b1df2ce88da92379aa19741123976326586557061fc486e1cd96b04072d9abb4781f0952325
-DIST kdebugsettings-17.12.1.tar.xz 48748 BLAKE2B 1fc244e4aaad517cabd423aee3957df8df1d619730e97c44a825b6210fb8de0d12365a9f15d650c2ce1095fcb08ed62b830838ecd17896a4a4de002f860f1eff SHA512 45068aad442b8a5169c2f2eb4643589b9dc94de72ac66f312dd33a28e7fbc55aa47b7e6ac64ed276d7f5b3ba2b4825e541a8f35552047c985052d1b201075861
+DIST kdebugsettings-17.12.2.tar.xz 48676 BLAKE2B d05747baf6aac59fc3866c54f924d2d2521cbb262ac6ef8eeabd329c1f7c73a519b13738af9f2b589dba5acc34d655469cf913eff92602fe913b649d7035139b SHA512 9bef6d74bd87750bd25044891afc837505527c9be037ec2c350f9d2f813d15013761649e72ce7591c64efc55244abf338015cc0720470f1c76aaf42541e62806
 EBUILD kdebugsettings-17.08.3.ebuild 595 BLAKE2B 3148e3fc838c209d805bf1784af89502a5212575c9ed4c726e53d2d52c4e92747899695b99338317c6d31823ef79e87de93e45eaca7a85a627e13e1cb69bd330 SHA512 058a78d3f9e2086b8e43b229cd098a1414021eaf8c41bceb40ddf1296d3c81aca770aa004626e7cc2faee6792a7463da2e33367eab5076abc600f7f117738dbe
-EBUILD kdebugsettings-17.12.1.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
+EBUILD kdebugsettings-17.12.2.ebuild 597 BLAKE2B 7979b21e081fbc1dbc93f1108c882910f664af089d6190ef64caed247becf80201fa9190e312557a394fa5f75d8bae8d0187ae6c2ca365870476037291de37e1 SHA512 a3a45ae47890268b8249159f501cecec3df5b6764123cd48ecf90d3fcdad9a5f8f62482f5cb5bb8fdad41550bfded040ec829fe710aad5afea3f618e74adfabc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-17.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-17.12.2.ebuild
index e53b5a97cb69..e53b5a97cb69 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-17.12.1.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-17.12.2.ebuild
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 04c4155af0b9..90df7cbcf5b2 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-17.08.3.ebuild 539 BLAKE2B ad34b0c4ea24c811fa6bb7b06d5ec130c7d86901c5249d17891a324157199a9177cddd5c1ebd931f16389a8c972d98a120712f55971feb4e9222ba5e74452e6c SHA512 3e3f95d0abaa24cd31a3e6def56e70aa4c5ad42ec0d237087503aa81f953c40bd1e2801170203d2fa2571438800207da732e1a5f88bb0e8c5cad91fb7f111b5a
-EBUILD kdecore-meta-17.12.1.ebuild 541 BLAKE2B 1649d298ac26bc6d3091dee711adf0aa737baf602c4290ee7a1000c37674b5170db4658af5e043bf95959eb4319522a2f65149b94f22b74e43f01cddf9754971 SHA512 995f4c80ccc6189bd4b9cf33ed88952b81dc0e9a9a1e4991e409521ac675b23ae51d0ecaf04b5503fc19151125466d64ceed6b52eb828f51f65e7050e8dbfa7a
+EBUILD kdecore-meta-17.12.2.ebuild 541 BLAKE2B 1649d298ac26bc6d3091dee711adf0aa737baf602c4290ee7a1000c37674b5170db4658af5e043bf95959eb4319522a2f65149b94f22b74e43f01cddf9754971 SHA512 995f4c80ccc6189bd4b9cf33ed88952b81dc0e9a9a1e4991e409521ac675b23ae51d0ecaf04b5503fc19151125466d64ceed6b52eb828f51f65e7050e8dbfa7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.12.2.ebuild
index bc5250ecc206..bc5250ecc206 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-17.12.1.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-17.12.2.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index af88b4fc74e7..3a9bef9e40c1 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-17.08.3.tar.xz 327840 BLAKE2B db72afa12ae1b66b259f6c2267a5d5fb336b010c21e27e0f74a4fa2f368b41208028ee7fb2bf96ccbabd341b9ca264e2d4f240d72b89baf878c17bc3f6cf77a0 SHA512 f90657e46aa547c5faeaff71fe37498317ad30eb51ec1cf2de57c64f7713f4519a2991be343b6b54ba5cf0572ba598784b3b34f2355b8f2fae8343b2e5c2476f
-DIST kdeedu-data-17.12.1.tar.xz 327484 BLAKE2B e7252d0340d321f9c807ef5ddc66f4439e679376bd83c4298affaed80767aa087b0eeb182f6958ca5e8864d06644bf25fbc9a3aeb1de3d1217f4b91a4e5c8043 SHA512 514e0c0bb7e26e9ebb79d35feafec986a409e05ef2d567e6b21d340893ca4e8429e6ddc4cecea8b41c860ee0378bb17e3a249ca2ac6169d7377a736bc5d5625b
+DIST kdeedu-data-17.12.2.tar.xz 327852 BLAKE2B c5b98839fb94e2a21cf8c96a4937a539cf605814c48abe3d895afb9efe6780351cb7986f20c1a6ec822622aa653d3993903c15cdeb62bd0347d05358bb92dbf6 SHA512 17921648c7753b4d46e8b40f7c01c9163baa41b9d2adc488ff4e5114c2464492e95999e521a238b2d4d998e1b297617883b237ef3c9faa8ae9945d13d75e3c7d
 EBUILD kdeedu-data-17.08.3.ebuild 410 BLAKE2B 93fe9cb8626fc9c40d9e4e61d4a03e0eda2459c5b6661b075f107a02a6dba759a35a5da18f7fbcb933d5d5a1a4059997d82bb1ba526c2378224d886a2a6fae10 SHA512 2c441b1c9bec231281d8421d698de75389ec86c81c59e64fbb967188d6f71290fcf7fbfa2bab284ec2ff7d54bf44720e486ddbb8bb82f738083b68268ce3bc81
-EBUILD kdeedu-data-17.12.1.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
+EBUILD kdeedu-data-17.12.2.ebuild 412 BLAKE2B e3fb9aa2e25a9e485228fc3732618b52bdad72b4929c66c39128f4b3891d30760c95811744dba4fd2656d338201a9a5521e41a222607583fd14112786cad1f18 SHA512 8ab82ea007618d9ace59963319bdcf2cd58ac0e4be9bbbe6027348b357b032ad94f311051e73674931ff27f2f295c9d9b198d2aca6520c0089269c404a0a81b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-17.12.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-17.12.2.ebuild
index 0209c5857d99..0209c5857d99 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-17.12.1.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-17.12.2.ebuild
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 847c248c1797..1f77ef2bbb2e 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-17.08.3.ebuild 1042 BLAKE2B 793b9f981b52bf639d5d28d24af516a7c5404166e0d4376b5c75d44ee4a78e28bc8c813d732abc80fe3af3bd45867041e10a1c628c72febefdde19faa225ff49 SHA512 fa829dbb81b38014d4df242c600f1e25ac86e80059fc85100bfa72455c131f94246005f82a9c86106d23218772337d0bfffc201d726eedd8223bfb6bc6618319
-EBUILD kdeedu-meta-17.12.1.ebuild 1017 BLAKE2B cb41e7b402027cd2fd455167d215535339a430f8ebf28bebd5f3461cd4260d91d7da9469e1b92af9d725cfd6a6699d8b7cdad7bd91cb0e8072c2ca1a82afef7b SHA512 505e04b53185a81498d8c1de9c8b259922e74fd04955f8c3cd21f2bcd7ceeaed1fba1c42c53287023f69c2bcb1438f51fcea7c5987ced440d40eb7ac818554d1
+EBUILD kdeedu-meta-17.12.2.ebuild 1017 BLAKE2B cb41e7b402027cd2fd455167d215535339a430f8ebf28bebd5f3461cd4260d91d7da9469e1b92af9d725cfd6a6699d8b7cdad7bd91cb0e8072c2ca1a82afef7b SHA512 505e04b53185a81498d8c1de9c8b259922e74fd04955f8c3cd21f2bcd7ceeaed1fba1c42c53287023f69c2bcb1438f51fcea7c5987ced440d40eb7ac818554d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.2.ebuild
index 5dea5c430d3d..5dea5c430d3d 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-17.12.1.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-17.12.2.ebuild
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index b3eced86fde4..48757a3fd410 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-17.08.3.ebuild 1662 BLAKE2B e04236092a272a2e1f5a672001b177eaa002af9c470b4500a15baa8ab6bcc3d372d740cf104edabaf55027a7d7c7c3af248d5a9b16fb2eb82420b08588f3d1ef SHA512 9ff8a6606774e1eb0d29c90380843566d226ce607e253a05c06a1af54badc7e00ba79691bed229315965b5485b8b40f0a97b593654462b793ac2e1449e9158ad
-EBUILD kdegames-meta-17.12.1.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
+EBUILD kdegames-meta-17.12.2.ebuild 1514 BLAKE2B b5f13b6b671b8483ded53326d23b88a51c2e978703850dad408c3b4be3d3fc8b31ff5bf5245096f11b64d2800575a8a2aa332853bc8c5a1f2d4a21a908e7ecba SHA512 2ffcb6c7d05731b990f2c1206b45470c03dd7306e8598725fc4c56602f53a5a13c5a5eacebe5fc4595433e94610cbdbd6c22ba1b103cc0ecb2e0d727ac5d54f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.12.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.12.2.ebuild
index 85eb713ba0f4..85eb713ba0f4 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-17.12.1.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-17.12.2.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 1929a5a12238..108e3d983d92 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-17.08.3.ebuild 765 BLAKE2B 50833565f18ef2ace1543407edb5bdfad32c56a920a4d3e3d6f28bced87b680afaf2854f8170334ca7660048d94fb9a41122c27d478ecd2c0e230ee9d34039c3 SHA512 fa3f080116ba26cab77803acaabd3f0ee4a4aaf25ea975222c5edb7b19e48e60bd501f6380fd98fb502d934d34b39298cdfde05336f6e07252647473a9c2d91a
-EBUILD kdegraphics-meta-17.12.1.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
+EBUILD kdegraphics-meta-17.12.2.ebuild 767 BLAKE2B 9164daff434ae0899b3062ddb99474410f11b27ffadecdc0e7b284092f9815ea0fa7a50b114fbcb2e531aa759ccccbeabbc4a4ccc236c00658cf5fa35c1203f1 SHA512 306603582c97ba1add3cba677bc33c58a6e3ba6988f5769c36b63b059f3b3beb98d0267b5e117ddf133d7033900119938300d102858a0478bb9c95def3d0689b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.2.ebuild
index bff71a679d37..bff71a679d37 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.1.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.12.2.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 0282c39ac4db..ffb2f7133890 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-17.08.3.tar.xz 13440 BLAKE2B e8d9bbe8e17b54ef82bee84b0c1c59f570f0fd9ddd206ad8f3d399d9e148e0dec2910ce6a6a597e3e3df5265428e4e9432d6772f3334a6345a3d70fd9b27a228 SHA512 71fb97d159963c817c0c898f3c8e6aa05b37ad91f2f95f2e967aee624a8a747cb870dac273aabcafe090f66293dc1f0083617a0587a08ec41923d689f317a3cf
-DIST kdegraphics-mobipocket-17.12.1.tar.xz 13432 BLAKE2B 3ca30f450e75c6adeb47f464a5d79b89a0cdf1ed4af9942be6bf4ae3f077b7c34f12eb5c58490ada28988bfc61d7e56bba21806539660a3087dc63d47675196d SHA512 6606e9a6fefb9f9d3972e34e44150cca2b0a3a124bdc3de20accfcf1f8fa873cfd9d77526498a821812effb94ca5a5e1e23052a49227c408bbbf203247ed976a
+DIST kdegraphics-mobipocket-17.12.2.tar.xz 13440 BLAKE2B 752d8291152fb9e1b717f6f77058bba55ec507a9c93eda363206f3e9d8c527edce02c5682fa5cdb303dbd6878807fcbf07eae68379e7877f6dd5d1243bb8b60c SHA512 da4af81ecbe1821bd96445cdb2881f146e0719e0573a01fe05f542c9fab84ff378d40f801a99126f43a45e37c2d277f4b836ea5994e6d15edbb47caed094cd60
 EBUILD kdegraphics-mobipocket-17.08.3.ebuild 422 BLAKE2B 74cc416d5c8c6ab2786d029eb92b64398ace3cf7a0ab3c4516bd45ee08c6c6204383b9cf6c6f43623690dbe7cfe9b6808ec84594d3813182dc1aa3dcdd29b873 SHA512 05cc7d81e16a98b1de34110678595a3a027a30c05bd209ae172014a5c630781bc713fbd89d7dd2a282e222980169b9e28004fbf24d5235ad93305489c8f6f9d2
-EBUILD kdegraphics-mobipocket-17.12.1.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
+EBUILD kdegraphics-mobipocket-17.12.2.ebuild 424 BLAKE2B 410d921f6cd5cea5db6e26634bb6a07d04c757e4f2497129722b1d4fa910189622fa90d4559aeee5e24bc097d77dc84401a9a307219b66937dd223f684ca67fb SHA512 5b3be652468b0003802063c8f6fe0da42d41dfc4fee9d0fb21ac0d39e346bff441e38b3cfb24b398d58c830fdf5fa6cc9d9aece1bae53cad4c6951316c33d600
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.2.ebuild
index ec101c11b41e..ec101c11b41e 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.1.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.12.2.ebuild
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 60fd6d864784..785a3457ee57 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-17.08.3.ebuild 831 BLAKE2B 6e255c70501d8b9b33e2575f68060fee6313e1f8e3f4845614fedd31f61c380219ed92cd8e4a83d9df7b20d8c2283c5e90af683da536258d174d09e126693e37 SHA512 5ef408e03cf49a660e07d73155e1c7623752c5032211f68d034cd7b7849c5a93d98b7b6d1afe2a01b8d3ae1f5c547366d2b806f9fcb8dde46384d30b118ee554
-EBUILD kdemultimedia-meta-17.12.1.ebuild 685 BLAKE2B 86449e33c46e8e9e1281c1db3e15850b6d4d63f814121c52f22e794f40b2f6f8cf7a80a8496f7bbb03a7996c757d72a609fba7611f52ec0cf51b2f24f112af64 SHA512 1b0bd9a22fb04c04486a59b1c7e460efc0289c0fc0ef4b4bbbf767c55b492f797bb701a30ddb1bd82e1f3fcf677d9e71c5966506dea36e41c6c37dfcf449d585
+EBUILD kdemultimedia-meta-17.12.2.ebuild 685 BLAKE2B 86449e33c46e8e9e1281c1db3e15850b6d4d63f814121c52f22e794f40b2f6f8cf7a80a8496f7bbb03a7996c757d72a609fba7611f52ec0cf51b2f24f112af64 SHA512 1b0bd9a22fb04c04486a59b1c7e460efc0289c0fc0ef4b4bbbf767c55b492f797bb701a30ddb1bd82e1f3fcf677d9e71c5966506dea36e41c6c37dfcf449d585
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.2.ebuild
index 55c79e33e88d..55c79e33e88d 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.1.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.12.2.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index b8d37315b9fa..9194ec64b06d 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-17.08.3.tar.xz 323608 BLAKE2B 2abe40624c9fd454638f43bc414eae3df5184aa7b965cc2c78933855a72b2efd83541b24b3703ce2ecd50a74b3ca0d2acc81dc4e550e82c358abbeaaa6bb2726 SHA512 8d29059acfaccdac6e67521b619e352d383dc37a0f668a0499b9574910464aa6ee89129c442689ae600be8aa4916f56e52168969c7774504818c84fd56a1658a
-DIST kdenetwork-filesharing-17.12.1.tar.xz 323548 BLAKE2B 081cdfa40978a19f8b897cd2a173779031d681f1aedf508a45e79b7ab2f7e76690dbf1837c24f78f6098b594d602b60babda4278a886511a61019d0da4f116aa SHA512 657eaa81b6f6b11b53329e7924ce8937b08faecca568b2f896f0e52d7c1fab8c921a2e080aa3e6daf934ac877537db485b52bcc68e0089f35ed7aa3f97d5cf46
+DIST kdenetwork-filesharing-17.12.2.tar.xz 323552 BLAKE2B 133114bfd13ce74877837f0c5638640fa35181a641c4c78222906f5ab690b8b43b39ef226860078e8c94c9f7a253714176c0a76df93f48b2de55167807cfeb04 SHA512 1d4f33580c42f23ba005a35b91002baa82ec8b487c8f56fbf36610606b28392fd33efecb5d9c3d4f577f0a5932a2b4578e9601eb110f096af80a659cd53540a4
 EBUILD kdenetwork-filesharing-17.08.3.ebuild 572 BLAKE2B 17f26aac125edf3c4cb70d9533416c8ddf8dc61087a79008e2480be5988573666c401d78d5a1b07fb29299e0bd6d8e2d6e739c32f16f34674796d17f94831f2d SHA512 b43a49627b6fc97fba3479b53b754afb25fb4fe8f31d0a4e83328b52b340799c6835d7147aaccc5af624f4bc2923fef7c97b45e06418d747d36ffe5f77b8a637
-EBUILD kdenetwork-filesharing-17.12.1.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
+EBUILD kdenetwork-filesharing-17.12.2.ebuild 574 BLAKE2B 62863974d57cf0fb799937edaedb2db6df3b483e1d803a7388fb3c24348837e264018608468ec9ef379d937dcf7f7a66476a647c15da43283c0bca9a580c5c43 SHA512 0acb6b4093aa0eaf193db4578e51f94ecad8ebc79ddabe531816c0f80cc245cc74aa51e0347d1c5f33c8db5d6abe9501a0ec51b01b9aab77744e89bdaad265aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.2.ebuild
index 13f47494f491..13f47494f491 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.1.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.12.2.ebuild
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 6e4cb40b3607..fe0a64511881 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-17.08.3.ebuild 607 BLAKE2B 08d1aefaf55685c75e85e0a6c0a3bac88cb33ef209c7c83543f81c65393b6cd835e641b550bc3737071308f90a359e69450718151d8103f6607774d3b32c48ee SHA512 24f363011b29f22a48d24abf118e243c87cdf4f3e0dec0ecb33fe99feebee2fe69006ee27e92912e9b2d6ce3c406aa3961546bf69321f0319e474d05798dd389
-EBUILD kdenetwork-meta-17.12.1.ebuild 461 BLAKE2B 5779c1d555b4aa99209bace11c6dd3529d0f051cd8dac787c7ab4d20ee77b3576b2ea7687662e6c4f396fd0d562c0c94874f762a04e1e5317c6981a1a90cfc29 SHA512 4e68bf920583098ea00750d475be0f96b5cd1fb9c960277779f99edbda825933ba93b828c00584d1848dfde54715a1eb2f9a1604aaefe9a632735ed62001e3e5
+EBUILD kdenetwork-meta-17.12.2.ebuild 461 BLAKE2B 5779c1d555b4aa99209bace11c6dd3529d0f051cd8dac787c7ab4d20ee77b3576b2ea7687662e6c4f396fd0d562c0c94874f762a04e1e5317c6981a1a90cfc29 SHA512 4e68bf920583098ea00750d475be0f96b5cd1fb9c960277779f99edbda825933ba93b828c00584d1848dfde54715a1eb2f9a1604aaefe9a632735ed62001e3e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.2.ebuild
index d82d8d4c3853..d82d8d4c3853 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.12.2.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index e3d48637714b..1800c7b7706a 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-17.08.3.tar.xz 9372560 BLAKE2B 7a7378b7530e4dd0ef98be285f3244ef05ba316cde631c2f2935f50d81fcd04c8b37c3fefb941513f664d8e503ca601dcf45695c8ca136d4e61a05cd42a616e2 SHA512 6ab18d380dec19d82824e461d9cfc345cc82790efc93d6608472c6dea26e5392a143b8fb2185dd69802133479994d9899b4bb400b92ba2de0473bf7bd48c0575
-DIST kdenlive-17.12.1.tar.xz 9389160 BLAKE2B 785b57a0dcf5441c5b806101e59592a1ac724b581e9cb72bbda19f57209b5a2cf8f412f0c023082f43f0b410b7b7dd5ac810248f0933cc92b9c4e8d83608fa67 SHA512 09a467f2d00c142e4dc98d8902cf8f65871b3dcb4e59c3f3436207586182160a47d27e8e59e021c08c5ee544a47668a78d850028e32f46184538285e4b163e60
+DIST kdenlive-17.12.2.tar.xz 9381516 BLAKE2B 45d94e0a83467f051500be4a7542df8aa8e77defe9fba5dce6247ce6b95f36acbaccdfd9f55a3fa8f0ee232ce3a31052f541a7c1cf6d659897152fd15c33a6b6 SHA512 7a70ba8de9b034cabd6ce4fc6b92b01b57994327bab35e3410110b1d3dbe88fcae586a3f0ee82b387a205503b5853a3471c72d6c94bb6b0e9d5b96d7db24ecf0
 EBUILD kdenlive-17.08.3.ebuild 2087 BLAKE2B bfe2559334b875ae082270aa176adb3600c3e22fa531c9ce20919e251b310473bb44f496cacbfc1ea04d307d265e399f06003e6184e670e241ca2a9a3043c3ca SHA512 55424c3fd8cc859b43fc89f8f547d110f418e59a4a9022f114d4097b7d1d24fafa59bc3b38f03d281202a01a6a6c1cd14346d7db66ef32f0bbd70391bcb46406
-EBUILD kdenlive-17.12.1.ebuild 2089 BLAKE2B cd31ddba4ba736b03dfe087324382776d841c8681dec6f4650c5bb7c8ab7d46f31e615e7d926a32f37303ae035f99f2d12d1afc29f66fceb503bdbef2e53aed1 SHA512 7880cfc5862cc18c2ccb309fff4fec3f85bfcff3ba80ffb8123650e589b0406973f810e8262a5cd15fca50cc2e0043a2b734e061d8c07441c027b673dd8f9ab6
+EBUILD kdenlive-17.12.2.ebuild 2089 BLAKE2B cd31ddba4ba736b03dfe087324382776d841c8681dec6f4650c5bb7c8ab7d46f31e615e7d926a32f37303ae035f99f2d12d1afc29f66fceb503bdbef2e53aed1 SHA512 7880cfc5862cc18c2ccb309fff4fec3f85bfcff3ba80ffb8123650e589b0406973f810e8262a5cd15fca50cc2e0043a2b734e061d8c07441c027b673dd8f9ab6
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/kdenlive-17.12.1.ebuild b/kde-apps/kdenlive/kdenlive-17.12.2.ebuild
index ba7f9f054d6f..ba7f9f054d6f 100644
--- a/kde-apps/kdenlive/kdenlive-17.12.1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-17.12.2.ebuild
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index e7405ec3255e..3cde1e0963e6 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-17.08.3.tar.xz 1922800 BLAKE2B e447a79571e476d68e221d3d1971bfb3ab5437246339462697ac9b748072f0d6836c025197a6aa642086b233ae43f014bd75dbb16d0a207c7b6f928a8117d5ca SHA512 e9411aae9fe401bff73b8bb4c947d1bf8e405760c51479a12a407171dff27081195552204b353da2f555a8c8960f3860bb03f0fa73ba7762a7d36770e209a721
-DIST kdepim-addons-17.12.1.tar.xz 2038708 BLAKE2B a726200cd5329812e39f2d1b9dbdcd87d7eb63a75461003a85399f8f7fcc40b9489f7837bdf1cfcac0b256730002826fa037fb1338c34fda546242dca9681c8f SHA512 695da11ff7145de546141d121558fdc8b4c8f33f8f056a7fcfc8ef8c10f42145d6516d5c8e9eb000f36aeb479695b151e94a9563fd49df4dd4f8dd883f245b07
-EBUILD kdepim-addons-17.08.3.ebuild 2199 BLAKE2B 9faafbbd5c16b440f54bbc98f58fdbd82954b12ac7355d8ea2636b66c73c04b9f7fb0b6d44c3af8e17f3737b605830f1963be82812c6c1971a2ef830c9f51732 SHA512 ceea1d39c949bec7ccaaaa204a7461b3c45fbe8c90bfc1f45d0ed10a01e1f85702f2d87ff4ccba95022a09d741c9f8ef042fbd08924a9f5dbeca849d10b1f42e
-EBUILD kdepim-addons-17.12.1.ebuild 2222 BLAKE2B 908c45a6cdcaf20275fef168a0f20b4a0ce532f61d3c3b83a8c7a0be3350a3a1c18fe0ce3fe4571fb21747f7f98d41487a7d2dd670148ad3024106dded0840f8 SHA512 2ffba050839edb3008f939484feabc5773d6d6355433092865a528f98c7029f4092fa5524c6953941a57cddf8d3d73fdc4954fb12a129e1e797afb3d846e949d
+DIST kdepim-addons-17.12.2.tar.xz 2039160 BLAKE2B 1004ef17c46000e2b7385e4213efbd9afa85f8a739848aaf2ac828b5c09b25b38063d924b47581d201bbf7da990e44f81a16ee8a8b54421645a2dfa43e3dbc07 SHA512 3caceb92bc549d91d1201f711539317ccdfd7160669eed2a94b67df474b6cc760a31dad682d0ef0429926e4c7a43acf822d2b7b72535194567d6efe2a1037ee3
+EBUILD kdepim-addons-17.08.3.ebuild 2233 BLAKE2B 8e426663be1daf0f77ea16a1de7a87c0511e50c5994e511817869b08d5724be7fa27ee194c6c7b6915100767d3134922f039f5c16fc3ca5024078817d9983e86 SHA512 884a729f91147a7cda1504b1ddbb58d66cf109de91480479c655ced2dfe7228ece0dd79526b624fd2ec05c4c595293b92059749f111890e3aac934cad8efda73
+EBUILD kdepim-addons-17.12.2.ebuild 2256 BLAKE2B 0489fec6b17fdb1d163e974a1fada3fe8f8e7636e40cda74dd79c14c0d881a160f52890e478add42be02f13424507574372db60973705b5937a983e7ae2aed6a SHA512 e5a7ea05a5ed21b8e3bdd2ead32a03ba87f249b0c9ac43eb0b14664d6fe7203c44f438ee9138438b96df6c7a6385521d99fe92253aa6cbd36c8aaa75db314d62
 MISC metadata.xml 378 BLAKE2B 9ff4bb4cba46c784e2664d026e71aa42bd2bc3336e5107d9476fb13aa57646b06a21890047e2ce763223d1c359c161f701148d58df6c2afc32c18112a6e5942f SHA512 6a36925cdc8648716b5b3c6574f544b5dbe2bcd656a2594930a8d5d9b2600bc3a9c98801221191a2c308c5d05716d48859b381dc6c0343ab6894b8c704280701
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.08.3.ebuild
index 93f0f9b4f458..797b7e9cc4c1 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-17.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.08.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
@@ -78,7 +78,7 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version "kde-misc/kregexpeditor" ; then
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
 		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
 	fi
 }
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild
deleted file mode 100644
index 59efd035a720..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-17.12.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="importwizard"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.12.2.ebuild
new file mode 100644
index 000000000000..5a11e4f931dd
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.12.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="importwizard"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 3f5f73417ed7..1dfe5892bc2c 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-17.08.3.tar.xz 73116 BLAKE2B 343761fb6f5e2d45a99fd8d8f5115297bbab06bc51642215d23249a1f29a550d7ccb6ce33e749841ec87da797a039b317d308f7a00143348b5511cf3184c1cc3 SHA512 0f4619396b8f1011acb61fa0b5531440995933baae60e1629452f1bd915accce7dd9487123074ed0c1cb6b06de311f04ce85eb4ad9c242d13b181b8cd1876856
-DIST kdepim-apps-libs-17.12.1.tar.xz 72956 BLAKE2B cd07bf4765fc4171e0c180a5aaeb8c25cde58383762b4c521aaa40cc64c64d128facc749356f0c420b9fad10e5dd9631a4230fbe97396912a2276a6d35cc490f SHA512 ee9378b3ef951b5bc8bc0b00f2659ed4c6f302c1f10e991233552ab28b497a3cc4678f40ce19786c88a5ec26025a8ed9f76a8fb22f897526bb99136e5a8f986d
+DIST kdepim-apps-libs-17.12.2.tar.xz 72976 BLAKE2B 756d8e91ab7c2f0c1812acfe56f3e2268a6186627eb5ecc4f04983b1880ecb0d49e7368ce16c23a61d62dca6e6f3ac6eae345ced0edef8b770863d67f7050a03 SHA512 9f23268411a11557d61293a419e37f46bf4388515c9ade7a664772d05bd24e1cdbf5befcc3aaa8849b0696cb8d4a730ae1a5f19004c1c033c623f4700ed0afbf
 EBUILD kdepim-apps-libs-17.08.3.ebuild 920 BLAKE2B 2c29ace810dbf0f1f5eb6b864b68c2ad1a8e50e2537e7979a31300db7960b9adf98e38bfe8d75932494f77add91bc6de63c825c436d600747f9664f6131e4ca9 SHA512 53baa4ab04fa853544bd37057f28bc890f44a488d7679d0f0ff86fede2ce323cab8a42e343952cd1a82db183d71d5bc2519945cd040779ab01e8e33298023fc2
-EBUILD kdepim-apps-libs-17.12.1.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
+EBUILD kdepim-apps-libs-17.12.2.ebuild 922 BLAKE2B 9023c2146ca7b469d010e479e010ec8671c24fa64ea2ed0a05344c67309ba2a8d069c0f0bafc4d241d561c10144182f65a5addd32badc5c1b6629a95b98b90cd SHA512 974b0ea380d8669d47dd6918c24ab52aa624c47a45e046846f7533936181cb5c57eabf26e07b9332ce3e3cb7706894900918768b9d71be8667b2d9c13b8ff751
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.2.ebuild
index bdabc1a6ae7a..bdabc1a6ae7a 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.1.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.12.2.ebuild
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index bf4bb96064ed..39fba9d06cff 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-17.08.3-r1.ebuild 2058 BLAKE2B 4498d54fdc8d50d3d4d98e4804c5f8c749a522d3849e77cc9ed282af5a9ee3a4a1f6f89622c41cdbbfc9b870fa9ce5bd38e846a11063654bb291a20092689c4e SHA512 3d39f54d5dc8ec11114d4e1f58abda89016fdd43d476b0f796eb6341790fe40319a7c154081164b83fbb2aee0b8b528913efff55d15f6abee8f4f0ac5e652d14
-EBUILD kdepim-meta-17.12.1.ebuild 2086 BLAKE2B bb6004e622cfe920bf702a838f2904ea2c9a892d1484f8bdff19ec9637dd97457debf989c8490518cd9ab405ff21be0f53541ab468b5e144ae3de7c1ac80317e SHA512 536c37e1cde9ccf83a9a374129e0c730794ae6e631bca49ca49586432c02c9d2c09530df8d891d0bd39bcbf376e9f8af2b2941a503c00c502d6e9cad9abb4967
+EBUILD kdepim-meta-17.12.2.ebuild 2089 BLAKE2B 1cd4c6f1e3f0335186a91bbd780352c4b0e0110cdb2a88ef10afea7981fcc2e9608ec18f4ef0fbf885628c044744f379fd4539bcb9898bfe4bd1e0089c63b753 SHA512 6f817de54d5d64a983258c3ee043262bc5ce52c32ddd0a2bd7410bf5e5bda5cea4c142b900ea8e85c84085b6a7b8def654e78b5b4bbecf8dc9f797f648496044
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.1.ebuild
deleted file mode 100644
index 68162b1d4a6d..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-17.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.12.2.ebuild
new file mode 100644
index 000000000000..3799d374276f
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.12.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kholidays)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadiconsole)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-import-wizard)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akregator)
+	$(add_kdeapps_dep calendarjanitor)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantlee-editor)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbook)
+	$(add_kdeapps_dep kalarm)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-addons)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kleopatra)
+	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontact)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep korganizer)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep ksmtp)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep mbox-importer)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 258d134df72b..8d4404a56c88 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-17.08.3.tar.xz 1507128 BLAKE2B 38e188c579f35a8f01d559e4333a75ec54f61815133047531db7bd3af31981a66f6d921e60dca75c825de6c8d760f1636ca790c267698f10f245f9402fabdab5 SHA512 fbc13a0b92d47d057ff94101485e9e76eddd002c51d1696146313f6fa5be412759b44c1f24e0a4d1282140b985926370310de77cec7f9281771d15e6d5c919f2
-DIST kdepim-runtime-17.12.1.tar.xz 1792592 BLAKE2B bb7df0a320a44459cf4f6d317a66d73df2ccd2999b3a609cff726fecee9dd91c674ac1018f10e3ea25bbb447d51ab1022d31ee1bd7d89a97e80e003f4e3a4097 SHA512 ed6835493f00b0ba7ce20e138203c8a26f25ca4fcb899db0fd689633809d71db62b8c316a4a464b44c04741b413eb6cea5ce7585f83281f2c0c0ea8b910bb214
+DIST kdepim-runtime-17.12.2.tar.xz 1797808 BLAKE2B 1033d36b451f5c09cf2ef4b24fdb8c92c12772e76ebd56de847fb51e960edd2e29851a012d9c555d6e4eb6e847b594ab3a08011e5519ce0675962efd7dfc68d8 SHA512 de70c01d9d1dd24f9d5959dbf8a423fb217b97f4d084edbc87ca1bcb9723334ebbbe99cafe0a0358ca16c58048cc778c197de1f46ebc8318a08be296a7ae77fd
 EBUILD kdepim-runtime-17.08.3.ebuild 2072 BLAKE2B f0b89498dfe71aa7a60fdd10ef57bd29c4da7e00e95c47bb2659991929da70911fd841ffea3e2bb831f8e5224effb99f371c0888865055e7b85e3f79b118268e SHA512 5c7459d4b4dbf517738540365b4a6c323cb2dd79a29cec5ede078d02c4d8642634c09140ecde3f32d4523d078a90c1c7230df86cc19c3acc9cf8daf6bf2e91f8
-EBUILD kdepim-runtime-17.12.1.ebuild 2101 BLAKE2B cba72085cbc223e91f938d175b0eb9dd601a871937b4de263dc76a6cea4c2e6bc23645ce386ea1a199a1455c1825dffd0365d7634f8bb3e3822da18ba1e83b12 SHA512 c8d08e196e6de4b37693c4169b12ab6a73f5304effaba26a7eb7c48080ea18903ee049786f7251389ef3aa38b1ae11d2d3cff089acf64071b07c0d2a5e408e81
+EBUILD kdepim-runtime-17.12.2.ebuild 2101 BLAKE2B cba72085cbc223e91f938d175b0eb9dd601a871937b4de263dc76a6cea4c2e6bc23645ce386ea1a199a1455c1825dffd0365d7634f8bb3e3822da18ba1e83b12 SHA512 c8d08e196e6de4b37693c4169b12ab6a73f5304effaba26a7eb7c48080ea18903ee049786f7251389ef3aa38b1ae11d2d3cff089acf64071b07c0d2a5e408e81
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.2.ebuild
index 2ada64df4f06..2ada64df4f06 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.12.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.12.2.ebuild
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 74f0a189f26d..2bbe93968a99 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-17.08.3.tar.xz 37348 BLAKE2B 68503cd623ddda0dbf175588b07e08da5faad80213cc1ef4f97b0544023d0327d380cb6a8ce8d78da49d039bb04336ae0e0edb7079da636dae4298c7d28a9188 SHA512 a692ddbcbd094d230867851d42165f0d7daa1872a7fc80bde4bf5de8c70ef09547a79e0283fb19a451f95f53c939d27e1059c005b7eb5f80f294b2b2c56280ff
-DIST kdesdk-kioslaves-17.12.1.tar.xz 37392 BLAKE2B 1db839d975bcc1af033562677bb88473793f124e225df71459a09f6801318cc87b9b8e252ebddaa2f25615d7a4c10d65a0da3be31396ef803d661d840bd6c439 SHA512 bd79adb00361108881d01ce4f719d05861eb6539c42459d75b636c0948c3466771f32acffe37a05cbd37d1d9e044e6f6516fe6a016d7496ca98887b88a84848f
+DIST kdesdk-kioslaves-17.12.2.tar.xz 37388 BLAKE2B 5afd4b3a593503ae387479e0f41e6d1828ab2a98ddcf96e1ed7bef12a514a77d76312cc5dc23a5f30f767bcfdf8670cd8655f60088f2f51fa46146d67fdab0c2 SHA512 a39c344c2279dd9c54eb5037edcc7c8ea18a45c990a008159e3953f1f0237cbd179a8d70fd186f9e717dc7d62b53e0ea8f301decc57a86cabe5e35f45e30fe8f
 EBUILD kdesdk-kioslaves-17.08.3.ebuild 375 BLAKE2B 2d813ca6fe5d44647c5602086cfe7d834db1981ae6669280bb91fe6bc694eac5d7f8e74dfbdafa224874c1198eb9f25e7b4aa313a0225ffa0d79bad976063fa2 SHA512 15bc346ac3919b443c7f6152d779d2abf447036d5f62cf388ee6608867143ea0d4ee929c3581be1890c12ad3dbabf0fb9d18116781af04188078e78fb98148fe
-EBUILD kdesdk-kioslaves-17.12.1.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
+EBUILD kdesdk-kioslaves-17.12.2.ebuild 377 BLAKE2B ca74c8f1cd7219bde81271519fa533aac2b4a2be76d5244f6f064178467d8b517db2cdb6f2119b59cc8972b1105c20f24b0219f72318eeed1b950d2f14d7ad34 SHA512 29bb043e718d0472262fd8d4230e2d8fe2953fd8171e3e974df3b92f967c319486ef73724376385c8cb98c8225999d526f7a63bffc69e6089e3a32d0e3063cff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.2.ebuild
index a659366d3db0..a659366d3db0 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.1.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.12.2.ebuild
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index f3cd37fb69ef..9513e8da7dab 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-17.08.3.ebuild 814 BLAKE2B 6607ca11e54397852d657d546e364448f54dd11740ee6557d89cd42385fb290702990abb15e4219d24f9bedf78aa0fca8453a6a2e03aab931cab8ac78bf626b9 SHA512 619aa14e31e7f0d8be936bce475c5436483d204f44df92695b191aa5d16af9b4107aaac286bbddd29dae2e1e57210e594ce9b60686291501f0fdd4a6b0c2b1e4
-EBUILD kdesdk-meta-17.12.1.ebuild 816 BLAKE2B 928cad107b3841337f2ac22708058fbc468639f726c2b398673e8971499e9938a0e39d774a309797e7e1d7446cc569a0853b0cbcdb921d09bef44893ca3dd491 SHA512 876520a50fbd8c21a0839658c33c745c4cadba02b787ae16ad801db693d1cdcba782c661becccccf4d12a9cd0ee54d03e0ef80a14fa1fd41a6baf14009af30c0
+EBUILD kdesdk-meta-17.12.2.ebuild 816 BLAKE2B 928cad107b3841337f2ac22708058fbc468639f726c2b398673e8971499e9938a0e39d774a309797e7e1d7446cc569a0853b0cbcdb921d09bef44893ca3dd491 SHA512 876520a50fbd8c21a0839658c33c745c4cadba02b787ae16ad801db693d1cdcba782c661becccccf4d12a9cd0ee54d03e0ef80a14fa1fd41a6baf14009af30c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.2.ebuild
index 6376185cb85c..6376185cb85c 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-17.12.1.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-17.12.2.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index befb69085603..511f45cd45d7 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-17.08.3.tar.xz 17152 BLAKE2B 8c32996213c6d8541bc1067270a3b7a54acd29cd70235150af8f52c2e4ad79b1133f33e1c76bffb15106d6f475a86fb7b30f9c235c05fbefa3661c7bc885207b SHA512 931dc615bdf4dff783f29aa5392f61b5901ca3ae740389538db8a30d3a06f4ecb0b6fde71a45341ce2511d6e54c57ff58ffb8dd624b705f68ae55284ca85eb07
-DIST kdesdk-thumbnailers-17.12.1.tar.xz 17188 BLAKE2B 06aed88019253f05cbb626c8e326bf05200618660c373eab794292faeaedfac459f02e7f1ffb39f29206997ee368e914b57eda6f85160aee910fad37c78e3814 SHA512 e4896992518b32c81f2be662615557b7a8bfd8317e18ce5549eec8288d1110dc8d3d45bc058f2a7229796f2d6965cd7b7de19aa1846bd1eb80737d62826502a8
+DIST kdesdk-thumbnailers-17.12.2.tar.xz 17136 BLAKE2B 07ee699d7427cfe74a0c38663d0264eedf71d80260ec1f2ffabbe3e96fc40fdf69cae485ae3cad5ffb35dea2120fd93085bb71307b24097c8e8600130e217d40 SHA512 730d024d1578690cf9bfeda699c0773db3554c928b5eb54ba0230530fb2ade4a9585493fc5fb9b96576cf3a0276d01aacf8296a711147ebf0f680f90f27e71b0
 EBUILD kdesdk-thumbnailers-17.08.3.ebuild 428 BLAKE2B 5b46585c6cac01a1f891fd3068f9bc1d9091fbb15aede62cb636147374500d97ae763209664546b7e1a3993c9c29a42eaf2583ef2c6ed86bf335a842c4003396 SHA512 b9b7568c1de8150f70244100c4c8d91d8c4009470a21d4359e8eb5eea474a2dcf146e2107ceffaacbbbef24eb27a3f4e03269ceb1d099713065167c0b152a7fe
-EBUILD kdesdk-thumbnailers-17.12.1.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
+EBUILD kdesdk-thumbnailers-17.12.2.ebuild 430 BLAKE2B 925942c8b5354bc3c7e50d06e56501f3b1dc143bf3d37d8e81880130b1638a04b413ccdbb8513ee98c1f5e8838431e63af3ed734cfb71931b80bd32899765ef6 SHA512 a8b1d25f298c26729062444b842d899c65a1923b80e6c72964c0a14dd44eb2963f571610ab221123b23eedbdddc62adae750622d7b2a26ed4cc57a94352e7f6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.2.ebuild
index aa6e30a17640..aa6e30a17640 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.1.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.12.2.ebuild
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 3a893c4e2971..b5b7c84bed8c 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-17.08.3-r1.ebuild 929 BLAKE2B dd72ed1cb361795791a31fa49e7d162f2ef48962534974b4975139fe9a182fbe87700ca09685027f3cb5ca09d870e2bfc31ca0d160739e43e849cbc679bb2f42 SHA512 b164af823af877361f1a6a0a2d023bfc9d1a40a064d47e0dd34674ececee19e913c40e1603b66d76c3cb7e4cc84d07e948c0bb12fcf252372b5217bdfb487f5a
-EBUILD kdeutils-meta-17.12.1.ebuild 782 BLAKE2B e0d4a424636689c01fbfa9d32f804d46c30ed0c87a67f4f308ca11833e5e7d97e8dfcaf58bcce1c9bd96be4e7d8e75b8907024cd322f06e2aac2497d78927bca SHA512 3e4d7e28cdec18c0898de508a3ff5a6b4d7ff97ca8df8862309864270335d78df3db8a20a6e7f945bc279500aee39f895b751d4e7a700bca4335bd6045398095
+EBUILD kdeutils-meta-17.12.2.ebuild 782 BLAKE2B e0d4a424636689c01fbfa9d32f804d46c30ed0c87a67f4f308ca11833e5e7d97e8dfcaf58bcce1c9bd96be4e7d8e75b8907024cd322f06e2aac2497d78927bca SHA512 3e4d7e28cdec18c0898de508a3ff5a6b4d7ff97ca8df8862309864270335d78df3db8a20a6e7f945bc279500aee39f895b751d4e7a700bca4335bd6045398095
 MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.2.ebuild
index 4705ac6bc239..4705ac6bc239 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-17.12.1.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-17.12.2.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index cae0c6adc038..4354eb9dfb29 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-17.08.3.tar.xz 530904 BLAKE2B 1f0957a194fe117b030846bc03248443d4d9b3db07b4a0c8592c7c50b86f910ddf245d25cb0d3842edf64b696bca5056ad3bc0c31915ad86938702fa6899fd42 SHA512 664e62f176930aaee8300813ec82b0bb886d09cc1b2242e0730799c034983b28d1417923a4daf170c396c334877a666a6d3bcf07a366a303ff08cb38c8acbf36
-DIST kdf-17.12.1.tar.xz 531080 BLAKE2B e60ab5cbcad52a2919e1940ea787d935a6eef17c296262391795adbebc6186aeb30c16a1bcdde807ce006ae32c47ea637b3f7a0d0300f833585943c0f39c71fb SHA512 337b42f8729a5bcc7d42ec51d6997aa6e2cbd68cf4c46afb68932eaac3391e9ca34adc11c8bb7d4e4ca368996f7ff92ce8487f33521f4ad84264654f013ae8fd
+DIST kdf-17.12.2.tar.xz 531240 BLAKE2B fca793ea1083596ac2c0242b10e6f307f285e5024d5777875f7f8a17482e6c10db43054e3693f903016151f8ab3b2fad2ebb169441b1f2a705f7f5e93082425f SHA512 f7e3fb2a7336ba587295f6dd8b25f48aaf304e4130e05fa13a659c43277b4dfd98d6f3036d4e64d6cb95e44a16ff4888910db629cd982f23750f334438925080
 EBUILD kdf-17.08.3.ebuild 723 BLAKE2B b2a5b95421cf044689d59fda80fabfc1d5e78d84853c82b0761a13d882c42e003b9d5d1970923e2c699ba43a9664a33490dac10905cc3b7b401fd983eb4bba8c SHA512 fcad77a8477e22bf7a012ffe7c1b7bcbd59237d6258f1430b2b9fd6e6a7d4c05e33f95ce2ea3c412e2aaed401ebf39747f46ac128ede52c45ada50d815f5ce5e
-EBUILD kdf-17.12.1.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
+EBUILD kdf-17.12.2.ebuild 725 BLAKE2B b0897058417fce2b6c420dae4a8568151b2a7602e2d7b900353917ec88a21b695f973a8f6b0c3da21a681aedf9bfa2d44c79230c513cdd653ee9aec6e2385724 SHA512 f7c33825bece4ef0b1a4058795947e9a9ce15bcdf47e0021df052406811a9b485e7fcb44de20122e0864e50eb464c1fb7b6e674753961e3b5a405776c779775e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-17.12.1.ebuild b/kde-apps/kdf/kdf-17.12.2.ebuild
index 3ac87d6ff652..3ac87d6ff652 100644
--- a/kde-apps/kdf/kdf-17.12.1.ebuild
+++ b/kde-apps/kdf/kdf-17.12.2.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 824de3f8751d..6c52e71c79b2 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-17.08.3.tar.xz 95084 BLAKE2B c342b1dfeef547bc7effedcf0c888a46422e3b2bcff525f2c0d3480b41a56dcb3ea8acff6eb3aea3dac6171733bed5e22c625c576a5093a7cdf9cb33330f4324 SHA512 27579ac501ec4c4904724008968ea12cd6a34a6eb6280787d4581e5c4d6bcdd1767ad26b27e967262ebaa955929b0ef2b1ab49b45098e4380516c9cd4bcbad7b
-DIST kdialog-17.12.1.tar.xz 96184 BLAKE2B 38b85ed8ff8e6ed991ace06cf651d8c22aa77f92267dfd52c287d10c2d156a50f75522f8a8259550cdacd0105ea58329c877fe81030dfe78debabd5f423f7b34 SHA512 173178b57b6248868d92206ad40e103b491e085dba4886059642f198fbe7274063988982cabf69ee8d04447f719abd10be432af4fa0502506a0eec3e4b1c0358
+DIST kdialog-17.12.2.tar.xz 96084 BLAKE2B 310c4deff79a3eb3360dc773f246f90dd785a8b5426fccb75dad3b50c5d1a27aa87abb5bd01293148581dfdb51b61996fc6934ceb875a1e1d3b3792bacd6ba80 SHA512 0ffa4c0342b9bd3a56d3d6087114875985f201ebe91e81e0c0bd836301cee021af0e974394858e9e794f64a4956a1d70f209eff1e9b3c9970a9a8c8e0201144b
 EBUILD kdialog-17.08.3.ebuild 835 BLAKE2B e367f04321d4b50984aff42a925492885dffdb8a88df22e109929d748f8af2eab029ee0c18e0bd932dd7215fbb1b36edcdb42a31cb43f29ed250218d6f50dd83 SHA512 10794699e48309b05144e26affb5c5781e5f5d7df0b47900fabb37e8e7683667b46a1014033d9ec52f2c772ba68780ddbf240f498ad642439297a813688dcfe7
-EBUILD kdialog-17.12.1.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
+EBUILD kdialog-17.12.2.ebuild 837 BLAKE2B 699390df60024475a60b5b2f0ab567839357b01ad6db2ffa9987ccb6daba501749181e4b4b9b30dfa1d928e56743545c448ff9f7096ecf92e6ca92b8ab3b1e8a SHA512 e25479d71bb7c8ef910cdbd858489cef9d1c75636b84841edd36861ebd9d0983d09d209ad716b57137d4816bcb4303acfa19562f74702dfcae07ed57d316c49e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-17.12.1.ebuild b/kde-apps/kdialog/kdialog-17.12.2.ebuild
index a3f46e46a8fb..a3f46e46a8fb 100644
--- a/kde-apps/kdialog/kdialog-17.12.1.ebuild
+++ b/kde-apps/kdialog/kdialog-17.12.2.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index c6b309f77d3d..2d0601bd2019 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-17.08.3.tar.xz 4606912 BLAKE2B 7b7cdf4469c454ad448c1250729e8942934198a8d82b339fa304b8db44783b859b797cc50f0c1daea089d083119a3b3a13c5d2502bed10f3c9a0d46a10aff236 SHA512 230fbf5aff55b72c3102c62ec22568a37126dddf458e1f2ce48c900d4ea8672080d8ec87b8c8abbfba3fb8fabcea834254d3b0bc77e3ac85f0ee1cd936abb41f
-DIST kdiamond-17.12.1.tar.xz 4606900 BLAKE2B 01a4514c9ac097a5126d0dddf77f2b969005e31d88a54e19acbbbbe7ad38e89e59281983176f74677e10aa0e2fcd6b745d737a8de18296f5092dcfd3f80873d9 SHA512 c96e885ffe0c49ff8d789bc0442bef935f4fd8f27d9442b68b3084df1fd78782726b6dbdfa3b06ddddd4fb42779221b56cc5ca6332996dcdab9e3b6423ee9060
+DIST kdiamond-17.12.2.tar.xz 4606876 BLAKE2B c92e0e2f5d4c72faf90097ac0e3794f4723ff80a1862dcea99484343caa7ef19f640f0a0eda26571d6edcef5108e1ecb25d39ac2669369c5a520627a79e96562 SHA512 f7e693c519c4d7c0ce2717540de4d456239760f65e6e00b191b76fcf78dd69d2bb0cac271d3676509c883b9580af415306de057a8f379d154da983ead145cde0
 EBUILD kdiamond-17.08.3.ebuild 789 BLAKE2B 047bd917f27f0c348c9a6093b29428be3c29d2f0f7f6f0cf17cd2569817a43d66fd8d1f26c7525af5eb16c170c7bfbf88a6d99fded6b3a4be732740277445f8f SHA512 15efe9401a46a7706959bccd2629270dd3a4ce849e9f30c738effcd35d17ca4bb168f4b327d8daee77dddebf12773208213a01eb953e3221f96d7ff41b0a6a9e
-EBUILD kdiamond-17.12.1.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
+EBUILD kdiamond-17.12.2.ebuild 791 BLAKE2B f8f0d78bad52684bcb399ddddb76929baf952180ff20aacb16e49a4323463a6b241fbd6650a7dae843de84491738a6300538b41abc416712a5732ce3e836c170 SHA512 e9bb4228f2e50537b53d82ef584db97ddacdb96eede82a8034893b106ed9967168b7c716610d41a7931d6fb09ba26f091895024c2a7eaf705cc37ef092919c93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-17.12.1.ebuild b/kde-apps/kdiamond/kdiamond-17.12.2.ebuild
index 111637d702bd..111637d702bd 100644
--- a/kde-apps/kdiamond/kdiamond-17.12.1.ebuild
+++ b/kde-apps/kdiamond/kdiamond-17.12.2.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 81a4855cc576..92480b40d05c 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-17.08.3.tar.xz 183160 BLAKE2B d1b23ba41442737db85556d172161a5f8faa67be11ab6fcf7149cfe288e3552962a2522b840f48f43d7fb12008ba0f75c014fc71bed3cf7efe55af70aa4d43e7 SHA512 3986bccfead1ac156bbf22902c3909b4c0dabe801476bffdf8ea34f39c09b723be2247105adb92db3cb718de107ee0d77aa6830ea339dd687a7fec6135be046e
-DIST keditbookmarks-17.12.1.tar.xz 183304 BLAKE2B c216b14a8cc151f6e171a649b249b02b8b81c3c11e1862c97f3a0bfe59d298df85146841bedb6241b4b6f737520e14f5f6f97824645322739c361aa41a50d1bf SHA512 3480fc44cbec32467a58577859cf19d3fb265bea86e36e916cab85fbc6db3ec3ebdd5cf0eb4707456b9f7bdf488ae285a3f04448b3f2c97f28fb68d2201cc40c
+DIST keditbookmarks-17.12.2.tar.xz 183324 BLAKE2B 3fa0676aa7058a5ec0c336143223400b5e10ecdf41ff977d2576d33375e4244a2a4b4de0dad38908f9c11b5ccc4fed36441961f259e28e928dd4dd785fb85db9 SHA512 b45fdc2a9383b8fead8b89bac67fba6ac1d01e93c512294d943cf0116331250d67aca87190fcd64296af06eef1adf76cd43e5bd1345c8e18eed5aa7129eb4d11
 EBUILD keditbookmarks-17.08.3.ebuild 1011 BLAKE2B e8f94d27d6ae5f17989cffcd49d368eb9376d1751ce900bd29d4aaaca1d5ede6ba25cbcc2608f731b57b040d3a6f8c3ca0da2fae5ba2cf7bf77dbc42d639a4a1 SHA512 645919505868dc5e34f76a7c0fb961971a3c6156ee3cebf8ae708a3b71c6dd936cb42e47310f991f46923b86ac0e6eb2bb96d360b2de7ec090cdcd815206620d
-EBUILD keditbookmarks-17.12.1.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
+EBUILD keditbookmarks-17.12.2.ebuild 1013 BLAKE2B db456d32470eb7a37bca70d4b93bfe8f1fbaaf0dae78e61b026931e33c3599693568ec0b556b576606cc84f3f90e42683f0c90071b4afcb86b4c1fa7f3a98907 SHA512 9837274abaa372edbc12fbb7ddd0c1b7d84d233c983fb2b07930bc270ace635c57474d46939dec628149bfc60daaf80fc43e716269e4beb7f42ac592af516fa0
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-17.12.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-17.12.2.ebuild
index b048c6a9cf89..b048c6a9cf89 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-17.12.1.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-17.12.2.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index afa39439f2ad..9ab4ab7b90fe 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-17.08.3.tar.xz 209012 BLAKE2B 49c01868aa3749bd7bf8bf0560f5d766d5482cf85e4cd271099605548e47a46dc1ca21cd41810fc9bad2be5864c721880f57fbdf862181bc1e178dd8cbe8475e SHA512 998ee39ad4b909021827064957d2c3b551953ca249c6b130ea37b2af96beec29beda90578a53b921070692f3fdeb08cb12b2b5fd722864821b657933c6fe0f43
-DIST kfind-17.12.1.tar.xz 208916 BLAKE2B dbf732dc635831cd7e6a477619a3dc57409639c24542ee61c98d893b317e50a5d910d0566d4f05f11c9581d77fcccc22d317084d0bcbd5b122716e1d224bdc93 SHA512 7ba88c82348dae527d1deea0b30c479956b5c394d53bbe3a481fcdcde1676d40ae82b33d410657d7117bec6bfb5a84bb57bbe341a9145204b0f04cf217879914
+DIST kfind-17.12.2.tar.xz 208932 BLAKE2B c0ae463a686638d3f073ad906cfc1401db2d9274c850d68a796ce66e4c181911eceb6ca9ec26bbabaeb0cbd17c3550c8977a6dab5b5a0af6f911b4ffbd76039e SHA512 2de77210e6c2e84addc54c99d3b7329c490ae9c8c614281d904a70dcda8905945beaa92e9927c03a71f7bfd72a353f9361ecea8030c2761abbd872c7ebe45636
 EBUILD kfind-17.08.3.ebuild 787 BLAKE2B 7373c88831c4cc2a102a31749bd17a5fbf41697f1b0f20ed371c6bed1cdf9984ab8bd8953ea706291bc21279296122073a0a0529db85271f73e0879022235300 SHA512 829a8a0a7fb847d3f713bb8272708c5935dd136b4fb8a18edcc4404c8c07120c0b3cf7911d8c2c8b9bbf011dcd88884f2eb6eb486afe1e04be92ffdc117e2d03
-EBUILD kfind-17.12.1.ebuild 789 BLAKE2B 54a983619de422f9eb21301066f1d145e52dc304e505960b8574f5748dd3f739b17a9d3a0f9e4b2a9fbae0f7e6f97de4afc636d7901cb5ba1b8abde1983d99a5 SHA512 ae8ac2fb18a8979ea6ef803d331dfa72a8a1fa95cb23bfa39bdb63402a77f1b6563f7ce774b116eb54c4cd961b40dacd7bbc290d6f4729d8609bd8763435c1e5
+EBUILD kfind-17.12.2.ebuild 789 BLAKE2B 54a983619de422f9eb21301066f1d145e52dc304e505960b8574f5748dd3f739b17a9d3a0f9e4b2a9fbae0f7e6f97de4afc636d7901cb5ba1b8abde1983d99a5 SHA512 ae8ac2fb18a8979ea6ef803d331dfa72a8a1fa95cb23bfa39bdb63402a77f1b6563f7ce774b116eb54c4cd961b40dacd7bbc290d6f4729d8609bd8763435c1e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-17.12.1.ebuild b/kde-apps/kfind/kfind-17.12.2.ebuild
index 3c6cd94b16da..3c6cd94b16da 100644
--- a/kde-apps/kfind/kfind-17.12.1.ebuild
+++ b/kde-apps/kfind/kfind-17.12.2.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 708f36347107..dee95367b29f 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-17.08.3.tar.xz 198852 BLAKE2B 3fde4288e81f0619aa683ce5c5bd4e77cf64127fb5e75ab239bc8716260be1f1b3bed8dfcee4fab68074b9780000069b8428d35996bcd380fd347e617651d6fd SHA512 834986bf5d3ee2b9bae57bd083e8a2c8199c9363ae1de04bb37c8b4217d6cb9b87bd8ac0474e2c7131ba72cf477f092fe052eb4b1d556645ac25475a8e73e2c3
-DIST kfloppy-17.12.1.tar.xz 199048 BLAKE2B c83c9e634d7f1f9446abd2cd339f359a953f23ac2987d452c2428f79a39e76b3f7345e4b5a4f0691b53ecc3315fb98ab5f11617ec28d52ae1194c6cb9728023f SHA512 24196ec8af2c8e6e0f75b87fc884782cdaa8b2630b89af11b3ec4a3230ccb0c2adfc11c2eaa26e2b46cc09cee46753af270e4af1552ae2b4dbcc6a53884a05e0
+DIST kfloppy-17.12.2.tar.xz 199064 BLAKE2B 742fc73148f3c2e5698cf97f099844057b9470c8c040377abfe01351da5552e44fe7422f35fee96e4607f329bcd01641b6cb10e61718cc3f5a72db7ac5857bca SHA512 d95a7072754a4bcc95c2fc8a8c5149759e33717bd29377ebed78cfe40ee3e0f7793d537476d1807f830c11f9af5b5c15e1db6c82540b385bf46a6f4749ca8691
 EBUILD kfloppy-17.08.3.ebuild 751 BLAKE2B cf98f99c6571ad5192b4084279bab80445104622a7b70b346d8f25e29e5c908a8b80d866ba4fe717cfd41756010ce8275186c6da72a6b622055eb21b958fdeaa SHA512 4223597ae8ca8709ba0585b105816dbce048604a21eb74f69399b0bcf305c1b709521bab3e07f9480152347b329e017c95005fec326121e83a70201a415977c4
-EBUILD kfloppy-17.12.1.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
+EBUILD kfloppy-17.12.2.ebuild 753 BLAKE2B 143df62aaaa9e8af5d022311750a264e7f46c16059d29ab886353b031c594cdee73451d5724bf51fb6cc6f3c893b5708feab56a342513c93de40a3bc26443dc7 SHA512 b418a3eb55fa2fedba1042641cbc8abb18daf064bc50446ace4fa8ba22746bdccb56cb83225b06297130777a209cd9a77ce2550547e6d877d9b7e573a7512725
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-17.12.1.ebuild b/kde-apps/kfloppy/kfloppy-17.12.2.ebuild
index 6bdbc688d3d6..6bdbc688d3d6 100644
--- a/kde-apps/kfloppy/kfloppy-17.12.1.ebuild
+++ b/kde-apps/kfloppy/kfloppy-17.12.2.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index a1ed133076f9..d9195e84d583 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-17.08.3.tar.xz 573060 BLAKE2B 2309ff12fd41b4c625d6f78e7d23203b2d86e0f770a231e279b06e548ca3500990026776fe1e2a6d8e34203dc897c93bc2395da0afc30b7389009566e95ce2ca SHA512 d3585c205dbbc8cc9cfc5d0dca67d63c82a23a54e953980325064df29ebab3766f2c1f940b1ab210d6455108a8fb29f7d29cfbabcccd8c4506d3a84bf6463445
-DIST kfourinline-17.12.1.tar.xz 572940 BLAKE2B cb4b9685d681dd8c72bd11f32b44714d9e46345e80ad668ec9c34c74dffa675feaced0218743a2eea72890bdc20f657a3c442ae6f9076a245a0978bb0484e7ab SHA512 c11ddc05a4d487ad4f6cd55b9e66aa98720b15d1eb94eb9cba3cab720505d559d6418af1fc86b0d591f5d3b93759c57b7defdb1608acfb7aebea30efc692d954
+DIST kfourinline-17.12.2.tar.xz 573144 BLAKE2B 151ff53baf2de83c6360490bb14c354ae782d26690747cbf3caa066b3d272bbfc4a41af0867610357a0a04165dad40189a51e79ab0eb8c23000d0583ac9777ba SHA512 3f7e0b179347bbb2cafb43f02af8a99becd872c35419a432e213afec1f1767b53a07a2abcae193fe868c891cbb464768bf5ade33565b5fba8c6f2c452d234594
 EBUILD kfourinline-17.08.3.ebuild 733 BLAKE2B 48c91d38e5b089ec89186217cb31f2109d34af9a9ff280efa234c432926bf2d9d0608b1404c0109394f8b17d69db780c6797bbf3b3bce3c2351442349c3da7c0 SHA512 77b43a1c4c1017a9a24e7415c09017542ce07a536ab2c301295f21ede6b8901a89d4f40bd4b44463aa5f3ddd7c769cbd01460b4ba9c08b5657f82bcee65981f3
-EBUILD kfourinline-17.12.1.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
+EBUILD kfourinline-17.12.2.ebuild 735 BLAKE2B dea403b189c3d5c834cc37fd44b7b537dd1e260096c88815cd43147a155ae915d88ae364a176a581351f099288d6b0062cba835554b1e7f63551633879693fad SHA512 5605cb8cb86f9ad0acabf4350d35a22cdfa3e082e9956eb6f47d32b8321bb5c1c10e8e27a233b2acfcffe3b462c6c00c1cdb815fd6250e1d3f99a5d61542626d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-17.12.1.ebuild b/kde-apps/kfourinline/kfourinline-17.12.2.ebuild
index 3e6be98491f5..3e6be98491f5 100644
--- a/kde-apps/kfourinline/kfourinline-17.12.1.ebuild
+++ b/kde-apps/kfourinline/kfourinline-17.12.2.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index c313cc117bfa..de17860a5c09 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-17.08.3.tar.xz 10916472 BLAKE2B 988869d5a4142a40bd04481b74e0f7172cc200ae353a29e1492f2b5b8a77890dcf1e69346ae8c805767dc4a00989ad841bcf141256e913f73fc81f42be86f8ca SHA512 2ef733697405356096e9fd3ded52622d51b32e3b4f92f0274d700f7957661bb529cc9eb430a1c3eaf26717b4634ff9734442f51dc8838eb5f2e01c035a14ff1f
-DIST kgeography-17.12.1.tar.xz 10922328 BLAKE2B efb8e6713aa63acb96ec1db1ca878e1a896835f26b53ea05341e6581a514d72b57eb758f391261627325c9d944dbbc3b74b90e7e82584ddadcb6cc79b555e726 SHA512 4ae05c1e6372f9864dfcc7d67ab71daf22f699e19a467cf4069e97e50d4972d11db3a15e378e59162ffcc84ddd1c81f1e7a0fa5335b9c1c4e63b21ef443d63dc
+DIST kgeography-17.12.2.tar.xz 10922052 BLAKE2B ec2c1f567c652cc7d74d418bc0b3321699d2657b4b9af9434e1520ee588453dfef5643671c88fe0e8ed4ca7ef5e9efcef10ad2e50645ef53d09de1b45eec4246 SHA512 31bb488144ce8c17d3aa11e7155a83dbec49281803c814076c92fc71b758aaebce87d796dfb2b20f22baad50e1b31c466436d627a40bfa1265a6c02b84d11c32
 EBUILD kgeography-17.08.3.ebuild 743 BLAKE2B 1cbc351695db8c2419238314955260115f0a473af6a4e05fccbca64f0d7171ee33706eb246920355d9820f0b4bae806fe152504b5b2e256636878b170396b9d7 SHA512 a0846da4bd3d95cca769116d628f3499d367dddb9b7ffc7351477ba147d8beff0dc26ed4e4f2b631635e3c6e88fe8b78bcf2b625eaf4184c66dbc754812c2207
-EBUILD kgeography-17.12.1.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
+EBUILD kgeography-17.12.2.ebuild 745 BLAKE2B 0579dc2b562fd939866d5e772d71cb050043a5d3289e6428b906c9714b388bbc8d4fa6f7dcfe4ff6712201fd1ae1abfe57fe89eb8746c711424eda84a9627210 SHA512 031550e8d91800430084a44b85e735fd01cd0df415e3aa5c8d55c320b5200e06d21a26d22d07b812cf53a28e21346ff368feaa826b6eca43d5329c33fd5b3fe3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-17.12.1.ebuild b/kde-apps/kgeography/kgeography-17.12.2.ebuild
index 1a573e6946c7..1a573e6946c7 100644
--- a/kde-apps/kgeography/kgeography-17.12.1.ebuild
+++ b/kde-apps/kgeography/kgeography-17.12.2.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 3a4fd0a65856..519e3773186c 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-17.08.3.tar.xz 1081880 BLAKE2B 021d60b88113a134f692b347106b9f87600bc0012a3351160ffdf8f7f6aa2a8d92dfb0942850a57a5abaa909fccdb40b416250ce6979dfaedd29c3f9c48641c0 SHA512 7766065ff062f9266ff7e7a193f5d007a59af408127d42dedd7c7d8dc990d89801c7237f2162e7e335896be5768ac247670992f4bf52776a1470a3d805c0f5c3
-DIST kget-17.12.1.tar.xz 5388920 BLAKE2B dbbb3e1f0581cad93ec4dfce9bb4676e9308a8a5d1b5c40543810138868646a83a4f9c5079c831763409e5abba4db90e637c8643938bd72b562e26372ebdea72 SHA512 da65381c226240c423e9fa60243623638648c042367a0b0367b19869a6a123c8978714cb62a66ae7f8153135754c0933bc37c792e7c7a808923ef62bb0af73ce
+DIST kget-17.12.2.tar.xz 5387996 BLAKE2B 65a3d86ebf96ce2f66e5e0e1e0e7ec5430123dbff427624dd234889a6abc8bd9ea6aaa3991c29e2645139567d53f51c533224c4c5e5e25d3b6b16ab220dfc320 SHA512 affc47f456946001ca0ad230720ed3a1b21ee274d1df865fe7b405b852dff55a1a85ae30cae15bcf4ef667e285719ec3d72d8adce994f96e92f3069f9fae541a
 EBUILD kget-17.08.3.ebuild 728 BLAKE2B 4829723ae8a028947d28f21ab99ba7b8a12b60a766b5d406481885267dced7e4685fff2046b1e9140c3af702398b2e7c592a3f5ca3b0d7e6b4796d6ebb1a5ed4 SHA512 fd38a064b72dfd352c303d69cd6344c483b87f0f6e332e56b265d4d8c40a65dce1e14907da4f5cba617fcc07e3ae479d31bdeff5363d8b620d8c21fa0fa21245
-EBUILD kget-17.12.1.ebuild 1712 BLAKE2B b803f87a698469b0c8111291e281aea8044e8841fa78545e53013b19102f06ce38332841dd640488af8bc8d57c5a51ba1271cd4438748b1a924cd945ffb115ee SHA512 46b809586d2d938ce61089b2c5baf88e57cd88154abd29df8efdb5ded345ba5cce0806b47f7e1124581ec77460bf1dd81690493f86ab508352cf0c6d7ad412e9
+EBUILD kget-17.12.2.ebuild 1712 BLAKE2B b803f87a698469b0c8111291e281aea8044e8841fa78545e53013b19102f06ce38332841dd640488af8bc8d57c5a51ba1271cd4438748b1a924cd945ffb115ee SHA512 46b809586d2d938ce61089b2c5baf88e57cd88154abd29df8efdb5ded345ba5cce0806b47f7e1124581ec77460bf1dd81690493f86ab508352cf0c6d7ad412e9
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-17.12.1.ebuild b/kde-apps/kget/kget-17.12.2.ebuild
index a4c37c37db0d..a4c37c37db0d 100644
--- a/kde-apps/kget/kget-17.12.1.ebuild
+++ b/kde-apps/kget/kget-17.12.2.ebuild
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 673d208c0b6a..bf9aeb81a569 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-17.08.3.tar.xz 4399488 BLAKE2B 77611aebc0d293a96452e372cf8161a69fd42fae404be4cac472e59a8db0395e1fa674d17f22452ac85f465765d75c295c3f0691921ff5767222557d3d10688e SHA512 8dbfc935142e6da09a7880d1b7bc66bbd35070dc548a85363fed13bbc8a276b2a4dda1eb08ffa302443f0584401731aeb225a4457540b9afc55d8da020254f3b
-DIST kgoldrunner-17.12.1.tar.xz 4400872 BLAKE2B c7b95cf8abbfbb627eb99eb86fe94628c8d10abc5666221ef8951898e9e5ce5cd827e83baeaf16cd9e96e41d11690041616bb245610794fd69e60eca44d8b5ce SHA512 b5a2025f2852cfab49864b4667d092aaeec4f74b06d0a618ab259ad28d7033868b7cb74fc11b3c91ac765eda8bbfadfd1905f012f0dfa6bbc770ba96dfb8869e
+DIST kgoldrunner-17.12.2.tar.xz 4400880 BLAKE2B 50a799325eada014fcf64812e29422fd06685866c43bdc1c5ab9aa3aec285575830912c61f36901113fbd73c8e0c1659afbec9d40cafb43206c50c622886822c SHA512 a68a9b16fe8ae20b3613cd3d8dc872a0a222476cf6e9a4d0bd8b0563604703ef5eb910770499355e8f75fc20a44a3917234f1be88f06dff23a721d0049014ff6
 EBUILD kgoldrunner-17.08.3.ebuild 863 BLAKE2B 2678f466ee36eb9e8d01491acf586c8b3f2de0c4bb88cccba801e913afea9fe3e0407e289dfbe9b1f94845c3dda81d6e9a80d1fe37d89d994e8c446c6872b8d3 SHA512 ab03a6a7245ac2e66d84adce117bdbc16c2949f11f9aae88b7599388e2b4eb6c9177374688d8df894e9b7acbb46d060154944101f57b564ec02fa3aa5fd08d74
-EBUILD kgoldrunner-17.12.1.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
+EBUILD kgoldrunner-17.12.2.ebuild 865 BLAKE2B 07adfe33b82ed75b910c7f70dbf4100c5a50493969a849db89ee07393789d0c19e6ba9b41c8045bfbbb9ad736da5e5cb60e969a5342ffead6760ff93dfaea171 SHA512 bd4e86f8e7e1414ab02cf5e602ac5f288d47e62d78dea0751d87537f083cf01a0b241a5cdac467e62ebb9187f700504e61221623b54010330d0d32cae966204a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-17.12.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-17.12.2.ebuild
index 1377b14402d4..1377b14402d4 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-17.12.1.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-17.12.2.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 85c8b253f26a..68feaa02f386 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-17.08.3.tar.xz 2817416 BLAKE2B 1c8bf494b5ed87021d0fc32e88c0455bfb304bc2b86471b457c258fbb25ce6cf2396f5f8915ed27e63b272c5abef839b73820e841fa685c971b8dd7d10557de9 SHA512 0d941e6b9c8a5ebc87431d5922bbeb9b1bbb15177316bf5f2ac17964a676e81d23f50f0db9d92ca749b3abd67ff86fcac9289ab153da0f9320bb24973c41d1a4
-DIST kgpg-17.12.1.tar.xz 2817848 BLAKE2B 5260c769ec70f75d846fd310f0c239ee618d3e50f9b238a448d81f6f31b8cbc148ed5e60ba4439f765f69395d674fbfef370a7bfc8a7c4d267ef42126a6cff60 SHA512 a498b74465cd6ca7a3540c95d2f3d3385d63872b87a2a40018a7481d1cc3d172a4b47c9d405977bfd924900522e5786626f38d2e5489f16b4ed9d9b300acbfd7
+DIST kgpg-17.12.2.tar.xz 2817624 BLAKE2B a35dcbb0f5bf8512d73bb9dcdf81fc10c5afa1fa625c8b4629ed849534b550a8a3ba93263927d294be40d07009df44f1dfa210f7b9c9ef6dd412e78c9d46581c SHA512 5f5078b0a72d0837d023e89079f7d0206b5952ea437af2eb9ba76d9c3706c7e77e92ded7ae61a5ec18ff5b4b0dc93425b265200fe0acdec43ddccc1eaca9df44
 EBUILD kgpg-17.08.3.ebuild 1275 BLAKE2B 9cd9ec2e959357ec4033840a0b58a61a3de8139d18cc85d66be189e0ced133b9ce07b67e2c431a4fb29dbdefa7078d09204e2e9fb9ad6306e68987ca6725f81c SHA512 5058fceccd745519eecd60e30f586c214b43316573db1c83f45770179a44e69b1962b104e13d3d0e547d2e59d1f5843016a2fff6eac89603b943f93d679ef668
-EBUILD kgpg-17.12.1.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
+EBUILD kgpg-17.12.2.ebuild 1277 BLAKE2B f3f78e4a5b985339c81bec48fc4c8d0de639ee60aaee91d7f2437fb0188f229577d93ef2b21446e94cb4d801eba99a4e1c9c7b8c16a69689e077dc335c2b2e77 SHA512 b2c6c0702e4c46af859b4e13eac465e404ed7f2848b82350603916f5b1030ca3bc62aa103137b337ccbce081077d7f3191199ea4564cdbabefae374f0fae75aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-17.12.1.ebuild b/kde-apps/kgpg/kgpg-17.12.2.ebuild
index 9179f8168592..9179f8168592 100644
--- a/kde-apps/kgpg/kgpg-17.12.1.ebuild
+++ b/kde-apps/kgpg/kgpg-17.12.2.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 8f5d8edc3592..a8a0e1799829 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-17.08.3.tar.xz 6452312 BLAKE2B 1c454033f526e1b72652e9812462248179a868f4c4eef779609e672dd402607222edfbbcef598b2fec19285e635ad239d31b66554b90b72061d3d622af7ae690 SHA512 f7293dc17a6d478754d8ee48787b4d0196f6efad2927961754e1581e995a20bc0cd9f7216cdcf548fca49347ce1e0460edf806ebcf0c1ed80bc43b2b77af1720
-DIST khangman-17.12.1.tar.xz 6452132 BLAKE2B 3929be80a835ed7d85d4cf3055526c5e07d816d69a2aa2a79776c7a0521034a8882d2f2a4dcbcd87a9f5ad057fe3c256d2169adacc86072b72f838feb880590d SHA512 3dc75f136d1e4b1bbfb58e76ef8c783bfbd1cb474b147bf33cab39ac9eea2cec8449069bb7de82aa1e4fb437015efbc6c3f589541dca08a853de7c362c35c446
+DIST khangman-17.12.2.tar.xz 6454644 BLAKE2B 14d415174b4b0802d93245e673095aa6e018dd0a2df5ebeda9ba2b3a5003c238b354448e548ada7c5ca1392b4758656ab7dc0ae9b6818350b075e530a8742061 SHA512 fbaa1ef829f53966ab754d9d2ec2efc184505421c08f2f86cacdd2e05088deb9fead44db9b90556b9b5006dc0630f72ddd49b8b0214b179ffac501f204621000
 EBUILD khangman-17.08.3.ebuild 1039 BLAKE2B cb1c800833ae61e4c33c88d06b3f900f63cfa11f0c485df8149323729404ee1a5287e399aec95a7b9a152300253da6f4e5c842cfb7a630cbec250601c4a1b09d SHA512 d23a4201fed1790c7f730b6c7ace8688c02c31544c5a3f70f135567cf5aa8a6815365fe67026498b86121eb4c8f6c98ddcf85967cd478b6929397161587fd7cd
-EBUILD khangman-17.12.1.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
+EBUILD khangman-17.12.2.ebuild 1041 BLAKE2B 9ed11aa400845ca9377bc3a25671f853076e5f6572cc6d8909748677e8a6485790db332c07175e247bd8a7b91606c8d29a33bb8936cd07688aa3541c27b91d20 SHA512 26d8fc36ac7f2e6e18ce909bc89da18f5ec504b2ffb988f08dab7db2a34aec767c550ef4f91220bfe17c3492a132641dcdf5eb0df29c44d0586ce452012db8c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-17.12.1.ebuild b/kde-apps/khangman/khangman-17.12.2.ebuild
index cb57c5103efc..cb57c5103efc 100644
--- a/kde-apps/khangman/khangman-17.12.1.ebuild
+++ b/kde-apps/khangman/khangman-17.12.2.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 82b2f4e62ce6..adbc85e066a0 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-17.08.3.tar.xz 3024844 BLAKE2B d65e6a0d64d63b4627615d9f51e8574edbb594572d3edb60f29e0fc8e9979766db6ff8bc5c02ff95371540c7cda331b8e9458a7711362f9693e7fae1e510abcd SHA512 49533fbc063422fdd8931165b2465be8c5d6b87b264dc7f4ed6c6d123ac7ff4bea62237eb48cdc2aff2be670a682790936afe8645ad2793a2835169c8c14d107
-DIST khelpcenter-17.12.1.tar.xz 3024796 BLAKE2B 61dc13d8de7123d83ccb2a875079f07571212e9df1ae909ecf549edbd0dfaf8b5bdc9833b8749f4273f13be1059f476fe99a7cd2ccdee8f92b2007d8b8afba7a SHA512 1dee188045d1761410057772af5becb3d4dc18224266faa3b76cd5041847bfe023c8b869c1c09c16e91b952d78aa8fe8a4b9511a5527635e19257e1845ebcf46
+DIST khelpcenter-17.12.2.tar.xz 3024492 BLAKE2B 5b5d8dce1a8f5fe0c3a9e48feb563db3c1e29e142d429658187be9c037cfe5b11a4259b9b604474c9e45775894eff44a5b4c4d42dd0119382687a68ffad1818e SHA512 5f2bca81072a21c26853c66b5ae3fd228c92b8c74474797cf45eddbde0d9954b62c6277957698a30538ef28445f83c6e9ca570a8cfe747762486465dea6db6f8
 EBUILD khelpcenter-17.08.3.ebuild 1074 BLAKE2B 2f40e7939174cfe3bc2de22ea5a4699dbbe65ddecb8a1d61c051cd3d6fbbcc5cc394f6fc1576a051784fc295a31ff826e34c4d02497c7b4b5f7a8c8d6a1c3cbc SHA512 4389769916da88e7fc98f8c186ebc334467f9345f51605b2eb70c9d849e1073a467283f07c0a2055e57404fd4e99bff3b7f352eddfc8a51cfb85fe063831779a
-EBUILD khelpcenter-17.12.1.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
+EBUILD khelpcenter-17.12.2.ebuild 1076 BLAKE2B 486b0db2c0b7c4e56c202eb8a20011af55e91b9e898f843a70442ec051534a092d4ea08504f33c3dd9a2d4732e1ecae20df1f1a1f27bbec56e9e055be95da9e3 SHA512 f3bc0e7f5bf85730e8a81911932ea2280e4c5240e1d63f545a3ef487dac21a8d8ede2cee67119c33915ee1e0a8aa94a7515013a7927bb34493282dbd4404b554
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-17.12.1.ebuild b/kde-apps/khelpcenter/khelpcenter-17.12.2.ebuild
index 7a7d14ca377e..7a7d14ca377e 100644
--- a/kde-apps/khelpcenter/khelpcenter-17.12.1.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-17.12.2.ebuild
diff --git a/kde-apps/kholidays/Manifest b/kde-apps/kholidays/Manifest
index 8e1c1b0762b7..6814ee396071 100644
--- a/kde-apps/kholidays/Manifest
+++ b/kde-apps/kholidays/Manifest
@@ -1,5 +1,3 @@
 DIST kholidays-17.08.3.tar.xz 202580 BLAKE2B 9d98aea2e60039b3dc9f2aaf5c918329a344cfd80ffde18dfa84a7d23ad6dc40c4bf327c7e295dd7da70004744f1cf96ce99bab4cab896680348b137f0dd86dc SHA512 aef4cedf7d621b236cd09b990f9e6e2177d63af1831b17bb5df390a1a182e98f8e9d24a3d8fe7d763d9f7f29bcf6a8e23dd1d6da0bb1e289101aaa50c34fa040
-DIST kholidays-17.12.1.tar.xz 202512 BLAKE2B 3aa9e7c8f0ee35aad38efef73af7f596e9978c7626e64ddc42495bf17275ef62955fb7fa038197ca095e2789be16927b4214296a3cb65389b27f0cc48f7b94b7 SHA512 cc28539f3a64edf6ace5d1afcf3a59683c8d0b421b29cbf1c31c04c3444344c6bae616d50c54a522c0f2f754676e1bb6b75c143f00e5fd6a44c4e5117e605ae3
 EBUILD kholidays-17.08.3.ebuild 586 BLAKE2B 71dd6e096faf45fefe503a7afffca8eecac8876f2d9ff7229d32733b50a3899698978a4fb14c98540bc91565b0285fb21aa81c4b671511bb5d6ba4a81bebad3e SHA512 74d0fcb63edd4824f836f0631f8b2ca5fd8fb4605beae3b0b9964c7f84528b673e0f864fe0c334ab41cac92b237a377016e517c5ac2c0a7633e6d2a778a36d3e
-EBUILD kholidays-17.12.1.ebuild 588 BLAKE2B f862f92310908f41e0a395039b364ce773521ac8223d2fc4c75ea4143dad5ee7d30526781fef846320a8d506c0ce4f22047ee9bd1ec30e16bb47981c8b96e4f0 SHA512 dc99c36561f7793f873cc685d6cd5e321ff81ef9a78c95631b7306afcae96bf1642e67b986d289214416239261d176c0db380bcc7fc9418bcff1a8e6c46d36d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kholidays/kholidays-17.12.1.ebuild b/kde-apps/kholidays/kholidays-17.12.1.ebuild
deleted file mode 100644
index 9442c0f42755..000000000000
--- a/kde-apps/kholidays/kholidays-17.12.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library to determine holidays and other special events for a geographical region"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_test() {
-	# bug 624214
-	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
-	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
-	kde5_src_test
-}
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index cfed34db7746..5461a2786be1 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-17.08.3.tar.xz 147724 BLAKE2B c190256743d11e193905dfb9a3f6701b5874ff733e62236c86df829139337aac3776369ce8027ed4a0744249f7b778f38907a5baf788c36a89a070e85a5c4c5a SHA512 67efacb2ce3c60511677d658158abd4a4c00905408fca0a7c4be07fc63267c2ada5a48a642769c754d58bc8fd75f12f7de72eba8c18cbf3e6bf4c2a771392634
-DIST kidentitymanagement-17.12.1.tar.xz 147712 BLAKE2B bcf3f432fe843c89d9b1859c9e3b09668e538c52b65f30709677b7a4d36a1044a02ab9ce4a9644a576da66b28683d1e994e218a7a07f39c4451f5af02e704c19 SHA512 feda5391b7947db65ace08ed2e9e0bd85c94c01588eb1002e8f8c4669cac6c17443149d8913c3bb9093f5df4f499f66ace5cdd03839f56c130c0886b1ac0bf2d
+DIST kidentitymanagement-17.12.2.tar.xz 148040 BLAKE2B 8ba1b9de4e9bfd9d1abc64d5ceb8d0e0d80ff6e59270c8ec7ae5e85dfae466604b5b261f387fdc9b71fac07d4e03708e0d20f902a174ae42149d5e77fcec251f SHA512 81a97151b0c7db2b44305b479d5673e42dffd04c5d707f2072db92cc44dc40a412e47000b916fce6be941bc59419f6968debe5ad8173852952378d1b801cbd0e
 EBUILD kidentitymanagement-17.08.3.ebuild 768 BLAKE2B 5c2f128f265c50b5caf506eee515bd98b3674aeee6da6f581d73806b5524090e5fad880e210d6f43e0584310980c529464951dbf30d685933026044d867f9216 SHA512 6b2cefe34c6244c713c763d31b137c063fa3404157b2ad746ea7b39db291cd347a92c8de4e5c80f1ab75caaa12e6463cd07ab5bd53bbf5fd197091045a723c40
-EBUILD kidentitymanagement-17.12.1.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
+EBUILD kidentitymanagement-17.12.2.ebuild 770 BLAKE2B 5c57835bf25c9ece4b51ff3f3b728d3f32316c1446c3841432e18b4449cb8e701eaaff6add43f87c3758d0d1d144de9fbb605d31e983244f61861796c4462f9e SHA512 a60c9d8eb988c69225c6db31ce360b7bd096e40e489899f9c0b619591d4dd28fcacd2ec5d325ad76eadb27fe6219eaec317b1cb5d6d388490964271683462dac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.2.ebuild
index 9cc840613bb2..9cc840613bb2 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-17.12.1.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-17.12.2.ebuild
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 172f6014d11a..b6685635f69d 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-17.08.3.tar.xz 3588344 BLAKE2B 37d0e1536f7eb17eb731ea5411de0edc018d87a92d8a401f9fba5100b8533cd4f6daef3dfa8ca0b7e7f1058cd033872219b6ddfb1a6c5b1be33e72641f123566 SHA512 9ce781ee32697fd69274ed5899bef6a176e9dcb118f2aab7dbebde1b3a974fec4d3bf702dd9bf06caf986f304f66cbfd2300554ff7df469035b07fe426f1c025
-DIST kig-17.12.1.tar.xz 3589748 BLAKE2B 286f728cbfec3f9f59d4bf6d8ee95f2f25fd0ff0ea6bd70b911a1765a3db61732019663d03ced71a499cf6b3e0667bc26c245682058fc8aeae8334f2b8a1fa20 SHA512 635082e00c3ecc41cd50651187d7338a37d4eea686a54e689773cf3160c2577cb8a3414abcf136a4c509431809ae20bd7462b0cd705fef64ea38d2db47dbbf9f
+DIST kig-17.12.2.tar.xz 3589624 BLAKE2B 4448562d8a506d9d48d7bfdb6364d7396cfa0c94aca6de0fc990066bdb2aeb81e5fd14e6567e5128e2c3da382a07b54553f8055f9d9c7d31a5e15820d29280f1 SHA512 3bd9496e17e77ed475e6bb6d28ccb5d2a91dd261ffa7a4b3f8a7d5603b3688ca865da7cf1480411646efcc3a24a1f83bcb5078498ed8534d048b69becc71c653
 EBUILD kig-17.08.3.ebuild 1499 BLAKE2B 2c8eba9550d0666ac256fe68c711ceed467f895246147ebc8261005638d4f1c577be9b081127513ddf61b6f0f8761f478aaf611c3b9f83ef1e5f615a1f06d2a1 SHA512 c8757df0e00da55e73fc93bde57b1769b4ce076699c99b7b940abdc0750768f697ce62b61becf6a36ee326e301f14f5b8dd80a29a9e10a9c55d5aa463aea7324
-EBUILD kig-17.12.1.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
+EBUILD kig-17.12.2.ebuild 1501 BLAKE2B 4e253b1af7946157292a42f9386d49629901f0c0be646584d75ed70b86e8e323372df58fae69b0b43b4691963de94f9ba12b6e624c1037da13db03311d100b3b SHA512 519374484f25b8b838c0dc2d4b739be2b1e30e6901748dbd96a9a2d560886c1c0a7be4b120a98786e0d1fe56cafb38583689fb221154afb90d4c06088fd2725e
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-17.12.1.ebuild b/kde-apps/kig/kig-17.12.2.ebuild
index 7e2644a1fb74..7e2644a1fb74 100644
--- a/kde-apps/kig/kig-17.12.1.ebuild
+++ b/kde-apps/kig/kig-17.12.2.ebuild
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 0138e4f90318..72c4a3647874 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-17.08.3.tar.xz 5222016 BLAKE2B 2544496c74592bbd2bb1ca01582c4a5a855f4db7f89d781ef8c74bb23aa1a7723983a3a9f3d68e01c20d6cfcbbe1e47e9f392046033cb7c51ffdd98d52f96c54 SHA512 c6ef6cc70f31be32fd48736fe993e84ad3eecabe3d40df1332b9d5ddad49ef40682f3cc9eb5be75e29bd2df5360b33fcfe66752d560b793fa957bb9dd77b7820
-DIST kigo-17.12.1.tar.xz 5222256 BLAKE2B e7da4f38ecd7218be88b6d259d4d075818626ef5a1b359b2871add6b83838872534318bccedf65ef7fa51efb636beb5898762c53538fdbe80fac4876afcd652c SHA512 cdcc081fa7571bc2af6a75162dbe45a9062168c17e16c35a34d51f7e49de6ed98072d9355bd814e26a4a9a03c0350db970f0dcd567a837220e78b64074d1c8fc
+DIST kigo-17.12.2.tar.xz 5222156 BLAKE2B 470666e2329a12a8dd2efb318ed2adb6332cdd0c7c71d479a51d2e5ed54a8fe23bf5d69ba4d45465354c5324bc2ab2ec4f518e075bc08da52826f1b2357e4dfc SHA512 d758f72efcc797f9b060b6b01065cce4649a69a5031d358ddae3dc3cfc167d9c10cc2ed577089e1dd23925f9ffe3e4d5c5636184678dd1a70ee0715a0b14eb9d
 EBUILD kigo-17.08.3.ebuild 853 BLAKE2B 6ccbcebb69970b98f21dbb0dd69abb33f3cd60eaf8189546d36cb9e0478dde0ee0c9a555884b6da5ef8fa26c1fd4ebfd116fc925da1cd8dff2d1a40aefcf6d2b SHA512 8a182164ffa27296c7f77fbe56eca304317a3beb8a48a14c42362ea559501d5f017ee01b5228285a1a11772e2f457373ff6246dc2380ac5b090bae719d4cb6c7
-EBUILD kigo-17.12.1.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
+EBUILD kigo-17.12.2.ebuild 855 BLAKE2B b7b6b082300f6584f3156865dd32934aa948593c333a3b9b6b77adda18cb267bebdb09c3237423762f9898bccc1a0be561f7360be9e2e12b4448bb251bb555d3 SHA512 72a0cabf0383e7eae958f0b5812afbc7a9e7e868efb38ff2d81274d1a41311e14e7339c74d84f167929d47adf0147227801addccb0ebf2ab8db89ccba3cbe74c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-17.12.1.ebuild b/kde-apps/kigo/kigo-17.12.2.ebuild
index 3dd95da49b6c..3dd95da49b6c 100644
--- a/kde-apps/kigo/kigo-17.12.1.ebuild
+++ b/kde-apps/kigo/kigo-17.12.2.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 3de572059b93..997c9197dd36 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-17.08.3.tar.xz 1166128 BLAKE2B b99c46ae471df1164455d324ec3bb742fb3310e59d47a206f2665a5f961a01e29e5f115d114be6f0a06b2add09c86430fcac0ef6c105105d395d2ae4e8f450e8 SHA512 3582e7ed568c8968e53e761fb581a16027a1d74743f412516e54efd901fd1ddc40fb4bd87ddb3b9616b99621039c4f185e55a6f92dff2756574f3900bb934070
-DIST killbots-17.12.1.tar.xz 1166100 BLAKE2B 53b682377f8b70fd5ead41b28e0e0a6e865e94e5ecda71b578b1403ad4656f269611085f42ea5e8af33007e9420555db165c3ea36eb554538b8fbd92ac743b41 SHA512 1cd32ee7134c5373789c51d7c9e900076781aef5c236fb8a095eb727b89b7ac55ff61ca71c3409d3a62c21293e34e681594a3241ac62ac4e2d778981553cf74f
+DIST killbots-17.12.2.tar.xz 1166060 BLAKE2B f84904edadfb8b8863d86609ad0f650e89360b30b1ca2dab69e9b87961995739f9c1813592b79a94edcbe86962958a7bca49faff54f6808aff819777ca09a925 SHA512 70ce103e39cc35e872d61afbb73d1f5498c35266d1715d56c595db17c9028eb264d7d4486254c3032812e9608812fbef95f935947f7138fca3ba5bd08a0e7f21
 EBUILD killbots-17.08.3.ebuild 715 BLAKE2B b7f22ec795ce033c9ee0693ab7dcf7f2063757d9f0df94b67d000f4e91096593de3bb953d2fc4457ba96cf05d90187763338eed3a8474c6dfa1c1e787332abe3 SHA512 45674c79603b7505b25c7662c7b37b781918f91245c85edcde21453cf8dba673cbb04a797ebce118c28550e37dc4d44249ce0ca85ac0a659b0d6a4522a8574ec
-EBUILD killbots-17.12.1.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
+EBUILD killbots-17.12.2.ebuild 717 BLAKE2B dc4b87bdf1ec9849a50259f97d40bba1ce533d5602fad5a0946806e7016c7dc43a6855866d220c44b09fb0e53e746d415964e7a48e899bd655e4b5d9137cabad SHA512 d56d56fe75a815f7eae1c06f02592ca819ea7bfb06fde0cfcadb1d268e0d9b8e58000e7c252794a7be740607f4ecaaff39cb469e2824ee33cfcd3e34ad12efda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-17.12.1.ebuild b/kde-apps/killbots/killbots-17.12.2.ebuild
index eb0d9bdadcb2..eb0d9bdadcb2 100644
--- a/kde-apps/killbots/killbots-17.12.1.ebuild
+++ b/kde-apps/killbots/killbots-17.12.2.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index 5f4bc3cacfb5..2de366c9a817 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-17.08.3.tar.xz 407148 BLAKE2B fbcd6fa339e3f5a48c885f4eed645143d8208ed61434612a4a2a88a2dd2c8a34567da6155c38ee76768ae89d8dd03cfe89ed37f53347c4fd91f0df8b4a571ae2 SHA512 115b1cc4238fc1c07a2994cb4493598b725aa986d9d69676da0fb7657b31ea1ba960b062e4a84cd0d44e318e8379378c70520402241a49e3a613f545e177a301
-DIST kimagemapeditor-17.12.1.tar.xz 1055076 BLAKE2B 0f44a7b3a14a0f1f2e7de28553eb8d19c29c9383946666a02702d9d78021f56752ff235b117a0f1f452e5d83046858e03784c59bdab8fa780cc778d6bfbfb14e SHA512 70964a73577f6059665ef917b38fbb121d30722e82d9adea627cb20958b78a99482b1519950606508956d35fb83c4ebfd72556934c06a738dd2841b2e52d4c1e
+DIST kimagemapeditor-17.12.2.tar.xz 1054500 BLAKE2B 43c198a88447dda264206ceb8994dd664ef0a100f54887964ddb6309caa4b167c30eaf84c7f6eb8b2beb4e8f84a63af55e8d9265ea8a481db4785a3a484e0552 SHA512 445d6d1eac5e909a695f15e72c5cd35a24f18298328e92c9ac4a378879e29e227e89917eece115c1982d6cfa4534b15fd7f6031d126f84f76be2becee97da093
 EBUILD kimagemapeditor-17.08.3.ebuild 319 BLAKE2B c6829377f1728848c2b428203307000b02f2ac80ff2ac72e8add88b314a693046d58d02ea6bc964e1280fec989a12e5ddbc379d49e68d01e4438fbab7c1e80f6 SHA512 985aa24ffaf07097daebd0e993365ae347c14d523b335ea5c488a505e4be873d9598047b58de9f2a279038fbc02e9f50be8e913b08de1e37248a2a13c21b8263
-EBUILD kimagemapeditor-17.12.1.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
+EBUILD kimagemapeditor-17.12.2.ebuild 805 BLAKE2B fb2f5741989795260a1543150fde839c273dd8c41d33a0b9e20b1cf48078f17dbbac54a3f543720a4a66ba9c12538405f33f234b5bf52c890d6f36ac6d0e1f6a SHA512 09a4ff56d3833b12d11eea326eacab5ddebde43828ca947ee1635655d8efb9d5c0782bd20d78dcef66bba939bf6556074dffce941d37134636df9f5d133896db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.2.ebuild
index a457413fa6e2..a457413fa6e2 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-17.12.1.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-17.12.2.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index d63eda10d89d..998de414bb9a 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-17.08.3.tar.xz 119852 BLAKE2B 8460886f0be75e53985042e9b0c103b379b5c6821e983f5550ac300e883c702812e808b9affc17b6188c9d5e5e385e2687c95dfb5d30acd3debc9974077192a6 SHA512 2945c19eeb04e4e49a496e33ce29ae0c25d7a2613b5d59c26740bd91d7edec02177fee2965d099f36badc6cdf5507dae54676138d8d68d4a23a5a656153f7041
-DIST kimap-17.12.1.tar.xz 119692 BLAKE2B d8f54a190ef1060cdfaf539f8a5ceebae45b5316107cb3d39aed2b5b10deacbad6633058bb363f3433a91b3154085aa4221d4f6fcb917feef9a906a07cf9d90f SHA512 03098dfe1d8d540d353a40e5dd4450eb7cad898636a7986e921d78c615c6a1d6abe5532cd98561db04752c4ebb498c6426bd72d7039344c7d2d6a3ca92323929
+DIST kimap-17.12.2.tar.xz 119656 BLAKE2B 4712a1339d940a2e98319a1ddf5b56cbafe589b5fd7f23cba6f4ee7814734718c27fe55e99865960bcd6d82fcc80377bd33b34b6cc4b69a72b54bb5bb718e27b SHA512 e4342382afc3694476608c561871d175aa1c2f9334e66dd7c8460ea8ffd6e016c48777fe7d9039b0d0934e92b5efba6d32acca3cc05fcff6082fc7aa2db38ac1
 EBUILD kimap-17.08.3.ebuild 608 BLAKE2B 56da5579f6d38b231724b3aa632261a7d82aabad3f848cb1fa5bdad33e68d5bc36f0d607b284aba0c071963fa6dfdaf002bd74aa7b9bc06317a76a5a9eb78f04 SHA512 7a3827f0235841d7375cb6f94951abb1b689514cc075311850f92601663fdef8c7434f88d0a79db12a64d0abbd850c78c94fc0dc200b4fb738109f71fa93cabe
-EBUILD kimap-17.12.1.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
+EBUILD kimap-17.12.2.ebuild 723 BLAKE2B ff74601211e0f90b30ce69f1daa4681b583b45f049455cb3fd51d2d704d28bd2eefcf3245ca7577834d366ecf215363ddc8951c6ac3debee0d8de5c180c94537 SHA512 81a73956d8983e4e526fa3ca3256e345a0c6740dcb1939e177a59212d3beb13716be5ffa5d0a788cc4e88f306b3f2c7c9072975dce8d89ec18fc2ae0f2ff8e85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-17.12.1.ebuild b/kde-apps/kimap/kimap-17.12.2.ebuild
index e7bcd2eec264..e7bcd2eec264 100644
--- a/kde-apps/kimap/kimap-17.12.1.ebuild
+++ b/kde-apps/kimap/kimap-17.12.2.ebuild
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 467f2e9ee75d..f17b187621eb 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,5 @@
 DIST kio-extras-17.08.3.tar.xz 556316 BLAKE2B 9dc5d9b20c459777c2d5ae5445c28a2b7576665a4a6edec5329689fd35be3ab86fddf6bde665c5c0b00570bea01e498f8998796ad244df91db42bfd889ebd84e SHA512 660370a59bf506bdb1ebaddb7de639f67021df4d3c7c26866e35135a66d736cd1dc11fc1a74f880d38b9989f656d14982bf1ddf9b26d6c7e8b1ec81228f6a2e5
-DIST kio-extras-17.12.1.tar.xz 556140 BLAKE2B 9af667bc6fd417c3dc97615ebbe024c881782c6240f20dac9ed2b6b5abb3cf4b8de4949ceeaff0bcdc8d18fefd7c7c68265d00e9b970775aef4d22bdcbda8f1f SHA512 fe322e91a08c0b26b31f92a75826e77376dcec7d83e2cb63e3ae4e7dd424a9c92c0a83b4be643b69c3fc6314007ce252920ed657a16da357330b6fb9b4c641eb
+DIST kio-extras-17.12.2.tar.xz 555752 BLAKE2B 69cce41da17f991c327a84c76cdcaf85ab0b9c4f6f6a967e11342193326a9127daa7a34d717d0840eebbe95057e3987a7f81be79113d2b718e5bbbdd988de469 SHA512 5918057745fa201460c8a21e48e669313dce28c40c26ee663e53997af0a5109c6f8396c9ab6939527bf3d315ec29d23aa865290c3fec12896e47dd0526d07fb1
 EBUILD kio-extras-17.08.3.ebuild 2319 BLAKE2B f3ec58507312f0d326afb2d942c6d88558e94a9f3ed98350cf2ef722266b70e2f9e2ca861282829c4c1ab974ebdd5751d730828f056b55bf88b7f1c95d6e0751 SHA512 e646cd362895575083ff7e8f784db9a3e7b8eb84a06246e7b31fd90fe6569447ca610945066d0ff490b5fc3941035bbafdd538825db9b7e938d67b244090ede1
-EBUILD kio-extras-17.12.1.ebuild 2298 BLAKE2B 4406945ebf87f46534cfeb49ee5fdf216949c621155e08fc19c72bbeea92df7dbbc0e21bf5b40ac35c8e4ef2204f4c0c31887bb5f63760fd27a320d7a0ded710 SHA512 e45ce10f20c7a9b0c5ed3399ff248a193c6b87e3d507841de1342f76f11362ea3db3e1edb911bb0ae915627e34a5218dafbf6eb29a494445f86e4b0f6bb36233
+EBUILD kio-extras-17.12.2.ebuild 2298 BLAKE2B 4406945ebf87f46534cfeb49ee5fdf216949c621155e08fc19c72bbeea92df7dbbc0e21bf5b40ac35c8e4ef2204f4c0c31887bb5f63760fd27a320d7a0ded710 SHA512 e45ce10f20c7a9b0c5ed3399ff248a193c6b87e3d507841de1342f76f11362ea3db3e1edb911bb0ae915627e34a5218dafbf6eb29a494445f86e4b0f6bb36233
 MISC metadata.xml 679 BLAKE2B d5e3be772a13920bb093a4314931eac48f5a398582794ef769869d4f1e7c0d8136a12ebd1ce2fecccaaae99001194533b6c08b34a7f1a1e33c711e233428997a SHA512 018a5237fe9ace1ffba82c4dd5d3a4ce6228244476a163fb01ab5f914262cb20ff77d58e8dcc99713071ceb1764b9bc24fb61a8713001059b057963a9620abf3
diff --git a/kde-apps/kio-extras/kio-extras-17.12.1.ebuild b/kde-apps/kio-extras/kio-extras-17.12.2.ebuild
index 5a1c3d2548f6..5a1c3d2548f6 100644
--- a/kde-apps/kio-extras/kio-extras-17.12.1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-17.12.2.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 2de86fd9fb07..08f3c7d4d49a 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-17.08.3.tar.xz 325888 BLAKE2B a38db05121a419a3ed572ca7d1116d74148ac8132ed3084923ec83739843223be3336ff5e955f6188a156b5b432ab038287866ecd6929557a1eb453d7e613006 SHA512 2f858782e74bb953e1215348b0850f8c33fc0e00cf54e6ce098b0c9cc6de68a6c2a1bf641a6c5d097255db593dce66b0d93d6474a9ff6eb79a9d5418ee37948d
-DIST kiriki-17.12.1.tar.xz 325856 BLAKE2B 5e98a16e0c3b012d138d64b8f6e67677f146455f69a0c25c3ecba4d57b1fb480476b96f10a00bafcded2b749bb3ed4be4e6f5f295dcae18492412bab9a8576ee SHA512 d4a98ee84ffdf557f9a95799ad1b2200b1b4ee9b89be3c73821e608b754e52b5304f1912d919d3f8bf992e6b768039633044c181884bad8a301f854aff47b535
+DIST kiriki-17.12.2.tar.xz 325868 BLAKE2B 85635b28857a3c083d0ad3973431e402b34c57acdd41c4f5d47fa0b520bae90ecd806e30cd56cfca234e42a748623b2233544b95cc02a634b676f35869eb4f56 SHA512 6fcc187cf3cf25cf3056d6388094f203f533506ead4a8dbb77298cb34fb881958449131a1a89047ac59739fb17db448a95a54c04e9afdc85b96225256a03d2a3
 EBUILD kiriki-17.08.3.ebuild 780 BLAKE2B 162e749a3d18a36c6459a3452b450e3a7c788b2508fb49af0347bed34107a96c388c12e33f3828c5f3aee26a4bd804594228c594467997fa50ce04e02828da08 SHA512 a9c920183366f9b22083b383248576a377a1269fdca21eacb77bbc08ef51695a0304d4c35f63efea4297ac67eb2b1e5f04055c5f51f1ac2b25dc3493aa3901cf
-EBUILD kiriki-17.12.1.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
+EBUILD kiriki-17.12.2.ebuild 782 BLAKE2B d4d941f4735a95ce94622cfa97ffdd8d1528c836f28d6569cc35358fd0195566373a2581686f9793457ec04a1ad61495f2c54c035c9fb699af106fbf391bcd81 SHA512 5a251124e885dba2fd70f11b412af3a060060b8fbb4f06cc65419d5c22c7d1463fa4b4d451cf768f0a34ed556f4730e071eca2ab932629f6a5eeb5dbc9a45b5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-17.12.1.ebuild b/kde-apps/kiriki/kiriki-17.12.2.ebuild
index b0d97b3b53b7..b0d97b3b53b7 100644
--- a/kde-apps/kiriki/kiriki-17.12.1.ebuild
+++ b/kde-apps/kiriki/kiriki-17.12.2.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index a19a4ab7675c..18210639af01 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-17.08.3.tar.xz 11555492 BLAKE2B 29314e9c05c323322c4663bd4a584b88ce002f89cb3c2370d4c8e4ec5b45fd8c279ba453292e203fdcb18fd8547d581cbc75ac705bd182b0391a21fdc03c8f3f SHA512 f3186138cb898042bc727bc5c4b4a454d52f461c77c7d4fc8e5c9aa685980957fb3f8b15dfacbacda155323a72208805462987226afefe79b39355178f15db6b
-DIST kiten-17.12.1.tar.xz 11556064 BLAKE2B 34e44f24836c7335ae368cc886e7f74a982633f67a6e5130fe5f24479ac45d39bb49747061aa86820f39c2bba5fd6a2c4f69f775e3173a8ea10e52708a519f37 SHA512 cb0ade7053307aa79125f424cc959d4e0f4d42f82f8c2f509e645ee32ac60428872c114dd7a9499bb7c2d126ac065b7af4be57ce35c68579683c56c43d3f2afd
+DIST kiten-17.12.2.tar.xz 11554904 BLAKE2B 8ae197670c966b078d12c6b87c73f06733b99dfc7527447eaf0be69916f38870e988ff75723db1bb07bf0f77978b438e4290a6a32445e41952537545ef0c3914 SHA512 3c10a77b3ba78cbeaa160ccd6ef1c0cd004c28b18042535a65b735cfaff2b1773ce1d65a15a4da078edb5237a4e45055a193be40d2cbf69d09bc01dae29e584c
 EBUILD kiten-17.08.3.ebuild 811 BLAKE2B 8e8bba88cd39f95eed1e502a3c0403b99cb1045046f346ee28838d5d8a9ce3ff37437bde9e499fdce6c686f7b17917b73deba6c45be2fa125e488d0c6725b064 SHA512 f44ef52fd8bf6901d641ca8086ef9349c4259c0f124ba6b420d7b2efb14a7aa2e740bc80c5549a44b6d40a401e031d4705cec9213ace23afb566fb969bb24d70
-EBUILD kiten-17.12.1.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
+EBUILD kiten-17.12.2.ebuild 813 BLAKE2B 35f2e8a4415df279ec436d66ae69f785107c4f65ce7f8b34cbe06d2938f39c2985599a3ba9aca040ee95a9c6fae7b2b3761ee94d94de3d1616ce343cad141dad SHA512 3829e1ed3036fac31a30e9fac59257db3372191a6186052405d32438ddc5eb1a2e7d0730e638606f18155b3795e7ef36ff1ec276706e0bf16dbd56dd20abfdd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-17.12.1.ebuild b/kde-apps/kiten/kiten-17.12.2.ebuild
index 19dcab41571c..19dcab41571c 100644
--- a/kde-apps/kiten/kiten-17.12.1.ebuild
+++ b/kde-apps/kiten/kiten-17.12.2.ebuild
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 94a6712cd1b9..0149bbc3895b 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-17.08.3.tar.xz 293260 BLAKE2B 774b2781022a03b6add90a4d1b842cec9e42c245329708ac7efc33fbef470ed7c3d8e60839883c4798101df5e5c66a8d22739166ce6e387fc812d1b2e0a2e5ea SHA512 b90e20f7762581a898255cff2cc2760408994be109e838a83c336db20bfb4aae2b3a94fa98816752af0376de175c2cb84ace9b3a6dfd240771bc74fb135516c9
-DIST kjumpingcube-17.12.1.tar.xz 293356 BLAKE2B 4424d2fcd7d2821323ddfc83ef1b44bd3421950d47827f1c1b6d7402fa724e42bf2312bee3395036c27eeb1e8d46d32c2a89929dbbce1c9d824edf4b783f18e6 SHA512 97dab83d42c2f176cde5a17f019b556b3c62f2380695f5183d07623b32012a975040ed0e1cf9f59646c93ca23238a52d656d498be0d7e8df105f13046a9e7be5
+DIST kjumpingcube-17.12.2.tar.xz 293276 BLAKE2B 89dfb747556aaf049f6b1f3c5b89d649d4881bac93169c42bb07d625c9e7da6344ca16ac5738c204c28013c09fb3d59a969e8375a37192bb1d4f0bce00b2f7b4 SHA512 a85b094dc916d01b96a60037173c2e9e298814d575c66408d42de69b20674e65040bb6b4284edb2229b05849776d30e11e197d3d587fb76d7de77c09a3fa3f28
 EBUILD kjumpingcube-17.08.3.ebuild 767 BLAKE2B 85ecf26c2f2201b6af16572cfb7e0adb846a6ca61bee09f7fcfd92a6c07814d1e85970f5c520f91e37a58c13ecd03d6aafa7c0c4717404269b69fb093e976576 SHA512 d4843a5d448449c822566454bd14c61c0a42b29a90a5c1c47222ecf98bb42a686b7ddd1b6e03226b567e3176b7c53fe6659aaca582d489cf60fd242f170593d1
-EBUILD kjumpingcube-17.12.1.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
+EBUILD kjumpingcube-17.12.2.ebuild 769 BLAKE2B a2bd3204739357b90f6f764551ee3a98f89ca63c09bd79e68582d080972591d384adf2e37a882e781e2deb51ad9438ba99115f39287658b4f7579afb7cc52657 SHA512 f94fa9955815fb7fea4b99012e0cfa26b13d4450f4d7bd225067490366f2570d48c026ba18ad5ce62839b145f2a288a7454fb2ea2711cc933ca1999f67323578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-17.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-17.12.2.ebuild
index 24ea87a948d0..24ea87a948d0 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-17.12.1.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-17.12.2.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 10220b810c81..8e6d403553ed 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-17.08.3.tar.xz 154864 BLAKE2B ecf22ab36150da39dcaa34b391864a7e6f7b3d4335e998089c9c7ebf582436aab0bd59cb3e04572dff74b2125ec5c243f8b2413bcb5be71168de4f44e3a30120 SHA512 b32fa8dfc9125a4f944aea710871268c64492cd4753a6be6f48f4bf314f9c66e56493c0d1bec0d3420edb6998971a9e1d941a050c038764e07b323b9dde8be53
-DIST kldap-17.12.1.tar.xz 155140 BLAKE2B e2b1fbea22e8296c4a3849da3bca32fbcc371359f1b93ed77d96e6b0c0141936804a8e035a661cace3f56d495da0c73e77562e3f638921a5984d5a2cdfb3b5a7 SHA512 73d99db7f4f229fb44c90bd52c9929e8460cf44fc5e4ba734faa9e4a97b698afcee929ab23729a60ff0193d27f57bd5d00f4f81a14b882f7a824088de57ceaa3
+DIST kldap-17.12.2.tar.xz 155144 BLAKE2B 39552d4a8e52e2fc2e40996d27e4c2c4a60fd3ced3e490b906711509c027da8c79765852a25af380bb5c45caafe080787762a743de855febd58089a5f64a2900 SHA512 fc14fa15d56c895d9fb71a96c1802db834f2ffcbf06d8e1533d775c7e7b0d2fe36a05e4df33d360468671677558c96656e4d5681e24e34f6dc6513ece9a01b5d
 EBUILD kldap-17.08.3.ebuild 760 BLAKE2B 8d3e294d73c7dd5d9153aa64975c77f71920e1fbd5c881bc1f965ed9dbf4afe9c07ab2708730d6cb64b1a0d35f8c8470ce8bb01fdf2fed100cfc33dc3cc3effe SHA512 87eee96a0bc229e924a7a366eea5fbb34a892e6c2e287f8476bf560fed56933878e2606a401286c7b45f6def55d2f3f374fc83b0b3e02c98ff625294156a8701
-EBUILD kldap-17.12.1.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
+EBUILD kldap-17.12.2.ebuild 762 BLAKE2B 70a07add502728cca0387b5e6b9b98c6c422cb40ec8b3f0e57c2041aff3a81bfd1043a602d392d17e88f2e45baef2b97f9ed0ae76fc09f833d1b79dcde5c0b4e SHA512 185da5965001d19497bb0f83a4819b7e505d86bfc1017b8b5227a88ca252fcbfc96934c581afa06f71ea507027e87c6a6bf2c23b65bd8b7b223cda3b9fca90a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-17.12.1.ebuild b/kde-apps/kldap/kldap-17.12.2.ebuild
index fd1452bcfd54..fd1452bcfd54 100644
--- a/kde-apps/kldap/kldap-17.12.1.ebuild
+++ b/kde-apps/kldap/kldap-17.12.2.ebuild
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 326410138e4c..006b365c05d0 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-17.08.3.tar.xz 1889344 BLAKE2B 758278159bd2069a0d8460e20da06f2400904e634248ed94b077782f01df437869241ec9d590388b205615849191cd36445060c1da58f6cbc0ff169950d1dd80 SHA512 b842b71c7394bed7ed3383b037b2258c72056b81d678350f1f6f4cfa2f75e269eafd45b82b78c3f7cdda659dbd9b2dc273a8d3b0ddd5cdc774277355578bbfe9
-DIST kleopatra-17.12.1.tar.xz 1897856 BLAKE2B 2109ab6d50c2ec134a2364e899a45907de107809f0d1c03bc8edf0cfa58a9c917e543bc6b6ed9db11de7be777ac5eaf6966789735834c85ba1d558d6ec7ccf9f SHA512 ac46b4f5b5e0aec9c9300a364353a887b8d9c6d8ef91a67fdfc8b7b876339b462b89e569ddc16f8f969398e16b2a05d7832036bf12f16ef5362cce371eb3508b
+DIST kleopatra-17.12.2.tar.xz 1897820 BLAKE2B 0236a00f802eb960c2dd5de1598b6e90134462d041e26cd9707e8d2a9047efbcca0dadd52cad1246d58b8d35915becb00762f73760f918cc7143a34921481f33 SHA512 e487d186b3b857929cbbe9023258273890104395b04394fefc7c7bb1a4391c85ff2f52da196ab13500b6d8ad243e646f62922b6dd7d0bee15c32ce92e66347e5
 EBUILD kleopatra-17.08.3.ebuild 1265 BLAKE2B e8ef98107b6827256d85b2bcd9ab555d9eb694ef0e72e7f6ba06245a8c3f0ed42777f24a785c19c97c3fbbf54c7b6278aeccdb7ea98fd93baa2340d4a632def7 SHA512 49a52aabc3e6e0d847ab8541776ebe4b6720a3af250f430c8b503aa970204bcfea75be02c4e94d113e77ae5799c46309036cdb657c11824c1fdab2c33ac847d2
-EBUILD kleopatra-17.12.1.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
+EBUILD kleopatra-17.12.2.ebuild 1325 BLAKE2B c246da8fa42e95769d488fa8f361fc7767fd9050f2d1609db9860bccf19a9d6ad36e21b466c2619870d6a5c05302110deacb3db75176a41b3b1d802a3ef2c6f5 SHA512 2db9c95924ae4a085a79e26866020b2411e7909c6012d81afb140d5af0db2ac03ec2150fcfa24f3afd1c65756bd2b120e1e8617fac1ad711d61523dce5861f5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-17.12.1.ebuild b/kde-apps/kleopatra/kleopatra-17.12.2.ebuild
index 9526ad8ef1bf..9526ad8ef1bf 100644
--- a/kde-apps/kleopatra/kleopatra-17.12.1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-17.12.2.ebuild
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 4e1659465a4f..c91665296e69 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-17.08.3.tar.xz 21712408 BLAKE2B 0bba477d71f60899ec98abbea21fb6ae00e9155a726dd7af60656f572ba28b93240042973dd72494c9aa2fab1ad100f4895529ef2de225be60f670b0c0bdfbb4 SHA512 9c6af3c6ce36c20edb583e27d121024027efb6836aaeb97060bbe6d31ece8b5d93050c8b2bf5fe84c7e40a0dffb2710b403a62dac7aee7eaaf2482427864a9d9
-DIST klettres-17.12.1.tar.xz 21712584 BLAKE2B 21c02b65c524b51b3f87a23c2f768671f95a97110babb867c2cd614e34e115ed78f52151a0c0a0027b03a4f4cf1efcb40460b6ecd20cd77f4914844ca5c1321a SHA512 4825dd75af526077db907d854d9c94aaabb50cd8189e92d8f67a9d92e0aa1277da796b70ce5a35ca3050e092fa9f191851c65ff5fe5a478d434be10410078f47
+DIST klettres-17.12.2.tar.xz 21711804 BLAKE2B c976c4627b8abd3fbd894cc3faa0e9f5bcdd26e3c2866b4508e4c79dc7523264dde2b97b5d81c4b9c07c5b426620181f58f2d7cc31fc1ec1acb194941bcd4289 SHA512 aac1bba83a093db707185ef77d514ac3f6d909065045b6beaaeb277fd03cf9c882ecd1a3ff35b7256e61517effeac302792e8a6e32a5de4c4cd3082aa257609e
 EBUILD klettres-17.08.3.ebuild 771 BLAKE2B f4379e2855d538449c07a1e977ee5e9527bab3d10d89ae9188eea9751bbdfd78fa581b6e62ad4569417c6ec0d115d0c81781751c634bbbc7e606837c6da84aed SHA512 bce02a0904d54706bac9d6c63cb0d2cce4524b9258916d1e63f2e12b3287cd45171d7d083a70e25522d84e0e3c65f115d8424038796d5caf1af64dde72776f1c
-EBUILD klettres-17.12.1.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
+EBUILD klettres-17.12.2.ebuild 773 BLAKE2B ebee50fd20662bd100ecf61df3849f12b49608b2d3989e17749a308c958c125f11f65a898ff793f8df38c074b760b72c642a0f9b5163e4b3f766687f17fcd36b SHA512 cd209d6708323c85846b9a789fc024fe118a59bcaab421200ab7b607119c18695f705f6796d05db09ee429a655c83618eb2ed5bb1cfcb11dac4d560c70a8bd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-17.12.1.ebuild b/kde-apps/klettres/klettres-17.12.2.ebuild
index 5a99090d00ad..5a99090d00ad 100644
--- a/kde-apps/klettres/klettres-17.12.1.ebuild
+++ b/kde-apps/klettres/klettres-17.12.2.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index d5d237b6125a..b396625f9176 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-17.08.3.tar.xz 1410500 BLAKE2B c25e125944ff9060e759223dc53f05237688ff17a851b209b16712d4026195f3224daa19d4618c39058c3ab83b8a7eecbb49cb2e1922c4ab8897040e919d841f SHA512 9633b9f9d82e00ca07f95cd6652e56c362a3a74f663beaf61422330f06620e7df83be6c8eb9764e0f01a93a9ae82c46e88e911e6e93ba0df9273c477a9e6e17a
-DIST klickety-17.12.1.tar.xz 1410352 BLAKE2B 3465960b889a3e131a4c630ad67b333646a7a3853533b45e42019151d4428e7a90c0e4810620dfc8aa491f4462d53d6d34304d35c8f0fb085fb7374b3e34cde4 SHA512 857e76a4f3f04f04b9c5cdbae658e6f32ca8b0578beb9017be167a36fb133c259ea2e118bdd0cf0b6cea94b944c790f4ea91fbac071a656ea5140d6abf9564e2
+DIST klickety-17.12.2.tar.xz 1410376 BLAKE2B 03e5cdf4437634bf467fad8b3a30cf825d5428d2c0257ddf70dc92127c157230de188f6c79badf2fd0d065e0056c0e8118fafe7993b22fc624500cbaf55fbf4e SHA512 d96dd76c8495c68ec52dabf328b0100ddf656ecce0463c65dfd899b46c30e69451c8a94bb00e73a53b492e27c6bb69971532baabba8047cdd063fe65ca8fea64
 EBUILD klickety-17.08.3.ebuild 777 BLAKE2B 43f13ac4a36ed25e282fb0f10821e85b537da3818815d2e8ed98acd64dba19eb6c7b229acfa96721983c23bf88e6f3ee40c0a0cc16ba02caacd748c5e3962a78 SHA512 6e292470843f7830896e714434fc2aee7b96ceeb0ed7279d09da29afb00db6a62a2f8942b3c4570d518d83d4c6209d1aa78aa866b9fadbee6df6904ea466123b
-EBUILD klickety-17.12.1.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
+EBUILD klickety-17.12.2.ebuild 779 BLAKE2B 823d03b8596084535d467a2359c484000ec6616429b2dd968174f29daca821022b90bdf7011d6e0bad92b5271a00976e90987c5416bf15b996c7cd3a9c8ce642 SHA512 b0795f1815438432719b97f1686354757831b20338ccf4a93fae0d10f5bcd6a049117dcb1fb93ae87ee8b0d4422631bc421ab690ba59828733794a1e74c8f920
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-17.12.1.ebuild b/kde-apps/klickety/klickety-17.12.2.ebuild
index 29d07f818c1b..29d07f818c1b 100644
--- a/kde-apps/klickety/klickety-17.12.1.ebuild
+++ b/kde-apps/klickety/klickety-17.12.2.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 83d96b2ab8ef..c7c54012b221 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-17.08.3.tar.xz 1666976 BLAKE2B 26ac347461265c04c11461f81e56cf22e83b68020e18e180274ab7a1191555d3a7cd65e1c61623e385c3d9d326a521baa07106d73f10976587db047810d947be SHA512 830e3adf29d73d0dce14f67a42bc5b38f52d87ba935fdfc4b21d05c8aa1d83c284ed69a120b70927147b3c9173fe2611843e4fd5d7ee7905ccaf9cbf57ca8196
-DIST klines-17.12.1.tar.xz 1667188 BLAKE2B a270cbe74da2e61979e553e69c60416fba118972cab082c4b16bba3d7bf1b6ac94937606c0417ca2fecbde27b0fc56c478f732213e1dd8a158fcf4a2f24449a2 SHA512 753146f47c9b17e6e318f5c08d7a8ba534d264d0ecc1118d4b6c6812f684f5045bf56dfc3cde37204cc8bb2a85d879fdb62fb6f52764b3d59c7d5e5064727c68
+DIST klines-17.12.2.tar.xz 1667344 BLAKE2B 70431eced57a821a3a253cf984a864b0dfa8db11b9cb89ba859bc87b2a2b3b6733ac89eebd211b8de530f11e7bd245feeed4b510ac753149655b857dce16dabe SHA512 d22b242933f61c2c7c8ade81aeed5126a92398fe9754857adebf03adb7d02d88c642f1ac0dc0a3bea8aa62487314e80bf509645cfd642f97c6b7ec617b5379a0
 EBUILD klines-17.08.3.ebuild 786 BLAKE2B d9b66e7afbb0fb8a0e8fefd8f731c42bbd0b469f658da2d120dafcf7628a784b74d96e2299b1ecd542b1c259aff184345b8f5fc652dbcd7bd09fc2808e11141b SHA512 ac9765f806af77feffc77262bf730e812cfe65e071b74d249fe0ba7ec2f294753a15d5e633768738ca8cf998523874a775d835a26aaea7abcc282e37f57229c9
-EBUILD klines-17.12.1.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
+EBUILD klines-17.12.2.ebuild 788 BLAKE2B 6ce27fbd68fdc1bb29f99dc59c5c61080f680882d87bebf95eae4009ef221e69256da0e42d27a60bdc83c90010ed310daf9cc1ffdb32691fb63e636895496ef7 SHA512 19f860eefc5c4c6d070ae2652471c87d38aeff1337b50f8df0091b9b5c1c9955c9b3fc300c14f3e83110c89599d8856d75f8ccb1ff8fd94fa43a0bdd8c849f2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-17.12.1.ebuild b/kde-apps/klines/klines-17.12.2.ebuild
index 7d4775b223b4..7d4775b223b4 100644
--- a/kde-apps/klines/klines-17.12.1.ebuild
+++ b/kde-apps/klines/klines-17.12.2.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 1084dfcb433d..666654844a13 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-17.08.3.tar.xz 587000 BLAKE2B a29cb51cabc1ae3a3fac666333deef11d0d105b9a4e8ca02a235828b80cd3af7dcc0574c5017bcd6adc718f74583e2c8fd43f1a6665b040c8a2a321db67bc671 SHA512 19dd936a28cce60fcc20e0cc962833dd7d7ea010ffd80f22f4bad3d269c16dcefd648179f88a66a01054e91d28aa6e03dc7e3b36939457588c2c6bdb8c418921
-DIST kmag-17.12.1.tar.xz 588232 BLAKE2B d60090f1b3ced290abccd85f97784f2288c4a6bd5384e2a3b18b0b6deec5ce212b99d216ed1dd0a5412dc4073dce2b090ca3f68372db68038378118053db5928 SHA512 27054c85d6080185760abdd7a64f324f9b1263cfdb2f35c973c082fbe5079bf60bde37d2f2541dcd8e7fef765ae12c47bc9b909194fc2853dece76b047bd6669
+DIST kmag-17.12.2.tar.xz 588260 BLAKE2B 8696e99f3c361fe3a1a16b5a498473640344a032ec350fd1b82e80e3dea29ce80432d7afcfe0de2d8dcdbf22aaf75a5e027a2057a4989aadeb45696510312d0f SHA512 c3819d26296e19558b6656c965410e97ff2cbd33b98b1cf8f428df8f7c8827f9d627556a975f246addbe5a1a3e7ebfe8a25195962bd2a218a7f4ebedb5f4793a
 EBUILD kmag-17.08.3.ebuild 857 BLAKE2B bed9b886df7b5fd570d82849cc847c7e5c193253f913e8bce84f0e8035baa7056ca5c318097abe974ae2a4ecb2d7664b1214a5b6512fdff7cd474c4d3a47d772 SHA512 aaa6a2580747195f5dd82501b33a35aae34e37b9e04bcd6cbdb84da8f8f0adb77d87a1241bc57855bdbbaa8ff69608de67229286cb1d8f11776ba3114dfcd024
-EBUILD kmag-17.12.1.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
+EBUILD kmag-17.12.2.ebuild 859 BLAKE2B 09eff3061722d92f59307af5037e312404860cf3bc753d0fd2ca874f5ac0a05ee04a5826877a4aae2db42d5915690d1a64c97f69d84f89a837a72104f3936889 SHA512 806fa0da2c4917e98bee7f4a9ddaae977bc0a16d3a4f0466fa434ecfc1b1d5fd00e112756c16eaafbdaf66986f0558e8ab715b645a416c3d2f7dc84c607243a5
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-17.12.1.ebuild b/kde-apps/kmag/kmag-17.12.2.ebuild
index 78ea685239b2..78ea685239b2 100644
--- a/kde-apps/kmag/kmag-17.12.1.ebuild
+++ b/kde-apps/kmag/kmag-17.12.2.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index bb01862d834a..3908a9331504 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-17.08.3.tar.xz 4084880 BLAKE2B f17bef7b823ffb7c297c1f0639c47ead525bc88c54285b06124cfbb20365cc25ec2dd6034459d5a3a9569020b4fb8a1df2219c28565503c74f5b4ee06541e281 SHA512 672d0201d0ce1451d10158f2824007a820236c5ad4c29e80c46bce34b7944aecb26deff49e4ea77a87c0d423a0d29a0abc2c4732f1fc90388d1342a1294e6d74
-DIST kmahjongg-17.12.1.tar.xz 4084960 BLAKE2B bb141eace28936a1339c59cb53d870351fb2f8ccb3613600c25ed1cc467d47cee114f2b51bc765a22941eafe2295f6bdd7afe03e8e7186eba6d57c387c0181e1 SHA512 56aef8fd5d765c49f8d4471632fea17c5b0578b2a88d27647505cc4360837af19157db68c2c71bc59114d7b6c061302859ee0ca322d83537dc084e44ae28c841
+DIST kmahjongg-17.12.2.tar.xz 4084888 BLAKE2B 861497f354acb60acdd54257b1f1d00fceb865f4111da5b0c35d62265ac50f406edd4569497382c0e56f6a48f9db1af602b9204dfeda40eeca58e5e29c5869fd SHA512 499d1e6eda3094dfbcf1e2535c650341bfc621bc2327a03b66d7539429231f8d6a92fbb360cce49357ad0e7a1bf1c3cdc960f2629a5790ab054a1f595803b41e
 EBUILD kmahjongg-17.08.3.ebuild 919 BLAKE2B 381b279543efcd308045696336fc23b52c36431918fd454970a8842d9bfcef900aa25628c0f24fec6aedfce10e6e7209cb1e83d011c780b9c9c921d37c814ec0 SHA512 3d7fc0836e3d1e32ab91a489cf60466fe27ba37dbc70f737fa15a0cc24ad28d27e23236a2fe4914be955e4a15277e6dca0ffdf2b9f10095cdaf31085f21afddf
-EBUILD kmahjongg-17.12.1.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
+EBUILD kmahjongg-17.12.2.ebuild 921 BLAKE2B 305bdb04b2711bb691601ae5f1601802fe5e6aa29da6962f0a72ba8f6bba065157cc1adc77fe31db30570564d83263a8c7266575c2eb5bec87c0a18964fce7ed SHA512 dcb4016864dfa052e5340a8ca81cd32775ad3b4a40ac5ce56b6100df862e4e1a9aa51e326b43c6403c34b1fed15584184766071af5d1f164b2513216c7a925cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-17.12.1.ebuild b/kde-apps/kmahjongg/kmahjongg-17.12.2.ebuild
index 7f03c60e0f6e..7f03c60e0f6e 100644
--- a/kde-apps/kmahjongg/kmahjongg-17.12.1.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-17.12.2.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 308c182cf2a0..a60dd7b666ad 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-17.08.3.tar.xz 151604 BLAKE2B 70295f1661ae2fd4ab41f4b3ba31cb48b6228806e8dbc090d48791115446d818e5cdc8c916b8c6d12a621405c624f14fadee9e83c54953d4fac3d67eaef318bd SHA512 9ef29eaa88f29b5a89cf4eb5df23f46f916092786155889e49c7d30d4a98e48552260f676f804039b7645fb266bb420424e000bc211c25b3eb720210f9a8491b
-DIST kmail-account-wizard-17.12.1.tar.xz 152000 BLAKE2B 77cb57e26c8f4759ac75c03b876bd1012bdb6c61695eabab5f38f6f4a674c3fe16f02b7cf77a4760fc4622da9ddfef9d11175b48d8324fe56b6f77b74a3cf32d SHA512 dc98d253af866d25330a7ceda3782ff159135998e5b0b09ba3a578e47abe275246e79980a72798d27ccb3e577c7312bef3553d014a4fd7420168bedf2adbdb24
+DIST kmail-account-wizard-17.12.2.tar.xz 153596 BLAKE2B 6e6718e237fb74f3ca57b8e3e6f19d43e80827e0b318606374cc06d2e1e25107eaf3d49cf59b629489bf745a18a828e87df3262282a155e6dd44fd42dc76cf79 SHA512 c9b5fb639f79a4f5e14a7094cd237b70c05176e7d086b93a3c9a66bd30e2a557df8eb2d72471a5172ec1b6d039ed53e6c50e9139aed61f85456eaaac35d54816
 EBUILD kmail-account-wizard-17.08.3.ebuild 1443 BLAKE2B 0a32fbf7844a70e59138a13d0014432ef158140aecab66d3cdc3c5fb89c58c0e0771bafba751bd1083a41dd17e691bbb1f5bffa02fc556703621bdb3e5d15770 SHA512 e86ec7d039b89f4b8debf1a440aad5f2b250e60558c0d8e7c8cddd2b8050d36fee7061e34f113891db7ed8bb9f16d178174a4679d82df4d796b2befa3301dd92
-EBUILD kmail-account-wizard-17.12.1.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
+EBUILD kmail-account-wizard-17.12.2.ebuild 1445 BLAKE2B 7926b75b4a9d5f435c4d4d30a5c59cf1ccb137394f0680b831a09a6106011d8850bbe218751d35965300e2ac6fd323f7385e44152d0b7559169c420ca5168962 SHA512 b8007880b6400c349c7491ffd23cb28f873851ca77e39766dfdcb113eaceb9548e936bc1e47c7409031214b4c26f94dda2a467301b494b81267525044abfc188
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.2.ebuild
index 1d631b73e888..1d631b73e888 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.1.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.12.2.ebuild
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index c483d855558c..2005682195ca 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,6 +1,5 @@
-AUX kmail-17.12.1-applyfilters.patch 1623 BLAKE2B 34cbf7cb63fef036f8f775afbb0c7183f91d7f433532b9dd4ce4dc58389d9a03cda0f537efce4fe2ad11b7b68b282db75d4dc41f5e4b15fcb71bd1357c2de1b3 SHA512 3ef62d848dc7efa3b8d295684ce6cee12ec076e0b41548ecc6407d5b4aed898bad9a2263bbe2d9849eacd4970ad243bcffebff2d25f5205f77d7edf8f9cad561
 DIST kmail-17.08.3.tar.xz 4735776 BLAKE2B 7a83cc6cd7a00b4aa17521f4b3d8af95b8b6c1d229888a5d1b95279ab32615901619a816cc108dc56fa2009f7c52a8b8f8844762588731f30aec28de1ea7a58a SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7
-DIST kmail-17.12.1.tar.xz 4752528 BLAKE2B 1693e819d48eaf10fc1cf61a6e487c47cb0682d5f9cc423501f4576d119ca3668f89a7dd98e379a493b06b204082cc8880c259403132dbd5ddb1ee89b5e091e5 SHA512 2c67cb9f67b11a532309aeea7386c516be413ec2a5670c4aa18ad241edbaf00fb6a7687f57d1771f0aff57208cf43969cc7270060dcd3f0f6fd73fc8aa43645c
+DIST kmail-17.12.2.tar.xz 4751828 BLAKE2B c86cc8a5329886660d4fbc83bd808e3659d5da7a787a2983437ea77a0523dd31a4f0ecc4eec0413b2c9d08ac68dd691319867aa3aa6ece347a20d9df481200b1 SHA512 2fad3d7712f2a6939c014af5583332598b9ec737952ade6762c4d7a8e3128031825df03c6288bd7ac35facf95ebf6d125f2e0e01f5fb5704cc24db3db7b00c59
 EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99
-EBUILD kmail-17.12.1-r1.ebuild 3254 BLAKE2B ccde7c0a6f49a80f5bb5d658c1de083208aea91c9a7c269e1e25467e0cc1781ab7a5bc155794967a67f4253bf51db5cd008e3f37e07584eed4c354c041eac6de SHA512 cac7ca7ac4d9fff3d8ed3986eb9d16c49c0faec7e84b5966422655ce749f6474a2e6bb53e7b4e6513005366060fad8c96df924b082f1dd5650f6810ccd424b33
+EBUILD kmail-17.12.2.ebuild 3203 BLAKE2B 6f6087dc3b093c54c0c467d9284d01627ad77be64a688fc64bec6c94a526e69bf4a17b6b45032a806da1fdb319db7fb8b96de7431a23fc315d03d0d5825f84d1 SHA512 862190655ee234de81599e453aae86780a3164487a05cd45015d4a12c1fcd07a0ccb8882c942418575445c8cd36e251e594b8c54cfd2838926c478b90364dfff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
deleted file mode 100644
index 4952628ecc68..000000000000
--- a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 15 Jan 2018 13:50:15 +0100
-Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore
-
-FIXED-IN: 5.7.2
-BUG: 388953
----
- src/kmmainwidget.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
-index d0edc48..ab0996e 100644
---- a/src/kmmainwidget.cpp
-+++ b/src/kmmainwidget.cpp
-@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions()
-     {
-         mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
-         actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction);
--        connect(mServerSideSubscription, &QAction::triggered,
-+        connect(mApplyAllFiltersFolderAction, &QAction::triggered,
-                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ false);
-                 });
-     }
-@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions()
-     {
-         mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
-         actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction);
--        connect(mServerSideSubscription, &QAction::triggered,
-+        connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered,
-                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ true);
-                 });
-     }
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kmail/kmail-17.12.1-r1.ebuild b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
deleted file mode 100644
index 86fcd8766e47..000000000000
--- a/kde-apps/kmail/kmail-17.12.1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-RESTRICT+=" test" # bug 616878
-
-PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-}
diff --git a/kde-apps/kmail/kmail-17.12.2.ebuild b/kde-apps/kmail/kmail-17.12.2.ebuild
new file mode 100644
index 000000000000..446bd9837650
--- /dev/null
+++ b/kde-apps/kmail/kmail-17.12.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 6b4d1b1450cf..ac7019380a42 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,7 +1,6 @@
 AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
-AUX kmailtransport-17.12.1-draft-message-fix.patch 1103 BLAKE2B e97cdf8f44390c5d0cef047203ad43a9fbd492f6ce305a572f8c6079de27979bfe4854418312b665237c0b724b94785283dbc3c69fed869a2bc5afcd99436c36 SHA512 f96c698b375d60c0eb855993c9d9d44034b8f5686cdbb9a0210d940cc91224dd44121512e10e47cd5895aa7e588882a87acd514628c0e8fddf9b546bc5c2201f
 DIST kmailtransport-17.08.3.tar.xz 232936 BLAKE2B dd6f69e110dcb775e6cfacaaeb51acabda8d50a471e64ea9579313fef4a641a250245b8244c43f9c648a2e38d175d70012af0ca2a7be6ca7918d147e0f79693c SHA512 ad7d4edfcc63945c270e4b89f0b48be47ceddb1962e8051a6d3419bf41ada6c00739e6c75d8af1e30240c01721088e2e78e53227f96dd118da2d243468cdb66f
-DIST kmailtransport-17.12.1.tar.xz 165220 BLAKE2B 0939b06f55aea75ede4121b9f6a8215c018ecf65e35e2a356948316df338fb783008818d4c66e89dab59fdf4076439517e983d73a1c56af7c5d6a9e7c7ec7215 SHA512 56a9e2dffe6418f71587aadd98a98044fabb1fb5818aa52597904071c2301c53425e42759c240ef36c49df70708bbae83b1ebb78b31869ed65624e6eb09c892b
+DIST kmailtransport-17.12.2.tar.xz 165068 BLAKE2B e55db050daf583c46266585f3f0667bbc027f9b9e308f4285db80f80c19051583bb6f948e92b2d48f948b4d73feb471cc9bcd99248ca593c611c003cb3464494 SHA512 d4e33f697f5136343f044b6d9bb1dd507c9a66f4e18f714d7fbc8402c291f42692a9909dd8ce2f115895ebc9d93cd1707c3e5a27e365e91363e6928b8d367029
 EBUILD kmailtransport-17.08.3.ebuild 1157 BLAKE2B a76e53ace05dc677a12306349d303d55332b87c39c0fff5a86d515cd1bf3d16f31dd4e27bb1d46e5dc059a707152ac36460b88192bfe7c1cb1055108bd269f1d SHA512 700d660d2d56dd5ffb051d1bbc6041928e043264bb99253613dff7612a5da0541242c2dd84ccb1d71be538a09e4f34a8a600794270c2b955a3b69964fb781ced
-EBUILD kmailtransport-17.12.1-r1.ebuild 1020 BLAKE2B ae4ef51604991d2a0aaacb033f05b171a92c66d42761a93120c62192a118c78a7d3d2a3c2c584d2fd21fbee8adbb7641b0d4abb15234fbb35e73bd52838adcee SHA512 3f9368deac629a549ceca710a2210b77b74cd645fb7d7e2eefc6bded56946fdcf18638eff93b0cae74ccd7f4ae6fcefe92d80a6ef52d6566842ed3f36eb26c80
+EBUILD kmailtransport-17.12.2.ebuild 975 BLAKE2B 78c0711458f21b99171236609866cf45af83d565cff74e784ec90b863f526f17144c252b4e544f1bef3984e3460f07d0368e87987de0d74290bdbd3f8d792800 SHA512 48a9c8bc71c3f7dbefe2f8c0a239ad4deede5446aafbdd60e2262270579cb7ca7f1317d4fc81f5274d0331272b0885ae08008c6a45730299a628e432bcdab982
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
deleted file mode 100644
index 78a52547561a..000000000000
--- a/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 424f0273dbebd115da6812e0b680fb911f282cd4 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 15 Jan 2018 07:04:47 +0100
-Subject: Fix Bug 388573 - Draft message is confused about mail transport
-
-FIXED-IN: 5.7.2
-BUG: 388573
----
- src/kmailtransport/widgets/transportcombobox.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kmailtransport/widgets/transportcombobox.cpp b/src/kmailtransport/widgets/transportcombobox.cpp
-index b538f98..f198c4e 100644
---- a/src/kmailtransport/widgets/transportcombobox.cpp
-+++ b/src/kmailtransport/widgets/transportcombobox.cpp
-@@ -37,7 +37,7 @@ TransportComboBox::TransportComboBox(QWidget *parent)
-     : QComboBox(parent)
-     , d(new TransportComboBoxPrivate)
- {
--    QMetaObject::invokeMethod(this, "updateComboboxList");
-+    updateComboboxList();
-     connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
-     connect(TransportManager::self(), &TransportManager::transportRemoved, this, &TransportComboBox::transportRemoved);
- }
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
deleted file mode 100644
index a954a87a9c26..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep ksmtp)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-17.11.80-deps.patch"
-	"${FILESDIR}/${P}-draft-message-fix.patch"
-)
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.2.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.2.ebuild
new file mode 100644
index 000000000000..1cd4221e5d16
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep ksmtp)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index f02a11ba6156..edb74b47f3e4 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-17.08.3.tar.xz 24528 BLAKE2B 76dd44cc14640cec245867575373d1b56357e021b7ed8812adc63973673085f00483d44428cdee1078a5e730af7fa29b75c83deb2f952a7deae23db43e6fc552 SHA512 725f10c3e9b3ef062f90094ab82cf9c9c611250043d65cc8494d87e3ba11c098fe02b033ba1373979f84ef99d245849812dc4b2641ddc83f34f7ebba40ffdc7a
-DIST kmbox-17.12.1.tar.xz 24348 BLAKE2B be8a1af1eaa34449f52d4c902285544704dc0c06c52c2c513ac99d525f16bafe979a206288715147c8ef82c3e45dc6c482b5770b983cf59fc9a3967407970fbc SHA512 eb230ab18113375b6460c28bc5b9bcec9330e0589e26d1d73c14f95509186617992b19e39479a9bba3df3510d90b3265254c8f6aa0dcdb93919e450d5a7ed60e
+DIST kmbox-17.12.2.tar.xz 24344 BLAKE2B cb3cd68c24f6864b6c57ab3dfaf7c4fdfd7515e1ddd4edd9de201377ed4a8d5ecf67b5c3b7a0e2e8228c556ae7b73e43f8b1df3f0e8afb766221dac7ada92330 SHA512 bc0c5e77767c6cb97b9658ec96b8d5dbb66ccb145abc77360f98d8cb58e8f78ebe3685be1c6d17a0939f9f3e7e5383cfebd2d377b755ff5d27bb674835ca1dae
 EBUILD kmbox-17.08.3.ebuild 309 BLAKE2B 0b5515f2a596012f5ba5de369110b7a10535bdc8d3bf9efb27732e23b0d71e475e4a2dee251aa26ea8863cff93be2d56b774dae2a05b7dea322ddbaa1b070bfc SHA512 708288cc0d5b69d8f212973aa6ae1067fb85f811c9b598c921683bb520d307ff9673268474a9bbcecb93f397f46c1b31de9328008d45760925a85e5f3eed8153
-EBUILD kmbox-17.12.1.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
+EBUILD kmbox-17.12.2.ebuild 311 BLAKE2B ec5ab4224dc43c1bcd235f6d56af794f20d976d89064385a35010c554615f4239515304e6278c11a09da0602b9ec6b82f6a26977d0dfbbdcf62ca0a3c903f164 SHA512 b88679b1d6e88f7c8e1834d47b2d0f35acc1221e273856c019c0296b8769617afa0084e1664c47c1314ed6c36e568f4cf2ed422a56535799e7477c82f4ad34dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-17.12.1.ebuild b/kde-apps/kmbox/kmbox-17.12.2.ebuild
index aecae880bedf..aecae880bedf 100644
--- a/kde-apps/kmbox/kmbox-17.12.1.ebuild
+++ b/kde-apps/kmbox/kmbox-17.12.2.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index c8ab89863244..2ef149d1ac11 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-17.08.3.tar.xz 146008 BLAKE2B 7fa533dc999a10372f23f72a554f0585fbde2dd4782b829f65760bbdadb1bc5123b2af5a8048bf05bc6fd599a2afa5bcae7caf159be39c69655d1b6683ecd93b SHA512 af95a54dcd5ceb1bf215ec96e752ee4eb06edfb9e4adb1c2e1cac0bd3473e1a14e0d370fd9534fb3ff12b307b7dfc5abd5758231a92c7eacbbc58891adc21bd4
-DIST kmime-17.12.1.tar.xz 146464 BLAKE2B d9f89a145f1a143e1fda8c114aa9042cd6c03220c58897be79f8b9553b04fb2e9ee0d1fa1404f300e1f2d507f50b9132e61e7456bebee70dc31556d8460659aa SHA512 ee07488e36bcf9d16f28246b0a5e7caee4a281311598b87d22ff9acc2ce72347ed48beda3705362e45cae3b84ac629afbbc9eadf2c1d0a167b2c7b899f9d1be7
+DIST kmime-17.12.2.tar.xz 146460 BLAKE2B b2ceca848814c048251a5a43dbec39d66e30b289f3e1ec14303796eea27fdc349118df0af4453247072799c8ed3a6b3591aae151bde31266167600f190d0ba0b SHA512 8687759164779e262ca2923a7fbc60cb37ecc7dd4cf24265ed290829cae4f067d3abbf021f823caeb17483731ee1712652c8cb1c1ce13a3c26b59af00aad2e5d
 EBUILD kmime-17.08.3.ebuild 379 BLAKE2B b2d57743567666bfecfafe12183f94a5a5fce78edfc82b1c7383ae01c55faeff1f43f7d3a1f65af26c25e90d9394b39f114fd49e8ac23462dde15d55ae9d969e SHA512 b1c0deeb7c0ab4d1a9819f976fa0db6027cbfbb7656c133b24a89011eba8a5ee748b6ee7b8b306bf84ac96cd6d33525364d2113dd69c1af1eed2e0381a27b361
-EBUILD kmime-17.12.1.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
+EBUILD kmime-17.12.2.ebuild 381 BLAKE2B 52d676a1e2fbdb96f54c165253d4a8cbe3d1174a6638b3cbbf86eb37042d073150e82f95c03fbe8465a6161c142969568cdbb74dc42e3d55d64ca974be692e7b SHA512 0011bcbc77462fe44c6ad9ee2534528026077eeae7effc8c50beb7210b7c76057639142bacf7447b7f28277b96f52b57f68fc966b97e8bb3df6f9ab3a1fd0dad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-17.12.1.ebuild b/kde-apps/kmime/kmime-17.12.2.ebuild
index 18fc8866db0d..18fc8866db0d 100644
--- a/kde-apps/kmime/kmime-17.12.1.ebuild
+++ b/kde-apps/kmime/kmime-17.12.2.ebuild
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index af20501a319b..bad774f0f54f 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-17.08.3.tar.xz 882428 BLAKE2B 7b051b7f6290ae453b1563e7d17e2bdc99a23f88b1452bad4a9aa614cff4f2c0132958ebe31cb3a11e3b8ba999a1e44bdd655e5bf0dc74f027fef64e9afa6b84 SHA512 d91cdb15a1941823d9d3117737f9c3ec8878a385087530af93153e2f4c125ec19dd27b32ccaec06b22115d24c721f4614072c192ab2a61cda11c5c96688b5879
-DIST kmines-17.12.1.tar.xz 882524 BLAKE2B 3b782e8e975b382fbd14691560a12a6ee3368f948e959fe11d18593b9d063e2483fce6ef83779ab1e17c15c606551ae3e20d82a8f681c7879a29cc99d586e0a0 SHA512 1a2fce1ce40c8bd695fd0e596653eaf9428105415af10e401e267a69e6865b99fc910e439891b08e244f198b8efd3b3fb1bccd675479474a56e7be97f7c5e621
+DIST kmines-17.12.2.tar.xz 882532 BLAKE2B f24cf397cb4f724a73e2a4735a98cd6c09ec558288124989923a6afd2f4dd758d40daeca09933e74d1c68e6ad5a75addf917dd4c713f44ddee532c69d88fd6e5 SHA512 447bcde5189365346d0fb9d752d42e58a0e1517496b262ac04c22ebc06392d7317b4d7b829b5bf3bc4debe0c3797fe6cad9d575cf92d141965c8d3c519cd5ae7
 EBUILD kmines-17.08.3.ebuild 773 BLAKE2B f290a16ad74d46b3f656aa8c430f82f3e0456b48d144b80e22a9985e78540738c1f19d5d8ec568ef0808a939691630dcdb048e4fee65df0a128dc9e9fa90a7dd SHA512 2d6bfe4104e872d3712df8c129ac5ec622447fba1ce60f6d49ea23dc6f276a66b621958e0189158ae45137c0bd0cbe847c6aa16af3b829893a459097c5d3d2c9
-EBUILD kmines-17.12.1.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
+EBUILD kmines-17.12.2.ebuild 775 BLAKE2B b0d600e715c012424b6f5d13f1293b65b2e2ad7b999808cfca0d3565436377bd4884a7674fcdad38007ccf8326d7d6dd682d012bf1539292fd6cbe103cd5c78e SHA512 c4fc7ff0268222cd745be8f5fa449b7e0577f6811c67a330ff1d2036ffb90fb7d87ad225eaaf1de54210e20349772234eb4c81b988761769c080b39e7501ecb1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-17.12.1.ebuild b/kde-apps/kmines/kmines-17.12.2.ebuild
index 517fa32429c5..517fa32429c5 100644
--- a/kde-apps/kmines/kmines-17.12.1.ebuild
+++ b/kde-apps/kmines/kmines-17.12.2.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 4a17a473c190..3411daea4086 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-17.08.3.tar.xz 389064 BLAKE2B 1f6d4d0c062ae2c98606a44329fa19de444aa37fc9b8dabf545054369dce45b5b6f3f025abf9042ec487a8823b45035b2068a49b53686c6acbd0862c795c0e32 SHA512 85c20b74ca755d2407095b6a86ebaacdf41c386120f83d5512f40c0c4b9fbff358add5e3fc9af9fb5d608fada9eeb9b5f6d4b9b3a8b1c02006e122b7f1b1756c
-DIST kmix-17.12.1.tar.xz 1282016 BLAKE2B d8521388dac019c20ab6e94b4519825ddac206352f8c083ce33c1958427ecc651eef6f2ada301f4818a2ecee856914c5c66561e4638aaef40d7ebbf806e23347 SHA512 b51ea833a22f11fab0bb5fb831d8eb465d52fd4332e1553c558431c5be3aa4717c881d59b2ac524817e8b7671357f36dd52d35545a520c282bfc50186dadd17a
+DIST kmix-17.12.2.tar.xz 1282236 BLAKE2B bd4bb6437a45a2e19c41c9f50f9c159871d6ff360e6962506968e7f4bb674372e78116760c4547f17249bd86cfde6d7d5423aafcceeb4f038c9bb07b59f18e2e SHA512 2fc67512e5f2dfa816a77215070e2c7f250169fe6029d7d5be9ab5676e9d22875cfd7ae92dc70153939553bd460934a5b6b45f919557f6ace4216db0c22849aa
 EBUILD kmix-17.08.3.ebuild 1306 BLAKE2B 0803e6f8fc5769bc72c582d7b037fd99f2b5b65cc1dea12dd9e7fbf4d0c2ddcb02b50b0a8d5706e8e45bccadddb7ae912eee46148e85cf5f35ba1a6f0eee0eb3 SHA512 9e79593799e816b9e1d4c8f0fc1a73d4ab8f597f8bfe16dc4d66962a91fe5f18095d3d6cbad04b99171985ce7ff4d363528947be76ef76f8a86a6ce3cea8246a
-EBUILD kmix-17.12.1.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
+EBUILD kmix-17.12.2.ebuild 1259 BLAKE2B a6bbc426ed3368d528f398f4d97b9629312bb2f729d9b36f6cf0f5ad6bad3584253638400dfd62b3204078ef36967e0f5d6cf52be6ff5710cda067eee04ec512 SHA512 96c0bcc813d442a7dfbd28b35984008e3836fb19d7ef865d891329d0eab10b4405b170d722c54d5ee1c5469e34c64454330bb951d430a31358ebde56e5db15cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-17.12.1.ebuild b/kde-apps/kmix/kmix-17.12.2.ebuild
index 768fa6584e01..768fa6584e01 100644
--- a/kde-apps/kmix/kmix-17.12.1.ebuild
+++ b/kde-apps/kmix/kmix-17.12.2.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index 26b63aeb58aa..52218f970bc3 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-17.08.3.tar.xz 110844 BLAKE2B 8e84b9f00457eadd043f5a9508b9409f787e4ee97b58ff0528bbba443703b6904c9754bf7e28a964c77d267f853f1a6bff387e56506efc0e6de6ba3a98be8411 SHA512 e9055fc2914487f0f705fc147e155a9f3e9f79bb6eb506e02c193262aa0621fcd495636eef205bf807488052b4d9ff2acf217d72a9331e2ab4dcd17db37f64d8
-DIST kmousetool-17.12.1.tar.xz 110828 BLAKE2B f565a207d37939dd0a9c669358543b4e702c406316309117877d1ce97a0dc7ee9f620faf80a825823687f69fa4f6acd710bc5b3b27e4c173d9dee7984cfc4dd5 SHA512 409e6d2cc238b3cc0e70ca5b40a691f2b010d5fb017188ef492b29eed922ce91c14356d381d4c394ee5abffe52cf1d0c3108cef8f1c0a5fac690d08b2eb043f8
+DIST kmousetool-17.12.2.tar.xz 110808 BLAKE2B 21d9d89ce5466f16d4fb219c2c778545e9295748a1cc126331b58d57010f673491f93f2407c9318f8e51065ffb28f7d404734ddca6afad8bf5147defe9cd454e SHA512 260b5fa3af4720e8dd0d073fe27246f55127759aed264567631d722afc28ad6e256904e782ff4c64e6f79da3f28c896bda1a5ab1ba37e5ee02e620b5e88f905d
 EBUILD kmousetool-17.08.3.ebuild 816 BLAKE2B d0866b5e963a7b19ef4d72560fee7f2be283127c2dc2d1293b2a127e97237f5f6a5bb2aa82a59e755852ee0319aa5e008e1d50fba047bad35ca7156036bbc18f SHA512 51c0c4322a06f051bf855df511b2a9d0a2ca33f9ad1ec0cc606ceff3e6fa4832719fb2403d7b7e66b7906f38d52eeaacaafbbd91b44ed03a963516ea213c765d
-EBUILD kmousetool-17.12.1.ebuild 818 BLAKE2B 3672770cdaf03ff3fd071c1c36428c231c6f8662536c5c6c3f27cbd9708f3b1ab22e105b80354d5452f967bf3090f33f7ff1de98d5bc81fe13f11db7070b9b35 SHA512 7c0b69e3e9a03bb4b12d843d4e73f310ca2db4b478c85fce540a84881798f53cef17720f4c7093772c6cbc4461ed562c7072b7d9efcb4755791c955c7957a512
+EBUILD kmousetool-17.12.2.ebuild 818 BLAKE2B 3672770cdaf03ff3fd071c1c36428c231c6f8662536c5c6c3f27cbd9708f3b1ab22e105b80354d5452f967bf3090f33f7ff1de98d5bc81fe13f11db7070b9b35 SHA512 7c0b69e3e9a03bb4b12d843d4e73f310ca2db4b478c85fce540a84881798f53cef17720f4c7093772c6cbc4461ed562c7072b7d9efcb4755791c955c7957a512
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-17.12.1.ebuild b/kde-apps/kmousetool/kmousetool-17.12.2.ebuild
index ed8aa9a18385..ed8aa9a18385 100644
--- a/kde-apps/kmousetool/kmousetool-17.12.1.ebuild
+++ b/kde-apps/kmousetool/kmousetool-17.12.2.ebuild
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index ff417035802d..e82a6057a12e 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-17.08.3.tar.xz 277600 BLAKE2B 069db0bfaaf5e808f1aa90123e474b478a4b6b271ecc5b2d73a6f49cbef695d4c4ff86bc1fea8ce1be87cf1d1db9e3aaaa88f86fa4bfec56a1eec2d3cd8f8a38 SHA512 7e12e71149089835d17e07414c6125cda1cc9c9354fd5f2838868fd31d0b0a8082a18ad04c594f8c5a2db1f9a0fad75be764da8ed70976695fc5ec6f2e436820
-DIST kmouth-17.12.1.tar.xz 1824028 BLAKE2B 5276071622b9f2cfac5fc8164198888706b73d3d7d8529ae8d2fa6c377cbe45bea77a5ee2c099288a4a9422ee03497399d579f5049d30451ee287a1a68b2dae2 SHA512 ef6de27a036b3825861190906d7f33b70da44c314dae352fa3e55b081ed47a6f05559a152e7cb4222c952b5ccde0ca30cc43794f2b8aec3d0250037f1ffd93f4
+DIST kmouth-17.12.2.tar.xz 1823860 BLAKE2B 916272157a5117d082e500262adea01f3dc5e704a28cd43f36ade3667c5880aa3e4141b51a191683a1b36fffd5b935a33312ec09bc2c57b696d91e98fc85e34c SHA512 f22d2c3ca1b86fb51309dcdf046090bdd593af78386ff4553d389bd9aafffee23fedb10906872b6db00821e4b9ec4473c4159782ce40e3682a619525093ad2d3
 EBUILD kmouth-17.08.3.ebuild 333 BLAKE2B 31107940d9712f3a7047ee2f595da14be0a814ca46dc2bf439747e1c1e987c1e787044c548af965e1466aea92502d9ae0f0944c3eaa97881189b9df8fa820520 SHA512 4e11f709b65bda08d471da1ff65eab29021e6ddf28f76334c75b2d5e1692e86ddaa06c23375336c515999e4108b1fb6291da831a3b881e3054fce97662207b75
-EBUILD kmouth-17.12.1.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
+EBUILD kmouth-17.12.2.ebuild 772 BLAKE2B 8b5ca8777554aa552b6451d9eac8f6f9e40d59b39642c344b8f5576a9ea5dec215fece9321ef6bb90aff548766e2c1603425242cfbfd6839fd13840755e99172 SHA512 e5dec01f18741b121eaa940b2c39eac03d61043620dde414eb1bed4dc704b2c279b6b4e4a337050eeedd61ea36cfc6f9ca20f2b6fce4165848a042fe5be86304
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-17.12.1.ebuild b/kde-apps/kmouth/kmouth-17.12.2.ebuild
index c648621058fb..c648621058fb 100644
--- a/kde-apps/kmouth/kmouth-17.12.1.ebuild
+++ b/kde-apps/kmouth/kmouth-17.12.2.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 5abf0b2eec0a..07e10bc0e369 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-17.08.3.tar.xz 3024380 BLAKE2B 660e4d606617ed45d46610263afbaf61d9c38a14c54379035a532b82d5b8ab19a6ad8bcc885a9f7f55d1a026e0b51aad6e9e4e8d56ad21025bb1267b55c0993f SHA512 1244e73479bbc9ab2f565ac0e195a53683469f6c5e73664093bb3463e20eec13dd7cb3d880d40127bbf79541da150238aea7754a23a1183d816fa4255c4f921a
-DIST kmplot-17.12.1.tar.xz 3024536 BLAKE2B c36ac17927ad57a5ee11d4e918cee6d2bf697ab325af23e2f961872ffd89e6c9b8ffed39a2a6af8b0de70435decb586d5cc6ec59af822cfb2644a0236a463de9 SHA512 be4d911de133072c48b02ed3ab2eea7f48447bb7130da2f32634e3bd9f7239636ff7e6b4cbfe08397cdceb798eaa936290328efb2929e5e27c8b9bd8596b3aab
+DIST kmplot-17.12.2.tar.xz 3024788 BLAKE2B 57923bf1c41cee0b133b2b0b11d3a2783df7a572ce026e21f5e3ed2d28460b432d64274a94668a07a749c57e46192a45eb2f29a1ed996d7da69ae5fd3b43adfa SHA512 c58acfc3847993e075b6099a694fe484064298ec7c2e7f3671b6c58cc76125817f41e1c7d0096483163a6b3dce8f8b802cbf0a0c882bbbcb2b70e8cafbf4c6ca
 EBUILD kmplot-17.08.3.ebuild 930 BLAKE2B 5b7c80ec17559d7b564d2f2d46df1d03d12b5b5b6072ccca83405f673880700d3465d618008a7f277a904897566f99dcfccf5be4c6db0360b9c55da8497f93bc SHA512 3fb640958c0532ea587268e4a78b1d93643e280dab5a11b38a0c099721975422ee3eb5cdd052daa3003e6b55b5bc134863b8b934d2de438b0ff663bc9d1a7762
-EBUILD kmplot-17.12.1.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
+EBUILD kmplot-17.12.2.ebuild 932 BLAKE2B 34fd54c966744b264388baa2dd271f98e3170df02333cdac402fd2189d221e9dc9fefc7e70671ad1ef8cad41c3e0b4835a54ecc888ffe02b481801c3096f6692 SHA512 3c10eabb2745eac8c98a436bd1ea9958bfa24a3c75912a5333c5a37dfbf1c8bca69ba3987cfdf1b31ee35f88c15f35c0611d97a14f0aab65fe3ac32220ded28c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-17.12.1.ebuild b/kde-apps/kmplot/kmplot-17.12.2.ebuild
index 029f91d4ded4..029f91d4ded4 100644
--- a/kde-apps/kmplot/kmplot-17.12.1.ebuild
+++ b/kde-apps/kmplot/kmplot-17.12.2.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 54349399c367..ddeb4b208b30 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-17.08.3.tar.xz 1219792 BLAKE2B 481f39a1290791cb99e463ddacd5a915aa897dfac98323392fa19984b8542f281ac9e38944774da49e730f589a0aa9a9f84f1d5fe1dff9ea77c1802d63e1a534 SHA512 f6fdad0dc209e66a01a43af9b9c0bb02a9af71ff12673193bcaf4025237a1a730d8becfef9dd7228ae71ee751f7fbda56c3c0736851b7aaf9bfc82f3e757f4c0
-DIST knavalbattle-17.12.1.tar.xz 1220024 BLAKE2B 2bcee3ef49d5568d605b613d3d966eb6ed84dc6d5ee47f6fde75d88067e80b9cf3d53c9051b6894173dc4c8837721e0963a90c70323f40a428b72ea47efdc354 SHA512 766d7b4e1661a9173381b2c060ef73321c08b49954d898e22dfe776f83b0015ae5ee7c554a10048ae5b7145a35f669e09dc61e5fb5851be392ee0150e795f68a
+DIST knavalbattle-17.12.2.tar.xz 1219960 BLAKE2B b425f6bbbe77c2e00e5227057c2f2c05a2e8488529fd9658f9a6d0236bfc02f8c5b819b87424ee211c9fb1435ad7731eccb8d63d4477e30cbfaf293484ae002e SHA512 6b7ed60791e9bc2ab2af1cbc5979a28f7c2356c37cc8b5e7d8a24d43f5952473d1c6e51ced6635734c9829a2b112bf67b39cff194b3f97940b5964f1ddbc9850
 EBUILD knavalbattle-17.08.3.ebuild 872 BLAKE2B 8cdb2dc7dbed6f25697b2a8baa4bdb5320562c12f4d88f84abae0d6c99cd5e1fa19048b916fa8b422660a92000ab0985419f73633b9c0319b80d09030cd275e6 SHA512 75ad29081775f7975d290199066821d96915614e44d6568530cf7d34cd24722f939d19653fdcff8762b4bf335580391a1cd9c9c6dcd89a164ded86ce0749e085
-EBUILD knavalbattle-17.12.1.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
+EBUILD knavalbattle-17.12.2.ebuild 874 BLAKE2B 0a4214d170991f89f402a8ea61dc85a4aff52cb4d9ed54db23cbf63f639d4f1b0eb9ea835673a3888bebb479ad88f6ec0c23caa81dbe30bb14305788f8e6c6ec SHA512 7bd9501435861e85526502a20f16aabb2115c0c805687ba3b7ad759b03cfbfebb2f762954e7476a54206e257af398c76bdc3c780e1444afa41afd579931d4e8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-17.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-17.12.2.ebuild
index aa760fb43133..aa760fb43133 100644
--- a/kde-apps/knavalbattle/knavalbattle-17.12.1.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-17.12.2.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 3637e110af8a..617152f3a8fb 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-17.08.3.tar.xz 981584 BLAKE2B d78f06884a1e4e155d35d5d1a0a11cd3380e1e7fed25e8225550119a7a98409f14d8c6e37dc415e84663f9d9eaf10067978cdf883f4d432f85cae95faf8225d2 SHA512 31d1ceb332f7394517bed394d11dd9669d463950491878f47ed007e51b38dbbd3885a0be370ab4588f6c415bdb98ec6ef74ad79d52b04c84dad99e5d06812f5a
-DIST knetwalk-17.12.1.tar.xz 981672 BLAKE2B 5deca4fde3e23212caa095e84cee6361d47d4e613b304a2dc0e2a920048f9aee1af550e76097d532aecec239dab3e34ee4e7f2241616a7db51668349d480f54b SHA512 d990f908b570a3a124656f291b46aad69e9f356bdef496849459f615df8372256aa55afde507aa8b7866250aa59cdd6fe42f538ab715bf837f6d5dbe69ef08ba
+DIST knetwalk-17.12.2.tar.xz 981428 BLAKE2B 2d61fd01f325b8d3049f00ee66c089338e6f6c3795dbe8ac5b21a587bd6d990fe5c1bc859bdf7925383bc36a3d7c07925b73e0d5389c0c70d95dad059fb7ee9d SHA512 13f41a215694c3581ccd6ce4a508701dc043824523ee5d17c3011448d2f43209133bc0cb64453b3d9d2b08aaad0b0914a1a41e82f555c9f5f3317606ebb17dfd
 EBUILD knetwalk-17.08.3.ebuild 864 BLAKE2B 783503ee49ba965e2191974964c6ecf5ec69ee28bffa563bc99859803d0f70e38148ace05e9194da9c5bdd0be0a96cdad66561445720b4ed2c61de6eca3af06a SHA512 a4e9f6bfa81d937880adc983589fd06dc91ce58ee360c00abd8a4150cf146bb0c23e28e499e8a46427638f83efa0ea138767c7a3a6cbae563e65d59e560b15f9
-EBUILD knetwalk-17.12.1.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
+EBUILD knetwalk-17.12.2.ebuild 866 BLAKE2B 9504fee5cc5ff740aec0f22f3b86e09dd4178c363bb3d3520a485957e1ef76f24760755638fad19a125dada4cc561e079b524daaab674bb48d1029dee1187496 SHA512 078ee1be05e95a9013294b346e0db0b4711d17723922f421f6b928d218ed694e483a59851dc1f9f19507cd92c2e5cdd4999370712a145cfd2564b0473cd82fea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-17.12.1.ebuild b/kde-apps/knetwalk/knetwalk-17.12.2.ebuild
index cd1421b84e74..cd1421b84e74 100644
--- a/kde-apps/knetwalk/knetwalk-17.12.1.ebuild
+++ b/kde-apps/knetwalk/knetwalk-17.12.2.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 5cebf37b7500..d07e667f63a2 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-17.08.3.tar.xz 334728 BLAKE2B 61c39c4f065d7c763cf1f9de45a2d84b1b7d71c616d266d6a9dc656e192513694d5d2f1e991520d912012ccd0c8b43b65f5caddaef473597e0b81bdb79d31fc9 SHA512 8afc903cec73283faba5d0f908004fc965ff501aec78904dc2383ccab8956b343dd135f58214372262e509298e57bf9d816067ff1cf18d592acdec97204dfd0d
-DIST knotes-17.12.1.tar.xz 336344 BLAKE2B 83827ee2b07ce82b32f4d399b7f1fbd1260fc5504d05e1f40021961c93ab02ea762270ef62a65c723e224a5fdf7794858439c88cf1f988d2d84187624121e8ec SHA512 5f98fe0115a3f74097159e03722442a72a4b23a16f15fdcd7e1c8ba0c513c6fb54e42e986a37112b967b890cbce713da77e8e3a082cb34352e78f4f706aa0674
+DIST knotes-17.12.2.tar.xz 336592 BLAKE2B 4a2e30a84468937be5d049bee971893e8020b7a97f446791e4e25ee654b1016f46fe9eadafc9bcf8d241757a49a9ab556cb3332063f80d2bc78743bab8164ca7 SHA512 3f5f7b7b8269848cbb3f6bafdbbb87be02606140799970e947a2d176a255fc76c1746e09f68cfbf2c370aa386d50210c4c5f92d9fc2a6db3ffb08dcf103bee7b
 EBUILD knotes-17.08.3.ebuild 1849 BLAKE2B cd7b44cf1d05972ba163a3114422e9d48aec63cb3b841e8aa2f1ec7e002ec6cfbc9946392bc0e9cb0013a6fa7773d48a43c1c7cef8c4dd273f059221ccd99141 SHA512 cff4ab0675684b20866543c8726205b40e6479332b171003bc9ff299175d171a665d20e2c3074ffd168771030831c1ad55a061b986b074dfce033e1ecb5abae1
-EBUILD knotes-17.12.1.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
+EBUILD knotes-17.12.2.ebuild 1851 BLAKE2B bada3858e1dc27170d669f330da0ad3b88857e484eaf06119bcab5bdb9900ae05958908412bf53fc701c07769c1de246c3fa227cbe139f9c3fa4d2e3aea5a05e SHA512 4a847cb9b48503bcba01629ab034fe83774d603960eabd8c3317eb2c5de3ddf92998f6a34a5eb10f44b7cc02331c880f1a66593ded255e782fb77f422d0a906f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-17.12.1.ebuild b/kde-apps/knotes/knotes-17.12.2.ebuild
index 95df2eeed40a..95df2eeed40a 100644
--- a/kde-apps/knotes/knotes-17.12.1.ebuild
+++ b/kde-apps/knotes/knotes-17.12.2.ebuild
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 116e1d49567c..0a370868c038 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-17.08.3.tar.xz 772916 BLAKE2B 542c17ee6be5543862c14c933054a21645c20ef18d8fa85b2499204ceac4e1ccc627595123914c64f85095d0e070a9e6f0e4c3d483197b43be15c0e82accf68b SHA512 0c3b8a48d592598f0573b925e84e02a540c4c54f9f34e1ffa6c619c193cda6a9aa4c584a465cf3faab08c18c143e665d2a33752c9dbe01706dc6751250ae58ef
-DIST kolf-17.12.1.tar.xz 925016 BLAKE2B 4bf5649d112fe1cffd6dc78f3df8f13b2de48caa3b65c00aeff9d4e156e452edb6f3f97c75deca531071274ba1d6be6db86371f6c274893928129ae34d675047 SHA512 bf83de8f4b01466b3d3221373f07586dca262812e72d1ab52125510216cce5e8d3f3152eccd2fff76b8ad63599b259e1088b58df313b0b921c8775cd76fc2d27
+DIST kolf-17.12.2.tar.xz 925024 BLAKE2B 0e1fd2edde850db0ed373f156076edf7517b4db13c3ff16086d8d1f27d7e01840997a71b7d6e417a28ee0970022f6fbe68a4b16cb58dbafee724999772086240 SHA512 0a89e4eb06db86ae3b82108184376508aeb6de16478e91745caf6a00554260a648d96397d7986319fc48220526e589eeec4426bdb65cd6dcea319377a7f98bc1
 EBUILD kolf-17.08.3.ebuild 420 BLAKE2B 62e22e0836777725e06657e37d3dcfa8e8ffc8f90b0e7b3bf3c7313efa713a6d395f5d8d91a81d727bff169703efcf69e27528c9b930e534398195f7718d35bd SHA512 1231d9e0a9872945842cba4cc51f009d6941030e0ce153d2eec4ed29e4afa3eb230f15fcec50df8f69aaee783690dad5bdd4895bc1f483a762c3416e553b0135
-EBUILD kolf-17.12.1.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
+EBUILD kolf-17.12.2.ebuild 817 BLAKE2B 1da1133b078288f0198bdb6afada8cbbd4f9f5edb05bf02c57e4788e3b916b3d9464a46947fc455e5dc54b0502968fe9071b9cd3cf8dd31bc114c1dba20134f3 SHA512 d253cb1657b52798e4131ca7b6d48df356693d716195665268194b1b4b21338aaaff5ced2373619f09be9253c80e1aba49e419ac0c76ef9925dea1c6353f82fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-17.12.1.ebuild b/kde-apps/kolf/kolf-17.12.2.ebuild
index c4fe51941993..c4fe51941993 100644
--- a/kde-apps/kolf/kolf-17.12.1.ebuild
+++ b/kde-apps/kolf/kolf-17.12.2.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 7ce42030f6a6..4c15aafb51df 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-17.08.3.tar.xz 272024 BLAKE2B 92394cd030a90b24fbb6a3e9a965a1483b25f775fefc8cb7953d0a21152aaa345de77d7a6e80558bd7e536c92525b6cd29fcb29c6ed09be5ea6528f73df6190e SHA512 23fc8cc8a69d09ceb8682f3825f146cd2786c0306df5e93b19b93ced1c02c39e25dafa552e5f284abd54abbe97ccd0130b744a24b1eb0fbf4946d44ee51daef0
-DIST kollision-17.12.1.tar.xz 272016 BLAKE2B 266e8975d87ea15193662d178ff0a8e160956fbf7c0462553925b7a4a965549be00393bafd48ea3cd98d233d9d4563fbe40a9245ce0323fdb88cfd10ae6559c3 SHA512 e8b9a1a2500cdecd8bd8fa1f974f5c7a3a361e37328d343c8df66a7a52ebf8b417dce6a73f99367b218c9315ec3ecb63d85775fdb0adb5620af02fdb663fce6b
+DIST kollision-17.12.2.tar.xz 272016 BLAKE2B 1606b1dc0b069aca0bf119eb70a5d62e001d73c50b5283f380692bf881328bb521811180d70c63dca8ae3ad49b318cbb010bbb5dec9ed2ee50dea19d33222d5a SHA512 dd2b009858063a10e917ab0a71fc5ef799b91c3565807d525bc5357df18c8e1b89ec63e5975d8c41822451189ea651d0920cecc753577da3453a0e1e9ce8970c
 EBUILD kollision-17.08.3.ebuild 677 BLAKE2B 2e5e58aeefb6904df666285a73178ec75a5369cdf0412b499fb78bb0374083843840dd80f2168ffae00ae40f4ed6631fe0ef2c654a9629f26dbe3611c663d055 SHA512 ae88bec7edfe26b806a15b29a14fc317a757858e2081e15424b1db834b0930f2c2a17fc3e222a86243b3e2b86eae3b0e24cde1237a1519be276910c656029600
-EBUILD kollision-17.12.1.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
+EBUILD kollision-17.12.2.ebuild 679 BLAKE2B 6c6b183428a7eefcc27771c0a57339e65830ba080e48ed47cbdbe387576f06412926368fc6e730a9dbb692539b86b9437f402c2fc4d650d23d46e15290551328 SHA512 d377731ce231e3e3ac3026fcedd6455cf361bf848d7d26be944dd67827fb33e1c1f728b064848c396abb5eb25f094500ff10bdabed3197fb781ec4a7c8ca5af3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-17.12.1.ebuild b/kde-apps/kollision/kollision-17.12.2.ebuild
index 159531afe066..159531afe066 100644
--- a/kde-apps/kollision/kollision-17.12.1.ebuild
+++ b/kde-apps/kollision/kollision-17.12.2.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index f0b033e5aa05..71c3739c8789 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-17.08.3.tar.xz 5546536 BLAKE2B 14f1950f8b9cf0af985998489b7a369ad64ebf531d1a3c8763236114bb076db9a530c2950d877cf854067b02374eccf3367e9ef7694f46d0bf0bee4c8da4ce42 SHA512 4b7ff817eb8d35ae7d0d9c4f96036b1236d974e08f2db79080658b7b7b78111deaf23340f0216c9c60c367324cd36f4d62470220ab1bff27f6277c2a09b3dce2
-DIST kolourpaint-17.12.1.tar.xz 5546824 BLAKE2B 2660b1c4d3736d1584fef23837e4283af67850e6719a3e3ed55fae04782f43c8652d3cc78b01f9e5736ae2f0e4a99f339b800fd99460a189a5a949517b5a0ae4 SHA512 194195fa8cab3ace61c3d17fcb13f291bdf258a6ba552fd52987271b65716ebfd771f31392f52bd1312b055a6ba897e91c658f917a1fbd60b403e69f62ac4462
+DIST kolourpaint-17.12.2.tar.xz 5546252 BLAKE2B 048834050ac08dbda184c7d96e3c7170b67bb1e5b8bb5c719acc9cabeb7f1a14e19b9397a1c5a2acd4ddc296ae8737a7ce03cd07f81693c99193e9586dd80976 SHA512 47965664a9749fad289f24975eddac726b266351820c2f94a82f714825d53c9bd6c37ff6f2cc30d47f8be759554c8f9682504e9b2acb4e95751b474f443fd527
 EBUILD kolourpaint-17.08.3.ebuild 1034 BLAKE2B 02f39ff7a3942020fc2a192d10d3214cc8909a1bdfc1eb5ebe57ddb9a9985de7d1a4c8d9754854d07fb89ccd7f41614ea7ec0ad1a8341c95c01690a6589ddfd0 SHA512 5ec98140f17a4ee634c73e374798bb90fc566b94f31c1d4adbec18fc53f3baccc1cc583f9a52f58d866e9d5b6774e03a2504cfd3e56c80f58db77b336afe84bc
-EBUILD kolourpaint-17.12.1.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
+EBUILD kolourpaint-17.12.2.ebuild 1036 BLAKE2B df3ded586352185271f0fd744a2a07c8523a8bfad034cba22b576c1431fc8965bf2b4ad605fa02c173ed1503146ee9b135fb37074fc68400c069e6b995f917fe SHA512 a0454ea658f33609cf469aa8c5d808078d7bf19155f8bedaa6562cac479385ea21912f487b189a1ce92a2c1e07dc171da889736f6a966628ca23f24a9f36496d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-17.12.1.ebuild b/kde-apps/kolourpaint/kolourpaint-17.12.2.ebuild
index 5052eeec56d2..5052eeec56d2 100644
--- a/kde-apps/kolourpaint/kolourpaint-17.12.1.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-17.12.2.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index a8ea265e8b4b..9cdd86a74408 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-17.08.3.tar.xz 710592 BLAKE2B d0e30fd2f5a960d4ae621e04b5bbe0a906733bc03106bb264a20f89ce4b2f2c953542c6f1d1229208dbfa0c1c1be2d765f57301a5c324e06b9dd0d664c4954c9 SHA512 4e8145e0a5b9311511787228f510f0f7c5c8fcf498b4e41b2cbae4a77bac5989b0ed430eb324ccd1f3206fb05c1cfa754ef80a67db2de02c66d59f7939680d2f
-DIST kompare-17.12.1.tar.xz 712096 BLAKE2B 033386a0c4e5ed2f123971d2d21f0c52d0ba3626aab08352fafb8c0203cb4e279fa8dc7b9600c190d0f31a92242eb94e3f6f2659fd2e6d9a45ba58dc7eec1f00 SHA512 82c0c0117784ec7317f031bcd25da21421b55544276b7d087f41a8216998ec0d49c3af11a3e6d1a6399303f4d4dd2c93b56cdad51b487098898d957bba336535
+DIST kompare-17.12.2.tar.xz 711996 BLAKE2B c5bdd4fcb0ebc5e2224107f33f61075e695842e2dd1ac52bdf5dcc39e13b6e16bf09851b75e1a5779ff225146f2767fdd2d023a7f9b95f4caae0204872081ee1 SHA512 63a25dd43d316dd1efab24cd4284ae185dcd73c3e0504de7607a2c855c449314a9bd316a395bfe071690511937b058ef703450e18030c57e757603f725af07ec
 EBUILD kompare-17.08.3.ebuild 957 BLAKE2B 15610f31a0581826c4f731e1bed69145c23f2ec9fe122be0225b904693243c675877b08a45ed5d411910d8e7876ebfb7002eaadbc08458a37528d105d5dde6c0 SHA512 aedbc03b3876183ed2be15f4a8e6e7f40cb7c589da938cd13c74826bbaafd47a40e394b397961e792501d67ad0e635e816aee0b0f83deae8ff77267c7f0ce0b7
-EBUILD kompare-17.12.1.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
+EBUILD kompare-17.12.2.ebuild 959 BLAKE2B 3b70af60469b94895ec7dc93ae77e40aee70bef5cee9fea82c95b6e0f22f4b5515630905ec820a930aade616e7b06b35c3e004db673ce1f279b41347e6fb7d95 SHA512 73c12348fd0005db8f423272c661a3f7e5de65cba7f7732793d94db30ddaf542a39948611f9307cfd155471dcbebef49be8b00ae24f60524482c48a2279cc2a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-17.12.1.ebuild b/kde-apps/kompare/kompare-17.12.2.ebuild
index 5c3fbbe779a7..5c3fbbe779a7 100644
--- a/kde-apps/kompare/kompare-17.12.1.ebuild
+++ b/kde-apps/kompare/kompare-17.12.2.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index c918a2139002..9942be28033f 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-17.08.3.tar.xz 7722120 BLAKE2B d835ad2259180d65d858dcc8ce0e2248ba71e2d36c789a6bbf5324f851dca3dae8ae4163f8f0e43d2bb81e154566d3d34ba93d9785f38b388f6d91bb420e071c SHA512 1eec491e3cf6ff8466a33e05723ae431da25fa883a9b90906cc9e06ee68d474eb25ea2a2032e27a4017c17659f5061d4ba2d7dc69f9637739717bec7abe50ccc
-DIST konqueror-17.12.1.tar.xz 7721916 BLAKE2B 5260d03e574f596d31dd152c33cafa864a2db84b85d8ea251a16a3d908f311d71f898c169b4699cbe52aba60a1f376b8fa706ad8d76db02fcf24479ef3af73a4 SHA512 9f1e5d42f52255fa36bfb26522a5676c4a60382dc7d3f6067ebe5d806a46c8c1f3a3d4452ffdaab632bb4e874f6754c3437c7f58d8ab06d7933683d0c1c48f00
+DIST konqueror-17.12.2.tar.xz 7720072 BLAKE2B 512d3e81521010c060752ad5ccca0929e19a5646fc894f41f979e072af74cb90606a7f7484352ffcc9a86b5991d98439a886194c0436c770a7d5b1f567b01849 SHA512 c9490a9501b0c5251d0448dcca180dd22a36b0f5574b766b9b81b3fa66ab03ee2c9edc0d2a9998d7fee57b2b31855ce023e39f6ede22c2818cf8c9a5458a6cbf
 EBUILD konqueror-17.08.3.ebuild 2851 BLAKE2B b50dc6dd721b111ae0d8e9842c0a6a711808dffd8a2feb9f5c76fd2c9d2e70fb72b9977824133bfaad5f817a3094b3abb3317fc621b33dc9437f4b631802fcdb SHA512 31814f65ea5b3c6ead7b0e1b814c9edb71672f0a76f86236560f95b6f91475280d7c35ef6926feb025926ff4c23c597595c14674ef884743c9fab032e11c26d7
-EBUILD konqueror-17.12.1.ebuild 2784 BLAKE2B 86eb6ec7ed7ec40243fd88984c22d95ae5636ca7f8beebafa4fd76b14e3dbe1b6c1e5b991d499f1b0dc263fb62dab2caa813ea07052738edd73e73c92443e07d SHA512 17c287ea87f3c0a0043798c063403dfefb590adc4196f34f2343964d70093fb8247225cac66848c2aef1e0331b12b6168d3efce06fab22622fb81b85bef3ee5a
+EBUILD konqueror-17.12.2.ebuild 2784 BLAKE2B 86eb6ec7ed7ec40243fd88984c22d95ae5636ca7f8beebafa4fd76b14e3dbe1b6c1e5b991d499f1b0dc263fb62dab2caa813ea07052738edd73e73c92443e07d SHA512 17c287ea87f3c0a0043798c063403dfefb590adc4196f34f2343964d70093fb8247225cac66848c2aef1e0331b12b6168d3efce06fab22622fb81b85bef3ee5a
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-17.12.1.ebuild b/kde-apps/konqueror/konqueror-17.12.2.ebuild
index 971eb9fb347c..971eb9fb347c 100644
--- a/kde-apps/konqueror/konqueror-17.12.1.ebuild
+++ b/kde-apps/konqueror/konqueror-17.12.2.ebuild
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 8fca8fa977f0..b2747554b114 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-17.08.3.tar.xz 658128 BLAKE2B ec9799c07d99cea55770a9573466ed6c94c4e3a50b2aa32fe3d2031f47b45ac7dc7ca5d6751b2aa28540141b7a4a929f94c7bc1703e40053a6cc37057ddd736e SHA512 cf03bcb6eb612bd64fde7239ee4adce12ac317dc8ab17d43163b92ae05ca3e539850c2f419fb677e7b4b8c27e77dc889c4236170a3beb1352d7f21145fcb34d0
-DIST konquest-17.12.1.tar.xz 658260 BLAKE2B daff7c14c7ea13d60ff90e8e9087d4bd111c3a5021f3ef5439a23a0398d96b7a39659bc81b0b5dafa2d9081d1ac51ea5b68b5f61969ccbdd6ca1f8a2afe8c292 SHA512 0d3a820fc73575bbe742daae9992a730fa9de27005130c4c4274f77710832bd685036fa424c7940338a8e71a1a09dea5bb71174bc1bbbb941eee643fce9095a3
+DIST konquest-17.12.2.tar.xz 658132 BLAKE2B 06f758a7339dac9cf592b1ba9c29c0a0b17210fb0c020a44c48241c945e9b981b9865a4e7929c81d44905b4acc8d3ef425f81a6e56f413b7ea4e9aab4f8af04b SHA512 d57db91847a636c22db9969631ac8ebb06fe1b262cbff1cb25bcf79face3791e3a7ca554c1d6a12af70f7cc1deb5a17c8ed29bfb190da5df17d51da863a4b3d6
 EBUILD konquest-17.08.3.ebuild 791 BLAKE2B e6bcf5459e8783b43ac03d5285c9270bb51afdebbd568b431f605fb6450049247b006d06a4e3aed30d720cfe5a52802858cfcad5748458c38b4fd1a5748b39c9 SHA512 6b144c000c4a3c2e7b68f66f1366b9c84d3a0b1fe9efb252bbaceed5c87500632e4e9cad1cfe2d6d74b355aadf6df451b0dd422a4e807289b2ef77713e4e6eb2
-EBUILD konquest-17.12.1.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
+EBUILD konquest-17.12.2.ebuild 793 BLAKE2B 4af4ecc52b869bbfd4b6aee14dadc2ae1e87ecab3cea02b1cdc50e062d6ee09b2085467bc56c3af5adf98df73e2dc78ebd24207d5d3af356b68bf4dc761193c5 SHA512 295bf448bb9e99118d2c8057831c437daf5dc42deb0032bd08416ddbfb8bf435f54ac1cc87b553c9ba7c4087b7d3bc88ad69c6471f4a12c5f16551591df09b92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-17.12.1.ebuild b/kde-apps/konquest/konquest-17.12.2.ebuild
index f2519a625009..f2519a625009 100644
--- a/kde-apps/konquest/konquest-17.12.1.ebuild
+++ b/kde-apps/konquest/konquest-17.12.2.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 3e92509dd0ce..8170ba2419a4 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,6 +1,6 @@
 AUX konsole-17.12.1-libinput-pixeldelta.patch 1914 BLAKE2B 27fdeb10eb73f0e935ade90c3c453256e5e8bde94ef4ae3920b6e6caeb109c8fba226698745c6d7116116e3c0e6c8aaf935e77c503bba52549874b861d26809d SHA512 0d9cda130728f6b5e618b73fbc9c07431b924d6190df8f91f7801b798822ce001e7b077fde2992dd8f570bac9e7af857576e149fbffbfe37ae4e9a7b3873cb5b
 DIST konsole-17.08.3.tar.xz 1021860 BLAKE2B 62771c923614aefaa9a246fe2a937ba61f9de55e067dd04a8e24a9ad6f026b6c4efc36e3ef4244b98e6266cb685707b46be359e99886f99d1857a02b21570da8 SHA512 1d2723ba3dd988b3b1deaadf5ccf10455bf48d9c5961e9d614342bd5c0dbb7b42b461b529f4eb6a5ba855951f5b2d7d1d4f93170091ea3b47f02ac70c2583f4b
-DIST konsole-17.12.1.tar.xz 1026684 BLAKE2B 87601e07187721e8533f919cd553d97ec0cb2a8e986f4b049c4ae4eb80b93e42f33d6357734fe10492ec2db0210ccd4bc81a6950d02971e71caad952eadd5000 SHA512 af1e2e0ecb18a213de0ab452ed7db5b17ac477571b9d5ebaadad407714733e80f379f7ee6a506312c42e9bfe5990087b6f63655d18dc1cb302ff1bd446c2dfdb
+DIST konsole-17.12.2.tar.xz 1026748 BLAKE2B 95eaaeae7c37402652d95954273b4a16186c27e01a533b83493530e03c0e01e8a727fc4043a9b1eed229adc02c8353fcb9e6cdfb91b5396e838dd83d475205d2 SHA512 daffd82608fcbe4ded65cae336d2d6ab6f6a70a665e2b1841cca39b2933e8c615c072bcfe02958be8e8193c05a0c1ad317e6cda554dcb8e3b434a2f4d8d80036
 EBUILD konsole-17.08.3.ebuild 1387 BLAKE2B 4e21aa58c799e91ab8aa3894d512f1d15310e1f03c3ed5aa6b8887dc0b5944ac94fe1a9910941a68810705ea1fe8d9605aafba29dfa12e9bc046d20376f93ee9 SHA512 078bcdb02eaf222909b09d801617918cabe53b16ad80270b9136f2089fbb0f37b0b82d42016f5502c06c4413541ac3b958d0ba2319a08fbb612fa0806c92b312
-EBUILD konsole-17.12.1-r1.ebuild 1447 BLAKE2B 8a3982f11e37312811b89950d34d680615882edd209f454e2ce581d3ef5fdc5da846afd53af8d00492dd6ce246307867dfe40be88c2e61e366bd4835596d505a SHA512 9a6ad1db74c3282b7d132b2fafab5204a2bc96892d5f9b2acb93580d99404fc545eceb685b87993e433af5503af5e9a105d8f7e0dbfa6ae0b6eec98e06ebb392
+EBUILD konsole-17.12.2.ebuild 1456 BLAKE2B f51cb7a956c879adc0be46a1fb6adff3fc6dd765d625173c98d678a50bd2daf7bd0b257301dfa0177640236c3b11c71f8729d7df5002902a3383939b3060cbd2 SHA512 60b069fe22b675a0638c56ba4310da4863c77b916623c56ebe2d25d2316976e4f67134885e6d542408b7bb6708e1a7356de32ef72fcef599372903cdabaadb8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-17.12.1-r1.ebuild b/kde-apps/konsole/konsole-17.12.1-r1.ebuild
deleted file mode 100644
index 8e2357bbc0a9..000000000000
--- a/kde-apps/konsole/konsole-17.12.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-libinput-pixeldelta.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-17.12.2.ebuild b/kde-apps/konsole/konsole-17.12.2.ebuild
new file mode 100644
index 000000000000..13661d1d267c
--- /dev/null
+++ b/kde-apps/konsole/konsole-17.12.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 8d33cff5ad59..dee17fe8f5ca 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 BLAKE2B 27b584a5a06c7d5388c4a182f824005e8905b54773dfca8c010faba4d254a73d794ed4b1eebdc516ba7a100d0e3b841f37b4a23e2efeeec6416813c2ed63f949 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40
-DIST akonadi-calendar-tools-17.12.1.tar.xz 224584 BLAKE2B ca816ecc8deb68032b3063cdb777e92b4dc94b9eba782e285a99eacc40742e412f55c6c6f9fca3797b20692a2f516cd2414a0425a2a40a6a3b0ca8bf5bb614e1 SHA512 a7a30b833a835921b071a6288507f131b3688de38262d5fa6f49acfb32148d1625abd5c3e777af6452166d54d374e2991b02c11d328f9aec2ab337581ca38311
+DIST akonadi-calendar-tools-17.12.2.tar.xz 223912 BLAKE2B fbe922df2214d62947380794aa1af6cea40da45709644ee419166864254b296440ebfc1f4e14c3ad976fbf350c5b18ada0eb37c9227131fc1b1911d347ba4d93 SHA512 36c89bf4a3bdae29c727ad6cedf580439ffd9aec3ddf190b74a24c53af270ce173ecbbce02f336e4b2c3f3482670d97cd108d27a12a4aac1df14cd31c91fccce
 EBUILD konsolekalendar-17.08.3.ebuild 942 BLAKE2B 5896ba74e73708ca3c7ab252505b8fa206299217b24624a11431c0f8591b57bfbbaf9abf7e03e264e96ffc7f911852eff67b6a96dcf9d3fbd034f947ea6098a7 SHA512 8be34329395cd3c0ab6a52a8708a169d2690003901fafb7b851a1da309c9a70eac6f88fb805d71a8eee45fa3ed211bc3bbc2e5771306f2c4db9ab9898d269f3e
-EBUILD konsolekalendar-17.12.1.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
+EBUILD konsolekalendar-17.12.2.ebuild 944 BLAKE2B d7ebd61dc165d1b27f594b2ff0e9c8cfd7a7a420708bb818273028cb388338f57bdca34a729e0e078d5a67449d0a54f3842eabf2ac3156eaf8c8a398a28cb43f SHA512 1da4cd1ff978c206ac1123778984679c10801a2b20bb10f5853d83a598f8860470f8d2e22eedb0c015297a947ed809317bd165523f7e7f9e0a69fb4a2aabe199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.12.2.ebuild
index 5e43736100e8..5e43736100e8 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-17.12.1.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-17.12.2.ebuild
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 61ee60a9bea5..24e8d10de361 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-17.08.3.tar.xz 864628 BLAKE2B ce727e20dc91a85ebcf5a4d014dfaa837455047771332a89a83860fc29db6b9cfaba3cb50b6a42b168c1cecc66fcf337b26da91e42352195d35d3ba66c9b8c6b SHA512 9dbd0a967425a6aa9c8b24fa28bf71d9e32329d1c9ed7f0f6eaecdfa12340efe9fc991b3591f554a2f4e0da1322aef75026d38a5bbb1ad53114a17004c5445fe
-DIST kontact-17.12.1.tar.xz 865784 BLAKE2B 2d9d5016989ede972f112754953fc5e3261568626a3a2e489537caeedd520987e371ea41e940f0b733485807f15d8856cd2dddc99cab80a571ae265cc08616cd SHA512 06dc36a382968e55302fef50ac5c63cb4f75697be160b0af550f7bb641777b3c124fa6575ab314ea56c17bc76544bc871bcc987be59b19e306cf9cf725dcf7d7
+DIST kontact-17.12.2.tar.xz 862928 BLAKE2B db8d5d533f512166c0771b5883b7eaacc0ff9e046a2abdc8a7601e49b86234531288f49ae1c364a5b061d54fd2b14c2e80941c598492be207c86cb32f61b14d6 SHA512 d9629f4204e6f24a49ebc6140b21f8ae4d38584ba9a8991d0f04006b1946daf1a23e66550d3578a1b082b50c548051925bc5ea52a974b512d8bb91588027b461
 EBUILD kontact-17.08.3.ebuild 1201 BLAKE2B 37ea6ea682630ecbd2d4d8a9b2227b3f09c0d82114cc064218c5e6ff5de622de3df850ad6b3c4ac83773f298a2019f4431329db73797488731d8526163f33350 SHA512 0205aaf4638617f05c8791a1b41794202cef1006008d592c0bcd45e36a68577d2e466aa8166380eb947fc5ce0ce6f2c97fb465e654eacfd2feeea01b97c1174d
-EBUILD kontact-17.12.1.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
+EBUILD kontact-17.12.2.ebuild 1203 BLAKE2B cdef8cba6e3df6aec11b61303dc23fcd1873131a3dc96ee29850bb122e44eb6e3aad6c4bb03d13b42ec956637f9f6d594ef64ff2b7859b3a84f81b4c6a461a35 SHA512 d37fe6a38579456611800285b765b19c957f18b0957fd4321fb93129b4fcb0a74d1ba75a16c634ab0a3f0f897e156b9fbe20fae26729f1f5660e57588033e882
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-17.12.1.ebuild b/kde-apps/kontact/kontact-17.12.2.ebuild
index e768a574bfe2..e768a574bfe2 100644
--- a/kde-apps/kontact/kontact-17.12.1.ebuild
+++ b/kde-apps/kontact/kontact-17.12.2.ebuild
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 9cd8b43366fa..a3fcb189a840 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-17.08.3.tar.xz 32896 BLAKE2B e9c2c8227104a43cfb36e7ee8731198afed4a700ca6ba55f58b887f02b83562c7c4e7575a60c90e837d788448a4a045526a9f8a01963928a840ae900f9b2b4ea SHA512 d7eef2a1adbe4e904f86f0bab70f64dde7517b0eb71fca3b5d7f9231a8b63f811112f2c1ac696a0bfecfeb51ef85072eb61b6843d1eb290e7bc9ecd9e5fd1cac
-DIST kontactinterface-17.12.1.tar.xz 32768 BLAKE2B 225bc0ee9d9e3917e00d723c237299ebc282b7775eeab0a1370cf4ef20db26ce161a62c45084ebe3fe5f47b1ed66079cc9fb2435d46a7a8a9491fac659141a9f SHA512 a2d0f63a5c332a3f03331ebf3face27f4dcd56d66b35cfa27f9e8c55d2afccde1dba9ac74ae5e2e33517bd1529728aaf1b033afe56c78f63c8c087c82c9180ed
+DIST kontactinterface-17.12.2.tar.xz 32720 BLAKE2B c1c7415027ecbd456b04026f4ba412aacf8dc4fca6cea3f6c0ea3b7c20ce05538c36e477b5b8f45c16201c78c57563ca3be79de174ce5b368dda707588a89ab4 SHA512 e613282504a99d4272d21868b0f458948296d44ce9fde0282fe77b3fd0d2ada0c6e0787760375c7952c5bf699deefead12c61fb5cc07ec0e77e712a8ecc0270c
 EBUILD kontactinterface-17.08.3.ebuild 592 BLAKE2B 1d8ff617997b876a112068dcaeae50f7dc94b89b8994d739c6626696300e29ca6be5f1baf5429cdcbd051e67a7c10cd8bda0604cde47de550e0f609def1c1d28 SHA512 79f488fd7eb156cc3eb7377cfff867ccc08e0dbd0d5b235f72360e8321f5c274e58705cbdeea225b13e6a733c1190ddeff66fe66af67102bf425bedffb1707ba
-EBUILD kontactinterface-17.12.1.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
+EBUILD kontactinterface-17.12.2.ebuild 594 BLAKE2B 6dabfaa2233c3fd1fab75a4a8a9c1e2329f94ccdecbcc81d483ec354f27d9abc15e9b4b6ac231ae3e3f3bf562ec7e79239787764ef56eafcfc116287036236a7 SHA512 2f16ac78757ad95fb651605c1d71ce09715ff517fb00e46b7dba71a0281c420d35ef8f1bc45290ed911df7db31760b2a91cb71cc13da40f2365825914efac3c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-17.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-17.12.2.ebuild
index 9622e2e660cc..9622e2e660cc 100644
--- a/kde-apps/kontactinterface/kontactinterface-17.12.1.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-17.12.2.ebuild
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 68220c9f7514..68dfc7b491a9 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,3 @@
-DIST kopete-17.08.3_p20171029.tar.gz 8004208 BLAKE2B d58fefa127021e2d3c07d55fbe461b958351e2e712922de620f46b20fd8e503bb065b42f93bd81d0a4d109e90bd6cbada80b507d2e6140b97b123c0a15bc801d SHA512 bb70dac4f1336502fb79564e132785d3d6faf01520126441e7cde902b75ae8ac36ae796e0d24318f16e6fffeaa0ec1833a6582731ec734a86fd495dd7252fcb8
 DIST kopete-17.08.3_p20180202.tar.gz 8001099 BLAKE2B 9aa6bbfc5cba762e4f7e2b789bc393fc3ecc021d9751e3c498326c08a536aa6ece9ccf7b513cd81d0191705a03bc6afce00cb6dd035fa54287e9f065758596f0 SHA512 20077588db4eaf4b46723f131a6d0e159ac4a53ab47ca802b4fa8c66a9adea866b5bddb06b0e0eb7e54e34c31726c752875bb98441b1184f80a3483e72e4ca35
-EBUILD kopete-17.08.3_p20171029.ebuild 4199 BLAKE2B 19d46299879c04ed9909349834e5be2d704bb94c9887d9fc063ccec210b1a166dc636fca0f8d578bd01b46233a6a47eded608f851b619ee643dc609b90f7f13d SHA512 516687c9aa0474a8e57314ef5ab58b1de2ddd5741cc4cb161f965469ee1068755cd7e8338f5c271a01f8c719477e6681e3cb7d049f170cb6ddeb0cdbf37d71ec
 EBUILD kopete-17.08.3_p20180202.ebuild 4621 BLAKE2B e42bfef42a5b5950ac441117c8b145425e1e17d51f4c5bce115d2a1cdaf5bb733a464a9d4a136bba7bb5c1e47a80f7d697cbf08b340823262b261109aa739a79 SHA512 d9bcebb6d33756edcd6022d92fd7dedd0d4b462915165ff9d177bd5a545e497d99c47854b53ad0890fdf227e79ab346eb9ca0ce2bf30ce401dfe298bb3ecb39a
 MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
diff --git a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild b/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
deleted file mode 100644
index 066724406ec8..000000000000
--- a/kde-apps/kopete/kopete-17.08.3_p20171029.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=d7dbacb483124d5d6a8ad30586ec126c8514a715
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl v4l"
-
-# tests hang, last checked for 4.2.96
-RESTRICT+=" test"
-
-# Available plugins
-#
-#	addbookmarks: NO DEPS
-#	alias: NO DEPS (disabled upstream)
-#	autoreplace: NO DEPS
-#	contactnotes: NO DEPS
-#	highlight: NO DEPS
-#	history: NO DEPS
-#	latex: virtual/latex as RDEPEND
-#	nowlistening: NO DEPS
-#	otr: libotr
-#	pipes: NO DEPS
-#	privacy: NO DEPS
-#	statistics: dev-db/sqlite:3
-#	texteffect: NO DEPS
-#	translator: NO DEPS
-#	urlpicpreview: NO DEPS
-#	webpresence: libxml2 libxslt
-# NOTE: By default we enable all plugins that don't have any dependencies
-PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening
-otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence"
-
-# Available protocols
-#
-#	gadu: net-libs/libgadu @since 4.3
-#	groupwise: app-crypt/qca:2
-#	irc: NO DEPS, probably will fail so inform user about it
-#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
-#	meanwhile: net-libs/meanwhile
-#	oscar: NO DEPS
-#	telepathy: net-libs/decibel
-#	testbed: NO DEPS
-#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: media-libs/jasper
-#	zeroconf (bonjour): NO DEPS
-# DISABLED until fixed: skype sms
-PROTOCOLS="gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf"
-
-# disabled protocols
-#	telepathy: net-libs/decibel
-#	irc: NO DEPS
-#	msn: net-libs/libmsn
-#	qq: NO DEPS
-
-IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
-
-COMMONDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2[qt5] )
-	meanwhile? ( net-libs/meanwhile )
-	otr? ( >=net-libs/libotr-4.0.0 )
-	statistics? ( dev-db/sqlite:3 )
-	v4l? ( media-libs/libv4l )
-	webpresence? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-	)
-	xmpp? (
-		app-crypt/qca:2[qt5]
-		net-dns/libidn
-		sys-libs/zlib
-	)
-	yahoo? ( media-libs/jasper )
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
-		-DWITH_qq=OFF
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			xmpp) x2=jabber ;;
-			zeroconf) x2=bonjour ;;
-			*) x2=${x/+/} ;;
-		esac
-		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
-	done
-
-	# disable until fixed:
-	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
-
-	# enable plugins
-	for x in ${PLUGINS}; do
-		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
-	done
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! use ssl; then
-		if use xmpp ; then
-			if ! has_version "app-crypt/qca:2[ssl]" ; then
-				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca package with USE=ssl."
-			fi
-		fi
-	fi
-}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index b5e003e76ae1..0bd40ac474ec 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-17.08.3.tar.xz 2268320 BLAKE2B 32760f7531af06b0b86c0bf766aa743f4b62aea5f1ccc1923a4566e602d06d2ec18c6daf2ca58c984066b56dd96c4cf0e94fc09cdb9810288ee59903a272d659 SHA512 1e9c037fdecc1b3cdc22bdbd45098cdeb8cf5a4334b0583601dd499f4b277229d5481363654373a2f5cc115c9741ac2943c651ce697616c9c970cf5aa873f88e
-DIST korganizer-17.12.1.tar.xz 2263840 BLAKE2B c891052ea1b0b332a2b09504a7bf0c75333460390303864707a086144ada2ceb93595a84c716cf9fa6a10a82f563f482976657bef19c81f1b3a6ae6c5319fa33 SHA512 71decd0d02084c40f3c602fc5de4e8b7de111a1d78561ee4412edd2edf68b4b8d1ce3d77fe5bcbc2a3682ff7ea899d25f3a566a8ceb06fa56247796123df9089
+DIST korganizer-17.12.2.tar.xz 2259512 BLAKE2B 301f338b264b061a0651045f9c3414879a70dd70f921031ea94247f804ec9a4523b97f06562793c9567514d0905060d3c9543336f65f5572e72eb93954a5258c SHA512 c9a6d41d35d22928c34b479f6b0f87312875e07d1fe44948c0bee75db74cdc179259cad3a17e0a11fd8f545e1b97e8af3ddae2d0796e42e4ea8ff7fb91839f88
 EBUILD korganizer-17.08.3.ebuild 2440 BLAKE2B 052f3ee0c9d8034ba42a622118d303e69895ae0db81f543333eb604ec52dbf38d7286864e61a0f5dc1fb1a9be86c11723c23a4c506fbd12e35b0c791845dfc04 SHA512 71e7c961094f64a5f1e8ed71777debbece55dd6c1adb1f15f5da94cef6bc7901fb5b6db2dc1a86f48c706133e15a41a1568656e74f90fac4e322800b0a95e19b
-EBUILD korganizer-17.12.1.ebuild 2442 BLAKE2B a5659bc9e995d86e46de1cc5a808d721db9196425a9c47f5a06985e8a4426c9d0bd26484ff6f04b44cc896c130175749d545d4764f153be437281cdb10d0679b SHA512 1be5c2a7f8463e4a3b53e57d43877257ae74cba436e4095975e7e5d217d3dd8f67a473da0f7fb046eb0352096b86122779faef62afd50a87a8021af7d98e817c
+EBUILD korganizer-17.12.2.ebuild 2445 BLAKE2B a9ce7dcfde048a202b542e3f9b8599236b33806ba28df437ce22d14f6a42decb8eac26e36b1728cf14ed20539459c0b125f73dc080658708e2bcbeedbc5cf158 SHA512 62aa03dadfad2d0dfb94e6b0c82df767fd8fb388421840b40a5851b450591526fa07c373632e7157bf62f874b92ad55db5c1ae26d25be9470c84e16e1d93e8e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-17.12.1.ebuild b/kde-apps/korganizer/korganizer-17.12.1.ebuild
deleted file mode 100644
index 1cb104909d33..000000000000
--- a/kde-apps/korganizer/korganizer-17.12.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kholidays)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-17.12.2.ebuild b/kde-apps/korganizer/korganizer-17.12.2.ebuild
new file mode 100644
index 000000000000..23f6fc99a125
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-17.12.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index efbc7b3e6d0a..c3eae209bf07 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-17.08.3.tar.xz 3565464 BLAKE2B 49f72b9264dd0dbece2a834f2c227835727ff9fd6d3f2f08dce9109c85b38a764273f2efa0731c1161c9216a34de28afe8277ed20ffb8cb7a4e5ffac0c7a6eb6 SHA512 895b23a9a5764e22f3041dd1c6731a47519921509f5bac7a865dbc5ff86cf96edf8c396a78d0ebe880bbd5286271bd753505bb3de8cf67464c4ffb3c686ee573
-DIST kpat-17.12.1.tar.xz 3566276 BLAKE2B 1b12282be2be49b2f4428d194ca99a7c91a4b8fd30879705bc8987f87d5cd9ec46d471a5a1944ce19872b728682a37171e463c4ba456623155d730ac39f97d98 SHA512 9fc380dfa34db015d29e56c4c281bd2809a73544796633bf9fa0fa6f1d219038e188c303674e2775e2c33b5324bb3cd9864560618b9d16720df33908a05d8e90
+DIST kpat-17.12.2.tar.xz 3566236 BLAKE2B 31114f62c2b8ab502f78a7c57ae6bfa356a13362084c49cda77ec19a1c9008da1d74c7c2391ba1d1e5526003e7061ae6a7b854cc27e1ec0a86b7628358d86c4b SHA512 605dca9da10b4a419e028f9f7339d685e2fa6399d388502970b23fa51f5385607554c27de3898c20e3e7a098068a1770202097c2b02122b187c76800188db3a6
 EBUILD kpat-17.08.3.ebuild 853 BLAKE2B 5b4f69c71b5d7e65ea9f3a7335106da71851f1c757b0d6133b8a5884799740657f6936aeab39e7b14f97c0c1162971782e6d8fd030d89f413b4538cc1cfb8e5c SHA512 43c5dc46d33213f725f50d892bbe2bcbc20bc47d860dd3dd30917506671f098ba5fdf93ef07673c14f25d98e3a28d3fef8f45c1607632b81bbedaa620230525b
-EBUILD kpat-17.12.1.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
+EBUILD kpat-17.12.2.ebuild 855 BLAKE2B b39433cfbcc9b56c1bd3b5a9766f152ca01efe3dfbf80596867d5f9c2a120339b7866897cf43655db4c29a85d495fc5f2108fdbfe106bbfd4dc4753b4479fda6 SHA512 d44200a9121eb25577898f4db6fcd233d3a27e2774d969f2f96c381e53662fd8db813b789eb810d66924ca55050775b63ccc4d104528da99b675f0f67fca9fa2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-17.12.1.ebuild b/kde-apps/kpat/kpat-17.12.2.ebuild
index 14604a38fb25..14604a38fb25 100644
--- a/kde-apps/kpat/kpat-17.12.1.ebuild
+++ b/kde-apps/kpat/kpat-17.12.2.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index b7eee910b918..30c8fab6b2fb 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-17.08.3.tar.xz 140944 BLAKE2B 8705e649ae6c13c18e9286d7c66442ff345f0370104497660e54fb317e8bf3ab64a85763d19cddfdcb223c4c395197d2ef0b7e4a97017f094e83d442d1a1ebac SHA512 7ae14f11c67ccbb2e5bf88437444d9e9242c6a0b92b0a06425eaa37274409ce215b0129dec3131c8d135b825954b71435ed445fe0e4bfe7db5f17976fdc3189e
-DIST kpimtextedit-17.12.1.tar.xz 140784 BLAKE2B ef68d5555c82618ed4ee4a5b22d928b791a9973879a7544c126b63289920da040869e49a35c39329cfa4abf15f7b80eb1f254fab4c584255a405ef7a725ee19d SHA512 06006c5e0079cc77fd1519adbc8023237981544d43ef7e8e88a5f18494204ea348bfa0453c0f9ee5614ee1dd9136208acb7fa9694986427fa64b86a3799da26a
+DIST kpimtextedit-17.12.2.tar.xz 141824 BLAKE2B b54bf9438f21d1218327d5727098ab695f720900cbb5e873125d5541a97e3cd68232ba751d8e9f41a1ab04a4d330976a53b124a518a6c76d301e8d3e7a33353c SHA512 10c9a7766cf8ed83947f506d7664799601160a2041b8718aa5e124d0c4b400bb1c5da27c2e4ed1f8723697926ff7aa626f14e8bb4bbc47200733e7cf6040dfb4
 EBUILD kpimtextedit-17.08.3.ebuild 1129 BLAKE2B 5103ec1ff03e1cf3e55b1e2444b1dca551bc946f316b1748681f470cc9796754ddb1c729120a21d9bd7b946b07ae6654dd214356789f7388c074fdfe2586394d SHA512 13999911c77c045b767835e3284e340f7107fc7b2ac8208d7f6ac17c5aed759da066c8011265aae1e7f3bbd4cd1a746c62a480c9be5ff56821a8795a5590346a
-EBUILD kpimtextedit-17.12.1.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
+EBUILD kpimtextedit-17.12.2.ebuild 1131 BLAKE2B 630c96348004565c7a2f78bfdf5777bdb2ef3d7a527e4c0a1d6414771ce8714e22e1e5b7bf9deefc378af14ebfce7bf6145bfbdad1c1865f6810cb2e49cae785 SHA512 559fbfd7903cdd25c624a262fde1fb9859e151bc4065a80e3eeb82247a13b597bc5b2244df3972b928abcf333c236b6325640e54b01b73e36983d6534913ca52
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.12.2.ebuild
index 4df08dc9cce6..4df08dc9cce6 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-17.12.1.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.12.2.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index b409fc726624..e43e391f6f2a 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-17.08.3.tar.xz 25488 BLAKE2B 4623bb2e051c16071ff27c3f912bc34e85c5d57ae771ad5e6ab4603b3b5f26d7ece53891fc9064fbb6a8563f03fe3e811e423b4812574fc61d1c3b2eccce5d25 SHA512 a0d701dd61fde3a82da5c4433f9f7351258308322935ca018913518bc1fd7dea4d6636a0f57db08bfc5e93d535b9be82ae55cfad7e79cbdaaffca65e6befe365
-DIST kqtquickcharts-17.12.1.tar.xz 25512 BLAKE2B 2fe31fa5ec83c6c830a1307f88a60e3b5babfffa9fac0b0c33bf3e54074ccda7fc7ff9450436925e7f83f2cb98e02209d0bb5605c42f338e7ac58a808961d22e SHA512 42c992f588654433f62c96abe8fc8215080ab4fc0a4e61afaaee9db6bdc861303b6ea293babfd00e0e56b3e84e62afbdc66b598d0172ce7a77d1179fd91962b3
+DIST kqtquickcharts-17.12.2.tar.xz 25508 BLAKE2B 1a000ef80ef972bfc2284c81a37afa75aef548532c1f417a36afba1f80553201e7f0b1306b5d7ce7ae89a5d72590a270f4a5a5f425f7a9614409d4c8242daa62 SHA512 6c7a53bf4ba188de4a28c00ac07b9c445577081486743a30cd3f0a3ecff862c3e26ae075f0c1ce1599f1ecd0f105faa0f87d670b13c5d32e6cd3e6f11edd2736
 EBUILD kqtquickcharts-17.08.3.ebuild 308 BLAKE2B e2238f6d40770bd8a6c741f1ac51d469fa94134e31a8bce3f08273960fa25159a1e69d6fa3db98a14d41b2a7a6f71a9467e7b4f1b2f84f2d5a6277afe8004a80 SHA512 40a866e5f95809f4399dba885d72cf5821568f61d1cff0fc1a090886040e80641a74a33be72629f989d045348778b6367ba2db77e3c472afd3388da91d001816
-EBUILD kqtquickcharts-17.12.1.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
+EBUILD kqtquickcharts-17.12.2.ebuild 310 BLAKE2B 1a8188f042b79b458a146cd412ac47916cc3884ea6fc9b3ab5a16fca9bdefe2cdd73972705104c3fc5632a91c4511ba7c036d61a84fba059fa8b481e96ae2c67 SHA512 72a31b499061b26e1c41431067a9d6a52a74f111346c2fcb5e1ed5528c848f64077a7dd70e31aa356c3111caed838a596bfd4f26ac675d846f873ccf9eb645e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.2.ebuild
index 25309fd1765c..25309fd1765c 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-17.12.1.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-17.12.2.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index baece55bb4bf..b6c6f390d8e0 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-17.08.3.tar.xz 1554500 BLAKE2B 1289c760eec1570a39a8c2364971c91b386d3858963ba1cb3cf43665ead714c35281b23887a2f2a718bfcabd98052c05dce308bf2fd114624bb3c0895e91ef91 SHA512 6f0632a83c0159e317a0f3e9e054857af5103ecf5b597a46514c0d02dcadb422caae7b59f103fa6d0f1a0aad53518d37b10605c312b2c2e481a4d6605288bf95
-DIST krdc-17.12.1.tar.xz 1554924 BLAKE2B 865d320175e95990b6ab718b3398e3da5e5cff30e3dd556bd0a6d0d0fb0628b7c0e3540d30eaea23269f760b826fd95360e3c8c7eb335048b070486154f7cdf5 SHA512 0c45cdd6e9b9ffca847342c3698a6ffd49ba2e0548746e7e4d41089b988ce4111720c16bf63304bd1623a650880dd67834773b80d4b7989d24cf10d039e1a331
+DIST krdc-17.12.2.tar.xz 1554348 BLAKE2B e5b15031793f1bf6b8ce19e31453e1189e9486002f629b249225f781980f9ccc114651c15089b28b2cc50f2df8deef5de136c290af63c1fcf3999eec2adcd9e2 SHA512 b9a861754d87761ffc96ea10fcfdb5dec51a343515736054acb4c37675d02624cebcc3de061efb84f6492221ab4c1bf6b84ae885ec428f268245a2dc6b944779
 EBUILD krdc-17.08.3.ebuild 1175 BLAKE2B 88930fba0212b90246d861eaeab8515bbe3cb30aa2f229b06c24f89df3de805108e540f7049461b7930579178648ddde42c0444f7b140c63b3d739bfd746a378 SHA512 40d576a2edbfeca330b1117866be2079e486a2c4064b047844c48f2acb674932c93b4067f121e547ba6a7e359ddd6656d4be5ca2de796de978c96d38b069fc9f
-EBUILD krdc-17.12.1.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
+EBUILD krdc-17.12.2.ebuild 1177 BLAKE2B d1e1598816451bb7b14f62e6a77d4e3ea8141805793202d381366255b52fd2e4bb3539d0327332cadcaf8a7c40f789b59efa64f0bb701d2a91893300efe9f4b5 SHA512 0bf55091823829480b807e59534214f1d10104c92b437b59450480315255470f50bdb9c6a188ad34debd6663d1a99f2fc927c4f117781f0bbcf4178e604dff17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-17.12.1.ebuild b/kde-apps/krdc/krdc-17.12.2.ebuild
index b2db820336ce..b2db820336ce 100644
--- a/kde-apps/krdc/krdc-17.12.1.ebuild
+++ b/kde-apps/krdc/krdc-17.12.2.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 9b9472c7816b..ecfd1322a8d6 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-17.08.3.tar.xz 909192 BLAKE2B a63f445ab333c92e009e5461cb5b3c830ba5e34472f2cdd6fcc2d24fd441d8b59ca5c6c842a24e66d66759169879da985a69268fbaac0074fe12b23786fbc342 SHA512 5e412fe58804524b9b7b774bc816ccdf061f6cf36a0f423ef5272477811d035390dd728f12f9c19b2a8e98aeeeed951e6f0b172c9baeb2a1b1123817613e6f31
-DIST kreversi-17.12.1.tar.xz 911408 BLAKE2B e03768172c6e1354c99c34f63cc3fa5ffa20dc5b14bbbe9fd5eca63d2605e1581b32690050f06ce8876bb416aee249de1ba263c026d322969b604b2d070eddf4 SHA512 f8dee2d0e5f38690afe2f26f5b2df35b2fb627969974f3d59ed27b7b03c66728a08105e5443aadc76730752cc2ed12b5026086c7cd95035b08d603f0dbaba56a
+DIST kreversi-17.12.2.tar.xz 911316 BLAKE2B ef9f46c1f4625a14752b03224eb11e268e5a8046a4e3026e1f3fd14054143aed0c46da67e2b5ccc9e199aa9a7c52223e86f6df178179718a06f01e5be2752ca9 SHA512 e16bf1222acd61f00be68a9e6639243dbd2cea7264a909f79a5a1493790c8bdd9f6ab2fb7ce98339f55f25cdc8f60421671f360a9d867114c4878e0c02b0c506
 EBUILD kreversi-17.08.3.ebuild 929 BLAKE2B cd4fb534bc1d5a42c6cdcf7f90cc219c9de972aa67678332ec03561f79dbf483bee2f065cb9defc9cca7587b1b263213049a53392d8a4ab08fb87af2dbca2f76 SHA512 22ab33c82ac24e7af4f68b45e81d803fa2e0f0c9eb7e4f57ef3deb30c8159147cf255b44b24840552f677a1faffa10a91ca95d4296d2d5d8e93167661e8ffcd1
-EBUILD kreversi-17.12.1.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
+EBUILD kreversi-17.12.2.ebuild 931 BLAKE2B ded588961b76ac18e507125686f38d67dd87682642dc3e9d5278cc81c75c68954b21729420c7cc8469d8c20b75ce5448accc20c9ff5338ebbd8ec727a538303e SHA512 a4fd2df9c133974db526ea85c911293e62c934c5b033f7320b8cf306ce84609b55cc687df0b84636df93c322541d7149a46e6777d171609b8717bb74a35c4cbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-17.12.1.ebuild b/kde-apps/kreversi/kreversi-17.12.2.ebuild
index a18a0c64d8dc..a18a0c64d8dc 100644
--- a/kde-apps/kreversi/kreversi-17.12.1.ebuild
+++ b/kde-apps/kreversi/kreversi-17.12.2.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 2c7819890757..a3532fa94388 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-17.08.3.tar.xz 991148 BLAKE2B 7f84c9d0aef3eba1c55755b5a787a686b5de7955f1575926d7c0b6c3b5968d97fcea482c0651debaf869282b7608e8e2b80feba5fe6931c2be28784915ef14ca SHA512 4e234b432fe847e63373737c017f8a96e4235db2cfbd186bdd38fe16a4e9dfa4b0df03cff93b77c1aeb69800a109271b9165f8b4c360f6450cfa8d25fd5a3114
-DIST krfb-17.12.1.tar.xz 996996 BLAKE2B 3d6bde10c4669f658a0bbcaebbe4bd6aceef0d1993e2aebfe9730a5098e2c59e7b7ee36b1b4b2b675ec3ad4b98b056fe92bd2cbf140c437ae7d5a828b0ac0ebe SHA512 2c60d09bdde644f018f0b0367f984de26d0ef3653a41fb2b8f9fb9aaffa6610290e852dcf035a042546f5e32528ee97532cbd1df7b9664d61533d1d2d30648d8
+DIST krfb-17.12.2.tar.xz 995796 BLAKE2B 2ac2f1a8859b082aca11aee0e3694bc79c1c703f36c52d3b38c6e82650f99a1bfef42564c20b0d0adc3b9b71ef1979bf7e9d16157e8985490d84f822dcecbc32 SHA512 49d5afb3203777908310fb2ea490125827be7f921789c20ebb9cdc492daae34f793b3c0217e8b109aa542ae7c76e0da237d6cdaea1ca928f575d4a5802353f8e
 EBUILD krfb-17.08.3.ebuild 967 BLAKE2B 0b7f2df928a7fd514a228e2fe1d2ca983e0fa948f24fee925b36ae57e7e116f21acbc0d8efc7a2475d7a4efb34fef8e08d4560674932c07689f8f34600053110 SHA512 d1669e17d3eb7bb9a4e56acd3e09eeff5eeaedb9f720a9b035575f5efe92d7d2148f2e00187de3a8af9e0b3d72ebbd22153706b7c4bc78ef975187c65fa261ae
-EBUILD krfb-17.12.1.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
+EBUILD krfb-17.12.2.ebuild 969 BLAKE2B ebd6a5c1d982efc735b1bfe75e758dd5f23b556412ca78396f291ed054526e55752ccf83dfaa4c13be8ddea1bfac53ff3b42dbb8df2719e92ba19323f1dc73da SHA512 039911742a2b627be7e9fbe64085b8182faf73097bd9e34f3f6bf5b4cb41a68c628c208e570de34b4544ff64e07a3bc84b80bdde03ce302d51e0eeb061fd07e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-17.12.1.ebuild b/kde-apps/krfb/krfb-17.12.2.ebuild
index 479224e0ac41..479224e0ac41 100644
--- a/kde-apps/krfb/krfb-17.12.1.ebuild
+++ b/kde-apps/krfb/krfb-17.12.2.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 0fdca2b9c2d1..d3fd74c36807 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-17.08.3.tar.xz 144400 BLAKE2B 07f400eecea1f68b9b9e96d463741ae72400578b4250a750db24784cba9f23f8b1b7706373ecca80ef5187b8f2f2803dd6eb70658b4ae8ea0e7a4807d190a75b SHA512 6cd64bb587ca3cd3b51cefec246b9860f7ad63e9a86867fe4630422a9d09c30522c3ff933edded27b8adf4ca71737790179cc884990cabee5007b37c1e424e93
-DIST kross-interpreters-17.12.1.tar.xz 144452 BLAKE2B eec5b71291e039ae4fcfb32c7a48696c19d18ee9611232398eb4a63a83444178423bb921aa9a5fd0cc4f6b176c2e767ee6edaf7869f2d7026e2a83245783144d SHA512 81701978abab167957306229ebea79a910c7c86f573b2bcbf82e1e9d1dba0bcd7e32954b86ff4390ce00d5d9bc896ba98b081c9eaa1dccd097c3372dfdcc23f1
+DIST kross-interpreters-17.12.2.tar.xz 144492 BLAKE2B 0767d8eb6c7e0dec3d48171007819462357b53e9314950ddc257e78adb223900c88e7889ac4fecab8736ce5cd624b3fb6a9c709228a06aecb1b5ab4a770bd577 SHA512 83ce6a752d7b36b6983bc3d20c9b803c2a183aef39ffd60593410579a08c9dd4d5562ff88a971a614558824eafa02368b9ac23aae3df117d64db5c23360b6330
 EBUILD kross-interpreters-17.08.3.ebuild 491 BLAKE2B 837a7816fb9827a6e085119553f27c304221c3b73165ba133c6153dfae8456da88cef139615c7a01a09beb45c7396b0ce6d680bb84bd76ded12ed6a0b8d82f2b SHA512 664ded28b14f45c900800bee627d81554f6f5dd2e1ff7eca0640ca823b3829daa4f703fa7759d276eb191147deaaba551a3354612cd6a0a14e4c5db47df1ed35
-EBUILD kross-interpreters-17.12.1-r1.ebuild 744 BLAKE2B e8e856d15a363a12c9ac3ea170d8a9754925be68c6e65379e47c61a42c5e6f1e5f776559b57ac266c66576c40a633434a07971cf257af1c8cd17199bfc91f96b SHA512 1aa47b44fb8c66a99c935efcef0bd23eaf6c009bc971b9a5ddd796c281b7dd19f07ab92e2be2ca1075b2025beed2038cdec154c90d7957604404df1e60e0f494
+EBUILD kross-interpreters-17.12.2.ebuild 744 BLAKE2B e8e856d15a363a12c9ac3ea170d8a9754925be68c6e65379e47c61a42c5e6f1e5f776559b57ac266c66576c40a633434a07971cf257af1c8cd17199bfc91f96b SHA512 1aa47b44fb8c66a99c935efcef0bd23eaf6c009bc971b9a5ddd796c281b7dd19f07ab92e2be2ca1075b2025beed2038cdec154c90d7957604404df1e60e0f494
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.12.1-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.12.2.ebuild
index f1f7ac570239..f1f7ac570239 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-17.12.1-r1.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-17.12.2.ebuild
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 5c2cbcf40690..1da545081618 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-17.08.3.tar.xz 258988 BLAKE2B 76a5d3a9a343eb0fc52806b730326f92eae35b4f303260ee070f229d20c164241d30240c959111123c690b9e04d008fc25877733338d10c6b0ad23da37d844a4 SHA512 dd2a7e948bf85b934cb2845d0af4265322f8df85a44bee3cc48f6911e4f7a8b596823596533791535ecd6730519e4cedd2051d47c190804ad402088a129d628b
-DIST kruler-17.12.1.tar.xz 259792 BLAKE2B be18b74cd55fc4f668e7950f4f9b5782c0716f3544edf505e0f7a81ec17019a4e24ea25ed97c33c289af0cc55c41142234234b2c1c0bb1d8e7bdcf8ddbdc87ef SHA512 699875f2921aeb83a63f60ec8cdbd8d7ac0e7ccd48f61db908f1536d08bf513284ae0fc02b9cdc413638ec9cd7cc36dc8cbd559b06ed65855c0caca9f90917b0
+DIST kruler-17.12.2.tar.xz 259536 BLAKE2B 3fc1d2f64ba318d4cbdc6d7ecabbd945fa7e4fa6a668716db024def272c3c944ba901cebd542ee72eb4919b357566d61ac91a69fbf56490fa657852aec82e18c SHA512 7d57153d64af46e7a957d3c35089eea8382af4da5ea3e1365a86003f3199732c9ac5d38a3f400817f1b51e8db21b7ceed498ead9a567fec30f9d8a038e5e62ee
 EBUILD kruler-17.08.3.ebuild 844 BLAKE2B 469d6c986346ae0b4d6922c1793e67ce52a1b6c4893c41d34a941130fae2b14e0d14204ac5ccb5d925398295902bf00dc3411e9333a0e3e625dd5bd61be71d83 SHA512 bafbc71090351d72086f2bd8ef7ff89dbe91b351b3133957b94ada5c57249339a3e241ac6b15c1a23bda5814db247fd88f7624a6da27c28d2703ebe930e5b5c8
-EBUILD kruler-17.12.1.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
+EBUILD kruler-17.12.2.ebuild 846 BLAKE2B a078943cd2ca7950ea8454e6a6bdc47c7146db0a60188b95f0d9905e946d0f1e3d6710770390643c8c32a8a4aaf3b446a7fb32afb5ba879666a3c3e466117f7a SHA512 c514fd769c844711d89ca0067b28b42b1ac705364c609be198d47768fbc48f1f8151490f994666c50f14bd8a0b9748efdb022f4c07ba9ac7d0192189006d0eee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-17.12.1.ebuild b/kde-apps/kruler/kruler-17.12.2.ebuild
index 77f5502679f9..77f5502679f9 100644
--- a/kde-apps/kruler/kruler-17.12.1.ebuild
+++ b/kde-apps/kruler/kruler-17.12.2.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 8468548bdd28..303e0adee3b2 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-17.08.3.tar.xz 708868 BLAKE2B f7ad8a40a159a4ccd47633d99929da38ea999f6b11c315375b2eff414217fee0ef79134f5663da80db01302d99dbc70b091ab7833b873dd283e39bd50feee23c SHA512 ac61020615070e65b0b89d22fd82d41073080d9ae838ec9c394d68e43fb12d6bf20b60682359949b300cb38394c2886ab3b66cd724a086a248702a6e2b7e7348
-DIST kshisen-17.12.1.tar.xz 708756 BLAKE2B 0123451bf9365e4275f1c995bbdee6896c4782a4aca614033db17e5227e17645fe1202bb7e48d1cf31cbdf0a7ff9788df015171671f2613c0335f0e7d294f4a0 SHA512 e13fb07de9509d889a08a2728b7462a628e526a992f1a70c196bcc10c4907c1021ebd8e0e1b852bf31c188533559568d6c48e7cf2a7e49303b59eb2ad5e43ef6
+DIST kshisen-17.12.2.tar.xz 708856 BLAKE2B e051abab0102b8d8e363668b01d81a92b39368101dc646b9dfa1fa93d9d61eee2895696f9893f535514c3ae7ba1875a7bf6dd6cd53319402e94e5bd426d140ce SHA512 9228fedd9de5eafbb1eefdf76b12554a2b1cc190d3bab497357d70fde95b822d4f9034f08361fbaefff419316b185840ffa601fe9931bb0df6c88307b2991a1f
 EBUILD kshisen-17.08.3.ebuild 778 BLAKE2B 52155ceb83e19f94126fa9022911ea611d4ac27a1b8ba9348aae0bee1be9440862bf4e15f91a9a1d260a198d3f7a4978308d0074262662fa9c319381d124e365 SHA512 9034e524907183a3273c9a8b2c23f5013885892f462e07778cfe203a323b144af5a16a98d126bc7cffcf498e5ff61897ec97080ddc8259a202477b311f758e62
-EBUILD kshisen-17.12.1.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
+EBUILD kshisen-17.12.2.ebuild 780 BLAKE2B d069380134f5bcbe8c979c5de039a7b5033dd35ff3505c9f5635e06ed0e5aee5a994c3874d24716735a5b84df2f1bc1648150677488e6e88d4ce0d859fdbceff SHA512 0bd4cb9f1f0650a0aae00bab0541f78a4a9f169b59922075e08181c30ae6f4e97b61db444ed86667132d2397284598f5577ec47f1112b17ca1357d198b996f49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-17.12.1.ebuild b/kde-apps/kshisen/kshisen-17.12.2.ebuild
index 907e49003ece..907e49003ece 100644
--- a/kde-apps/kshisen/kshisen-17.12.1.ebuild
+++ b/kde-apps/kshisen/kshisen-17.12.2.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 88388f769f1e..de458f08e27f 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-17.08.3.tar.xz 5499732 BLAKE2B 19c67631dd0ad457b682c5447fd5410aa747bb3c042ae8a9591e0d73cb56a3469e098a1120e9c2b0ba69a00104437c028b30df00c2574ee14133e63e3064d837 SHA512 e56cf7b86815583bdeb3313adf988663dfeea5df2b5a064f5b1470c35b8c9dfe9ac526eeafaa9740250c4ef162ff7184acce033f80e4d87986914aaf1ca73383
-DIST ksirk-17.12.1.tar.xz 6987016 BLAKE2B a96e9c3888d90ea52e7bf4877503888e026c741983db2aea9982ba62691927829ab8d0d15f71546a8655075ea7033abd2d52e670f1614b2523a354b39c460f45 SHA512 95d49b9da0d6731e13a9ca85b371072db6f165db282fe8ec21b065d9c0e92884a4af535bf0ac22619cd07163e369f34704a724200d855afa8e25356586c20e4b
+DIST ksirk-17.12.2.tar.xz 6987628 BLAKE2B ac20b31b3bf5f18e39cef27b28c4590cdc6082b8f86f9c1cdda1851bc4e874c06016f3c2494f66b5303f99b27c3e3c76186e44d7302eac22549594609717fa1b SHA512 21f16202aa9ff80329817b3348e25730c68e876452a15eba6ba94ec7b02e5019486618dd8c79ccb0cbdc9871edd07bfe88ce48abb314a17902b057a526daeff9
 EBUILD ksirk-17.08.3.ebuild 463 BLAKE2B e6db44cc68878a34feb62748bab6cfa27835370b688efab4dd665757f36d64c0349737306eb9c479724ce0287e47d0cb644d348fd28f013ea153fecc0abc9ad9 SHA512 1e62d577cd23f7772246006eb8d899e8c92216877363ed09df62a52bb8431f65e9c3d47cfff419b830db20927c5d60bed66f05a212be14ce44cb6e2ae7862b72
-EBUILD ksirk-17.12.1.ebuild 991 BLAKE2B 1da9a20bde3ff4f3bacb71f0bed51caa7a571b7605c26506b62b2054a4c12a17f899c8861325f267ba15a7358fca5387d874645b81c93c04d28ff7911d79aab0 SHA512 b737995a13591feb0c799628a2daf784c3868a80c766277dcecad6d30e70ed8b73bd4354992ef19516408309c747b9ed79f7d087c675f577cc368f7e319f28a1
+EBUILD ksirk-17.12.2.ebuild 991 BLAKE2B 1da9a20bde3ff4f3bacb71f0bed51caa7a571b7605c26506b62b2054a4c12a17f899c8861325f267ba15a7358fca5387d874645b81c93c04d28ff7911d79aab0 SHA512 b737995a13591feb0c799628a2daf784c3868a80c766277dcecad6d30e70ed8b73bd4354992ef19516408309c747b9ed79f7d087c675f577cc368f7e319f28a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-17.12.1.ebuild b/kde-apps/ksirk/ksirk-17.12.2.ebuild
index a3736e0d0852..a3736e0d0852 100644
--- a/kde-apps/ksirk/ksirk-17.12.1.ebuild
+++ b/kde-apps/ksirk/ksirk-17.12.2.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index e4cfeb1d147f..c80f95ba99ee 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,3 +1,3 @@
-DIST ksmtp-17.12.1.tar.xz 38384 BLAKE2B a2dc08c473b16305f2b5318cc0d4acc5818eaf9f634d3814c08dc18a4a085765f3b97233da13b759d7e70365ed46c42cf2c310ce3b0225aa57b4e67183231c81 SHA512 b3d5aaf1bb9030615fffa9af0ed80a97096c80fb40c64e921d125f2809ed282ea2cb07e88f6d2134e154534751ab3ea6bf2067576f7b89398ca274955fac1a20
-EBUILD ksmtp-17.12.1.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
+DIST ksmtp-17.12.2.tar.xz 38428 BLAKE2B 9b891cfb8892c9e75fc6a6244a43a1ca206aedc31394329a107453344893e107eb6f8112b66b7a2e9f31d16aa2cfb65e6839f8e575e5c4e15750e8e0cfc81cde SHA512 2375109658b004829959585d0d7a8b334424d7c9e97a101ab391eafc78f30bc9720a1a0fdd2d2644760bd3485bc20cb7c3168740aa2fe5963538208af2764ad3
+EBUILD ksmtp-17.12.2.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-17.12.1.ebuild b/kde-apps/ksmtp/ksmtp-17.12.2.ebuild
index 237add174dc6..237add174dc6 100644
--- a/kde-apps/ksmtp/ksmtp-17.12.1.ebuild
+++ b/kde-apps/ksmtp/ksmtp-17.12.2.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 8805a301775a..dae5de6e90d5 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-17.08.3.tar.xz 605676 BLAKE2B fa4afcb74ce85d6083c4069c8aa1ee1be2eba2bd1d4d0278dfda7400ef796fecfc83768b1359748ba78c7318d7fb2ebab85240deecf81a41dd8ea0fb388de4cd SHA512 e7bcbf94ecdb737d47278dda5387fb12251cd169b5167fd49edf89593f06d69adaee1a78d70f1969e80d629b214ebd7d63437b3a2f677438de99011213f25067
-DIST ksnakeduel-17.12.1.tar.xz 605972 BLAKE2B 769202ff30d6444ba262fdd0b21ddd4a4a8d6392c77b000dd96c32442936ec1be21e52c682ffbd8a5143a48833313edc2fba9e71bfc6bfd31ff7b8fd660f33f6 SHA512 e49aa264d326133a4ab2baf537cb15d6dccb75fff8023a617db8cab61666b4f372c3968cc7bb7e443a36d516206cf1e7b6979de804354565af65822ec61851bc
+DIST ksnakeduel-17.12.2.tar.xz 605960 BLAKE2B ca82921cb708d5af5f12d2c5cf72681cf5a2c5f0de5f40f706cf0321c7fdc2821b7bd1a3479c79f8925fa2065956b351bbd5f791a6ed342c4001c4972bd4dc2b SHA512 a7aad7d1703cfb095738302490ef2f638520ba0a167ba5c67c77fa05388052b78938b6f1885350a72bdced1352f369eda4ff4635b7615e0e0db7298a24678fc9
 EBUILD ksnakeduel-17.08.3.ebuild 799 BLAKE2B 0e9608a896620c04bd7904d0b40760392dd4f20eb77bd1988eee4ab34272f5e0ebcffd169209dae6c78f707d52d9aee646c5778fbf359019818b836b8b2cc2f8 SHA512 72eff466a8d6f4ee775e6e3033c89a634afa39aafd067a80ad5b1c768b5e40d659778fd2bac9862ba7f4adbdb8fd87e5d5ef1dde374398b073879799a7c3db93
-EBUILD ksnakeduel-17.12.1.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
+EBUILD ksnakeduel-17.12.2.ebuild 801 BLAKE2B 1a611f1d5d84d3bfd30126b7a17b03eb34be062a965805be3a0e4fe47228ac94c6b955f77e448f233b8963cbaf9570ad02715957da0296c4fc8222f2a48a9717 SHA512 86b3777fbf8ddab82b9ad9691cb54ab31612659c124af790b8f1207d5912dc171c8e4afeb66a9b5e5b9b25c7f882f61caef31067addeb606a18ae2a919e862f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-17.12.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-17.12.2.ebuild
index 7bdccd636b12..7bdccd636b12 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-17.12.1.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-17.12.2.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index d2d18bbaacc0..c5244c948861 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-17.08.3.tar.xz 609840 BLAKE2B 9e751ea1074eb94a79889fd83375e811977b9ead3deb7999d1284b830a03ccd637e7bc8ff6a593a1cb648634f324bf189b52c93ac90e0b8013ca6bba8545f664 SHA512 b1603fa8bc9d33d7077191bef933dcefda996c24760bb5649e9723387ca09417f7e27881ae11ebb9c3ca9448104076d75490ee6ab2a65d32660d27f9393c6626
-DIST kspaceduel-17.12.1.tar.xz 609932 BLAKE2B 9e0fbdf98139f02d5bf06d09b5d4d4dc97d4191e3464231fc00216d1dbe825489ecd483ad064405b886f935c27e0b67b2ea9efd496d9efa6559c5f8208b87609 SHA512 5917c8682ac4f10a8bc74633754c83d796241479667e2843040010a8bad2ad8b54b984b2f9f559356944fef2f4560455ef2fb0ee8f13fce29fe0f916fb0ce0dd
+DIST kspaceduel-17.12.2.tar.xz 609952 BLAKE2B cb7cf8eabdccab296b404fe3480c8fe55986a2a812ec05ec41c1932f0925c0445711a21acef9cd6e71b76a9af35346c70c821d1a85010b1c5f478c96340db32c SHA512 d9e2be52969f635b9eff6a2fded91d33cef1f75b44b1f9b3be519ed476cc657700033e1449cb6e7917fb55d2ae7dcae61e1fe7bd8a700a30c0e6db90ca2af03a
 EBUILD kspaceduel-17.08.3.ebuild 752 BLAKE2B 642ced25029426daede22570900734ca393857abe26d9c1ab3f1cd50815bb701d8c87c4d2a3d0a9cea12499baf877695e49174b4e3326400eccf65f482037254 SHA512 6f580dfa34f0873cef0bf81bfbe47cb57b08414b373fffa4a5c0a1627f77736cb5959fa794bc189a80de81eb586f786d16a53418cb38dd86ddb2384157f7a3ea
-EBUILD kspaceduel-17.12.1.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
+EBUILD kspaceduel-17.12.2.ebuild 754 BLAKE2B 3adc0b4f2e5684930df2ce805f4f73747ef54959147ca2f6856ec9be17ad6679a98b3aeca90785bc4e91c74daf137e9ae1eab29453a614e245566c9160cc227d SHA512 a96eb8ae4de358c2b69d52a5eb05faa16dbcfba220cc1f3a378cc6798bfcdd9cc4cce41ff9c2880f05508aeae79f03b5d88d3eafee6806d8c2b68503f15099e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-17.12.1.ebuild b/kde-apps/kspaceduel/kspaceduel-17.12.2.ebuild
index f04dfdae0a5e..f04dfdae0a5e 100644
--- a/kde-apps/kspaceduel/kspaceduel-17.12.1.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-17.12.2.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 7b68ef052efa..ccc7f377724a 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-17.08.3.tar.xz 215464 BLAKE2B 7885e41c3cefe9f4a18e12dac9e543c69f8839554c9effd0425b76e6093c632e3faa91e1dc019b20ce415e129a824103c493d361cf8a5ce05c14f528a80ddaaa SHA512 ae1a1c79f8fc619cdff146104ef15191b77a1a25dc2e535085cd256d5d891931903095c0e60d465c68220628f18c8c5f1f029d4502648b403119e9ce4bcdeebb
-DIST ksquares-17.12.1.tar.xz 215692 BLAKE2B 000f86a69791e182b39b9cbb6ee65a3c640ba05df82baf6aa946bf8431dc6622f86ebeb83649f0af79ce86c40d343e132c0120d3406a3a111aba9772361fbca8 SHA512 dc22020e9916e136a30d41edb97f2fe392f6235bf6e3e713ba0fbc7ae05acac7d24d7468ee294c18b5fcd4d9ec20f67a86dac5f833976dbe05f780bbf7faa26e
+DIST ksquares-17.12.2.tar.xz 215568 BLAKE2B e686da30cf8264f4f3928a5e22f1df6884ef6dd3710c97fadf76a25c797434feb1c52b032a0d02d5b41493aaf9c8fb2d7ce0f548ece46b66859421c3908864a6 SHA512 106e8f8b1e05ae2ab3b12d47a671a1d771bf9ba33a3f6dfc88555f37f3d6cec0aa3a5ae14306354821aaa1972d704d82cace20a867bc4b74987b96879d8dc018
 EBUILD ksquares-17.08.3.ebuild 753 BLAKE2B 1a97ad9defd1d0501f09f9615c4df84d2b70c179084799eb7a31ae288350dedc5d9a3f27f250a03fad46063495f2c3bbeb4d9e5f9c954a1ab1f136dfda15d90a SHA512 07b8c674a5dcc0987b2ab1c226c5d6da7d680fef4fd6676d17d925315a6ea9bc04d28fa72672ab9fca9b1c2c9da9b2e531715bc09bb25460b48029844ebf7fe9
-EBUILD ksquares-17.12.1.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
+EBUILD ksquares-17.12.2.ebuild 755 BLAKE2B 34666b61861ef5d4cb094c3fb98bdf38ab93f26db755f9346573b9f18c82f08ba79ea6094388fad2d5791a1ee04f8377594f97e5ddc9d024f243fba449a66c41 SHA512 074c44d9b495cebe06681d14ea9a1b1af3cd83c97c0126b37cc2a3d2b3a6f22e845d7eb09cb1fedfa7b786190e0e9487b84a1adbc72798bd38b9c99686ae3679
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-17.12.1.ebuild b/kde-apps/ksquares/ksquares-17.12.2.ebuild
index 2a05f5517dc7..2a05f5517dc7 100644
--- a/kde-apps/ksquares/ksquares-17.12.1.ebuild
+++ b/kde-apps/ksquares/ksquares-17.12.2.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 40dbb7dde07a..6b22695722c6 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-17.08.3.tar.xz 1634212 BLAKE2B f736fd885e71c31d571e6cb2af8da1ffa8bdd99e969f0db2b7ec8aad1894124ae871f74774e7fc12418f29437a1d997bfe4b2f4ca884e32de7fa70f11e4cc9e8 SHA512 e948cf7ec5b51f83b3604ef7b97575543d4ee9a2fa17237954511e74ebbcf6b4a7781132a6e2c49ed70c6d7df653015140dff230275826f0fc12900f63c139ea
-DIST ksudoku-17.12.1.tar.xz 1634824 BLAKE2B 8be789cffe3d1226d644455fbcc0168e4e5a2620b53d84e5ba17c3743750daddbdd0911192e1745c3863f383e527090fadfbd560e1d9f197ca41c248a6ac8f62 SHA512 2a31f1d22a647d2d6375f31a6d5b95a37e575cf43b0194d7eac422511e00350a7e8af79e0589e450250593e864f02e00eb128b3c85c7d04690ebd14c0db0bb42
+DIST ksudoku-17.12.2.tar.xz 1634756 BLAKE2B 419505fea428ef3bb0e347869cb52a3688dc3e899e024e7d369daf0e90e7bbf90a308055da6fb24f6167e31dcb1f03d336661d8eef7ccda6f6593b7df57efc26 SHA512 4026c85786abddd92d24fa8716a27974a7fafa7eedeab266ebc8f5c938f2425e5d15e940329e2163f839cf02f5e68ffea94cdefd9d2ced43c708d04f9c9aa939
 EBUILD ksudoku-17.08.3.ebuild 1134 BLAKE2B f821d1bd3f38d460729280d448af594d7710973b4795a0d18314321cb7139c9607001fa9c7eecb3f6e14bd76f2fab57c0997584d6e1ecbed33dec0b194b00882 SHA512 47698a1e808602a63093e72feebcc94538f16ec1a2dcfd111d475d708120be136aa240c409840ec0574bf6b5e0fb213b8ae7fadca845917e4d029c7152439271
-EBUILD ksudoku-17.12.1.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
+EBUILD ksudoku-17.12.2.ebuild 1136 BLAKE2B eeae04131cb917f58883f5e8ba326c6f9ea8f581743bc8847d22a1fbccc1d329454b9102e499999ecaa96920ffa4139f2c8107861b89760d91a787ef3bacfa5f SHA512 00123512fde8754b05e13f98ee3b26f1caa4c3a370ab913de29eaead31b4faddbd1f9fb1901f094f15ddf0f9096b7a59a452ec13287793ae7988c662f9c39963
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-17.12.1.ebuild b/kde-apps/ksudoku/ksudoku-17.12.2.ebuild
index 816d157b242d..816d157b242d 100644
--- a/kde-apps/ksudoku/ksudoku-17.12.1.ebuild
+++ b/kde-apps/ksudoku/ksudoku-17.12.2.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 2cdeef3dbdcc..a257a0bb6376 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-17.08.3.tar.xz 1782244 BLAKE2B 6872f82d321ca90e68724e64d15d712f25975339e5bacbaad1d2cf0a5c38a81561a58d3c39564b80a7f5fa7fca786168b5ca7488a12301d6f3f7f6467149b7d8 SHA512 9cbb1c9f10b219ffccd896aff4a2d50ad9828e5fb57d2371216270b2ec7778c6e24d9825d61d4c117685817d56e72712a9232b66f74661459f470d4fc00f09d7
-DIST ksystemlog-17.12.1.tar.xz 1782228 BLAKE2B 360869bf9be3feab9fabfd05a6b10b1ab28da3a3db75adf68e0c3cb340974efdbdc8e163264d3c930bc145109797fc5a7aac941e60f9d0ec2a3c6416dc47e388 SHA512 95ae8b8a86f2a3af784095b9231efa5b2591f2486736e4b20b5f414ff4344fc8736e6c4a3dd91a47cb7d927c2f3efeb233f8090f42e8e5fd613d85e53823cf51
+DIST ksystemlog-17.12.2.tar.xz 1782060 BLAKE2B 4637ba40cb1c6da4e70b0140b04d819482ce321810d7dea6f8cf1a878226c7a758ae4edc5ed2f2445b5c9a992622432eb1b3427dc11e6ebfbb436252dfddb59f SHA512 d4f6bfe35cde11e2675e32c2b31468c3c848ae065eccaf2b4ded9adb7b03d558d2a555aeb77643a84028865b09027820d0eb7689eede8cc5dfb855c51855ef20
 EBUILD ksystemlog-17.08.3.ebuild 1564 BLAKE2B 12812055568716b9c65890c9319eab882620dcd557cf78f5c3069d896ecc60a09a2980d00079b4656a71f7e9c8553a96b90f1ea23e6fde88205023c788369883 SHA512 95c693b13b4b263727c1b672e951d7f6ff3f7844e6d79df10bc951a10fbbd6890a2b30c45806c146354c95817f0fab95433a264d6c5949bbce16e25d8b4d56fe
-EBUILD ksystemlog-17.12.1.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
+EBUILD ksystemlog-17.12.2.ebuild 1566 BLAKE2B 4e4b5120e06c4602c24fb80d11749d6d27b4e2830b879680162c47969688baef6db86ac036f807111dacbbf8f68a50b2716d0450108e62c63b6984d57ae39d49 SHA512 f197ce7053e9d69e276f1950b80d5cf47bf4693683fa65fed355efe0b7e3adfec58aa0c2606ffa75caee9843d771d2f435546eb16de98096db31e7e1452ea060
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-17.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-17.12.2.ebuild
index 613a2eccdf4d..613a2eccdf4d 100644
--- a/kde-apps/ksystemlog/ksystemlog-17.12.1.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-17.12.2.ebuild
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index cc1fc509e0c5..71c768b9e1fc 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-17.08.3.tar.xz 297176 BLAKE2B 8ebda9735717c5ebff1cd91621a1069b4111d442b240fb5c95697f722d3c7e5f1da36ccf25cad67a758797d6317a2ed45ea0544056254903d3e568acbc4df62e SHA512 68488c2d46a498c5b23b2ef8c4d8ca286c7d20923b5d61843a81d9fb534f5133166e0d9534706555d47f046ca16ba5169de0a48b81c66ed68b2018cf6b3868c0
-DIST kteatime-17.12.1.tar.xz 297240 BLAKE2B 92408755018faf561cccb0ce389a576a831ce644ff407d4f0e5942cc286cfd6f37d96478fe21b0479084d62b2e199abece35af2ee3d2bf916a8babe4b611805f SHA512 c4976636fccb40d57907a271ee262b0805581cea7bdf572de2cb789890364b9cb54d3b906c71cc0d91024673b5fe19d1e68b4fa48939b583719a1d4034f3a74d
+DIST kteatime-17.12.2.tar.xz 297240 BLAKE2B 685c9875bcd5fb1c45e7aa41b1336f6dad352db7554afd3f59c4953b597432c82c9fcf2903d2718fddae2a3f7da54ba498c5f1a640bda0bfa08ad9af6fa53832 SHA512 01de99319c555eba5c394c40532889183de37f962665a8e73ebe36d078185d757ced020e289c769b6062934d1e5a339def690711acf7d476e1f8f981d7048a5d
 EBUILD kteatime-17.08.3.ebuild 718 BLAKE2B 270421c648cfeeee7fec131a1636753cf257b66fede6566d3e4df71b5e5759425e50a65bd97e20034cb723cbcf2daba77fe8b7953f53513738a04f336bc71018 SHA512 ec666698ab5ce5cac10faa4f3e9b9afaaf65c9dc6e60ef2826579a5fb661b4bd911a5fff6044a937322cfe83ff613768449b4fcdb588291f61042c6d0db43c05
-EBUILD kteatime-17.12.1.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
+EBUILD kteatime-17.12.2.ebuild 720 BLAKE2B 7b22415e088d49fac77aa261a0f6e00074826295ef889336e933125e40324410ba48ef681ba6435cb7cf3e4a0cfe5ee671e1d69d2d1274a9a5616cbc8911a586 SHA512 d436ad0d811c8cb6c174a6cfcde05eca6286c51bbb907a255c039960f303278e30db94f170bd382d373c1f04951e158793fafe9e5a7a322e680c074c752c5631
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-17.12.1.ebuild b/kde-apps/kteatime/kteatime-17.12.2.ebuild
index d6175c6546cc..d6175c6546cc 100644
--- a/kde-apps/kteatime/kteatime-17.12.1.ebuild
+++ b/kde-apps/kteatime/kteatime-17.12.2.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 89f4816f77a3..c44c733736f8 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-17.08.3.tar.xz 451612 BLAKE2B cd88b0c5b2dc4ea61c5d55e483b805636e3effe148fe397be489413490815704f0e34cc5cf262d049b4787b9452b1f2db2ead9061855678e11a3a20e62c12f8c SHA512 dd6c7357376d4dff6b095f2f415c1b6ac119c2600b85a22a7685876ab44dc19de940ace3d1b342ff3f18e16fa89c129fd1e5ed0e53c967005d57c617f41209dd
-DIST ktimer-17.12.1.tar.xz 452084 BLAKE2B 70b124920c19bfaec0b49e9e178e864d0da6933cecee15a4da1b8d0a214c03086693949f10d0a6017f7c6c8b5459df24059b62fa54af8762279f4a7b275e5786 SHA512 d2ffcdbc5a5ffb96bce21a381fc522b111bf7c9d1934961e7ff87197813a6215eba8d1dcc1e7a1a0a80e81261f9540d3c0ad9825b18183e4cd476e119dc06905
+DIST ktimer-17.12.2.tar.xz 452060 BLAKE2B 8cd613bfcb02a1d73f0cc4563bc2068ba15aec17118aa925c5dc1815ff16a251f5d4ba203c0df16f4adb81925dbab1d27743b07a8cf4878230c1859b04fd4544 SHA512 cc0d70be3f68b17705a1aead5a32510ea360283a5f0fc63a39341ed69dc233e4eff59f0a75688d9c845fb1feefa13278dbfe79e7aa96a214f2f15f642f15c27d
 EBUILD ktimer-17.08.3.ebuild 660 BLAKE2B 2b74dccb001981192b0a207e95c90a44e4f64a08ab29e0553287fc34c27d217af4d7466c4bd5bb02721e73bfb7e5d65d60e38753ffcaa1a52835939c82d7c5c1 SHA512 f8f22b70118b757b413c496c26e785ede8fb3d3bc3bba609f8b4612c82e1ad4a7cc6089c90df26deb9e60028072292962e257724793f5c467431427d281aaafd
-EBUILD ktimer-17.12.1.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
+EBUILD ktimer-17.12.2.ebuild 662 BLAKE2B 8318d70484ae17a9e0f41dc423a44f204b535e7c9671301097d68482d313569aa552a7dd1e6142cf52ce0c6c290cb231b727d6d7e769f9c37a5a3bd4e7a1734e SHA512 dd1be55288079829704847d901181329b252ee506732978cb53bc838648b8128e6effb0f9e1a626ef0ab39fd8e37f8e9f5c97e7f63575923ac3602b40e3e0996
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-17.12.1.ebuild b/kde-apps/ktimer/ktimer-17.12.2.ebuild
index f21e3aa1385a..f21e3aa1385a 100644
--- a/kde-apps/ktimer/ktimer-17.12.1.ebuild
+++ b/kde-apps/ktimer/ktimer-17.12.2.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 9eb72e6deb0a..93c820ae22f2 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-17.08.3.tar.xz 5107488 BLAKE2B 7bbfa73bbe0ca684d03ab00394b1194bfabec58ab36045abc1b1122ba44f2c9f89d36bc18ea45ad5f810977fe1bff81ea014e90604f07d4fa7dd9c4878c2b22c SHA512 b6226262df1487a06836b0d71ad6363ab293ed78e2ab6ee6e4a58c162887cd9d6fbf475162156ac4e8af674e82a85382bc7cd3aeae4826664664e571c87bc26c
-DIST ktouch-17.12.1.tar.xz 5107740 BLAKE2B d6a224988477c07a9b9e809158266feb4c9703506b7b3dd15eb9458b6ae5483fe9c24f9f13970ec020e3df07885cf6e70b97005249ddfa840a93fcda6c1627e8 SHA512 7153334bcd73fc721d8f2d1baecffa8681126e2d6dc0eb393b8e5424e8e4f88140f740770e1ee79531370c118047048c83dd02e56249664a3ff2804b49eb17b6
+DIST ktouch-17.12.2.tar.xz 5102420 BLAKE2B 17bb92390feb3c48b57d5c0076f15d6e6e64191ce722f89d608ebaa10f932b9f3a5907a8009e52b5e7115ee0c72c590a8b3dfdcf9cd22271357c6661fa6e4251 SHA512 449bc268254f21f3376a9b75a0aea97af5bf9d3617f7b7484361a615f3635cd60c74a37bfddd8674f20667325574adecaf42f362a3bbd6e5e66a3c6f5764f41a
 EBUILD ktouch-17.08.3.ebuild 1111 BLAKE2B 9c6f84f76ff7f5002944f1a7d2f8d21b47679006330e301e935fe482a07b774fcaa3649032bb49a743bd30aa9a06bd8b5eca3051dff5bf2155d217fb4c27f4fa SHA512 9088d89dd8513c372e7afdee56ef1453db19ec889b261ed8bf8a54feede9242eca469d1fff0322258edd7c07360d29d160a28944f422d757d8eed43f5bd8fd0f
-EBUILD ktouch-17.12.1.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
+EBUILD ktouch-17.12.2.ebuild 1113 BLAKE2B 22f4ddde7dd55145787c72259495d40470a683024092a787e037347c6f2195614e608fe4b433e84221c23b735f4326e9abbfb6dfd77573a1cfa8e50b2356f303 SHA512 5e866834706e18c4d1af4319fbc0d2d135c13cc7b3099b631393addd93bbd777f620ccf97374311f63d349fe13893ef6c34bbb2631d5930c3a2e6f7d0b31dd8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-17.12.1.ebuild b/kde-apps/ktouch/ktouch-17.12.2.ebuild
index 548ca5f0385e..548ca5f0385e 100644
--- a/kde-apps/ktouch/ktouch-17.12.1.ebuild
+++ b/kde-apps/ktouch/ktouch-17.12.2.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index dc07fdf6fe90..503bb91af8ff 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-17.08.3.tar.xz 262952 BLAKE2B fe6230d7cb739c26194a2ef05493aed1bc4ed7c298b1fd143701fc564619e2b872162eb30d827e7e795ef20c15f1253b8a177e8efc6c5c144b53c12487c5cfa9 SHA512 a621cc83c7dd3827af55ab5abc486ce34af9281e194fea80489acb4b2c4060f1686433b974c56e333368b79284421acf556f28e0f4035d6fc1ca1612bc155454
-DIST ktp-accounts-kcm-17.12.1.tar.xz 262972 BLAKE2B 46c3061a927ef7155d9d1a03ca3b1aba6f208fae0f0d994cc1c17bd8d8bda05c10c02368debd44e584d5f59f9314f13ede49e9b1457c22029dde075203da2819 SHA512 c904d9b13be2ea38bea993bbb61837e91e534ac57262f817303a1374a92ca81d2e24e21700ba168cf747b7a4275e34bea84f94d7adf147410a4789b5bfd6a32f
+DIST ktp-accounts-kcm-17.12.2.tar.xz 262772 BLAKE2B 9072ae171f6e66466962c8b5e7f458f3ea2f371b0fed6f136f6004a725b94a5400349bfa85480c79b3668f7d64c7c5e84f89db39f3e9c72413888d953e4f59f6 SHA512 890f05eae2c405c887158d77eda5a8dfcbc9842c8273abc2d2ee53f4a7a4d0fa59986c33fdf0a593d92e8da4ad9d7ab8a61a6b5f7c100608d99bbf113ae89940
 EBUILD ktp-accounts-kcm-17.08.3.ebuild 1515 BLAKE2B 0585f358eb2915960b27693800deed4b15c8df7087dd50d25bf6aa3ffd1d46aea8951dbf81561cc366aaa2e44233a81e7597b4b2352a6b9920456463f6e89ceb SHA512 0ca4909005f8882291898f43546b89d4fc81e587c538c3ed48dcdab3599bc82c3255c6b697f7d44e8cebf5d5f37d31831f0dc6338f38829917484aea02c6ceb0
-EBUILD ktp-accounts-kcm-17.12.1.ebuild 1517 BLAKE2B 48f2ffed91735d4272295c4bb97c89b9e426f10e764b318f777522ee3b5ffcb1b9d766349915c39cc0c1dbf410d09aff8072ba3122d406e8c3cd14af7ab423ea SHA512 09d7da9b05ec76456133d73b1f5900fe1456d03c91736ff3a308e1c6e55734e1cb1abbd6c17a77b8849358692f2a3814f08d76e716e08459d32f48c1e49057f4
+EBUILD ktp-accounts-kcm-17.12.2.ebuild 1517 BLAKE2B 48f2ffed91735d4272295c4bb97c89b9e426f10e764b318f777522ee3b5ffcb1b9d766349915c39cc0c1dbf410d09aff8072ba3122d406e8c3cd14af7ab423ea SHA512 09d7da9b05ec76456133d73b1f5900fe1456d03c91736ff3a308e1c6e55734e1cb1abbd6c17a77b8849358692f2a3814f08d76e716e08459d32f48c1e49057f4
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.2.ebuild
index 0bd40b4ef69c..0bd40b4ef69c 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.1.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.12.2.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index ed180a3cbc47..f4c3f5f5763b 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-17.08.3.tar.xz 37152 BLAKE2B 32834432f5eafc4758c35c6534c5afa35c8cd3f4bc7fd2c2cbbd42e3ba8e05d49c9920b4bd50266e198c0c842b333011033989f3f1fa24d85bfa90d62cdaeb14 SHA512 58982429f04ecd630fa5a2dd8902b043d4c0f04ff1b8480be4a93a42718e2b826b342fe241137ce5b56752b708393a346e15e26e1a32a912787a3e2c66659e33
-DIST ktp-approver-17.12.1.tar.xz 37116 BLAKE2B 74bcfca86e67f95178722e7a0322f0a0da18e50f869a900167e86103b3b65fa48f8679bcb0ad55f2cde237a44a898b2de25f6853e5c0d7bd9fd325d0c28e43ba SHA512 dcdbbdb2a00ac51729cccee70bc11391111c6e9e566082fa015ba5a19f55f729b6531097f2f9af700ad8d780b073dad16bd1c522b13bd73ca66340a3f1c1b870
+DIST ktp-approver-17.12.2.tar.xz 37080 BLAKE2B a65490c7785a690e011985e2bae895f0a77d213a59cf92d71e964804716931562c7cfb0a05d1d2c9d469557265ee294915c1a40dec7fa11787909f2e41b8bd16 SHA512 906765fd2e9cf31435e54a2e300ee14faa5d9ac1b732242ec9dabfa7c344f76ac34c88f3594465991fd8b887de669b1fb1d83ab7530fe09709dd7516f84a8e7e
 EBUILD ktp-approver-17.08.3.ebuild 676 BLAKE2B f62beb2ca72e940b8a2b82f18d58023dd11e0ef70d5bf880fd90c7e33048888e23f89a701c672f23bcd1e6343859fcd7cc46ff0c69124066147092f6fc971d21 SHA512 1cf9a61a44bbc57c8a641b6ba7a4222b9bf4a423fc6841be3b22591120825feb78f522f61317cedeecfd54f099908609a5c8c68bad3956a207e0068066fe0e0c
-EBUILD ktp-approver-17.12.1.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
+EBUILD ktp-approver-17.12.2.ebuild 678 BLAKE2B fc2e7bbe1593511b7f1e6df21cfc923160759e6444f45f511c427dd1b8b748a50adcb6aab1bbc3232aae16083d3e0e8c727c41c0bbe445dfe1b52c789f29a425 SHA512 39a4495a943b4d041cb3b229558272cc0fd8ff17be19af01c47254a2113ebc070ea7fcc6546a9c9368d7c1b1af90dedb4806561b7a92d6353f88dae0757e9297
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-17.12.1.ebuild b/kde-apps/ktp-approver/ktp-approver-17.12.2.ebuild
index 58706d972a41..58706d972a41 100644
--- a/kde-apps/ktp-approver/ktp-approver-17.12.1.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-17.12.2.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 8f6ddaebde57..d7b7f50b9607 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-17.08.3.tar.xz 46240 BLAKE2B 117674ce01f1ab58de0d3f5b1aad694de960d079049ce47067884009dd9501543c35709181cb704ce4e1f3404f44b980b5dc67c50e76b05aba3294a0b42374d2 SHA512 de7beea892f6199b6b4c48e93b4ce04449f72bd1073d4ed8b305f2c5f73e70ad23428b47533dc04d168a4ef88d03fcdd8150b37af94e8d562ecedcf4e8dec069
-DIST ktp-auth-handler-17.12.1.tar.xz 46268 BLAKE2B 1926e0daa45d83424c5a1ea02f00f93746322bc829bd57a5ba1a38642414e09d4ac413af174ff4502df537e0434c21ee0f72f785bdf898c328f09a064a3ab83f SHA512 0241bc6ccbd2cc6a01c459ca21a81c9f3c96b37183bc4cca199fbf1bdc11f3f0b1bf7736ae34afb762208b88f691f2a3733d9fc054835f5a631608cc19f64adb
+DIST ktp-auth-handler-17.12.2.tar.xz 46288 BLAKE2B 1c021b591cd43ae321ba78fd296492ac982074d7cb73f9a2891e261d928bec44730207c890f7a1bdd201a8a363c982cb3a7ae4e8e54ba3a3f78cd9bd3cfc141e SHA512 27077a8808fa756e0cde128abf26291148fe1362041102167b5ddde057a442f04e0c8cb6915e51b63053be04efab93a0223953d819641690aebb773ca69b43b1
 EBUILD ktp-auth-handler-17.08.3.ebuild 824 BLAKE2B e4b95b1b3a1d6977697649c5e3f99e435f78d491bbe83027ea832f69016a72e37c7fe7da410e23dd730357980ea1ba3f7f2b486068ace605eae5ca930aacc452 SHA512 2fc4b4d7e251e8f730ae8475d3066644740f79de0c18382540adcf4ebfdd15152d56502ab9ba706c9a5b13b592d54b94b746c77bf32e1ea8d44ae96b1a1d70dd
-EBUILD ktp-auth-handler-17.12.1.ebuild 826 BLAKE2B b063084b0c2df4e79d1850228aa5dd09a26dce79dd68c9cf2dd26330e73dcf5951a4869a81af792ca066d66e3ac98380d97a7518a3fff15f966b08e0e6c301d8 SHA512 d257cac8a0ef4dbbbd1aedb0b5e8cfb87025286a745119ca7b0e04e7053b7979bb7cf3238ddd8439c111288c0891120ab23b5aea99a7fc910c1d6bae2a226590
+EBUILD ktp-auth-handler-17.12.2.ebuild 826 BLAKE2B b063084b0c2df4e79d1850228aa5dd09a26dce79dd68c9cf2dd26330e73dcf5951a4869a81af792ca066d66e3ac98380d97a7518a3fff15f966b08e0e6c301d8 SHA512 d257cac8a0ef4dbbbd1aedb0b5e8cfb87025286a745119ca7b0e04e7053b7979bb7cf3238ddd8439c111288c0891120ab23b5aea99a7fc910c1d6bae2a226590
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.2.ebuild
index e76ea82248da..e76ea82248da 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.1.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.12.2.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index dc164c167624..c45fbce19e36 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-17.08.3.tar.xz 96572 BLAKE2B 862c38ba997bd97dc82a6f430f22d2b871d5ed5db47931fb9f12ec9523e330121f81295f89dd1e68556593758ef5554c9650f080951ab9f2552b479825deab4d SHA512 45cf95c42959b21ead7048e72c16074a2e5ee8a012fe0d287a32741d896d4af03abcca640d875ba8a223a5cfc7f0ec1cf845cc1c87ae5acfd88fb55020a2810e
-DIST ktp-call-ui-17.12.1.tar.xz 96564 BLAKE2B 83680fee65a53f7ec9c8c23d3388072cac05a40b2ecc3a7b2c004897a72070e18cee3e8ef91de66b12ee71222af3888b980ca8dbe34168419161ed15be585bf3 SHA512 c1b544ca8439ec17dd2669892489ce70ec9cba0f2196b91827d45a0fd36e0a4df076efd7ab3d2f32afcf03ea84a09249bd35546a1f1fef55f41caf91ab3bb0e7
+DIST ktp-call-ui-17.12.2.tar.xz 96492 BLAKE2B cacf29f85dbc815aa00fc449c38d9fd45ea8f359316feba8c289dba363de095e622dfe1e8ceeaa121a5d2b7f0f18a577d016242bc57d621d3ad2b46e95359796 SHA512 df633e964c35a807bc349c2f18956cecb21679b4d791c552f6e445bb91132f454804c04cb2960c7fb203ac47972fd28c4ce7793600ec6888af409166ebfdd36c
 EBUILD ktp-call-ui-17.08.3.ebuild 986 BLAKE2B f0f0a0bd2984d4bd0a863e6be36b141daa9c78c91d7f0bffa9d1301440a1976c16a575d7075b061a4043251c0b945cf7ceb6a86ef05d49b580afd5fd66cdf74f SHA512 97355b6dc1137197fab077db28531a680d2f073d2b254d82ad2671ff4cc1d9c139e5673e49d76cd9c98cffc7ec3908074a297a5433b7b758bfa81f793a553b69
-EBUILD ktp-call-ui-17.12.1.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
+EBUILD ktp-call-ui-17.12.2.ebuild 988 BLAKE2B df355a4c0202bb4806aae3cc920d3403a36078d209e061ec3c17e69923cdd7bf9c0276e7cbd4cc793332d0fecb32e663e9760fb85bdb8312b840c7fc64583fc7 SHA512 a7d7fa274e4b223836b68ab0ef7edab29464bb09d9515e0f52e412d96abb4da608ee0df38d79179daffe879c24bee06591fafba5e7feb2eb970411f6f688d00b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.2.ebuild
index c0ba9a38bb85..c0ba9a38bb85 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-17.12.1.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-17.12.2.ebuild
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 338e4f409579..9415cf379a98 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-17.08.3.tar.xz 441460 BLAKE2B ed3ad90bf587352a93827bb78c5ac76d8fdcf29cda0615a822a49d230d94aa60d56d65f860b61ba8d60dc577de0ba827ec8195193800178c477dadf13754a884 SHA512 69feaf0d95f3f664127a42071ef3867d4efa3f1adadfa5e30da4a907fe285866fcd765e6f747e0e3f19048c62148b640f73c4690eed5e04de4c3cffed2403ed3
-DIST ktp-common-internals-17.12.1.tar.xz 441488 BLAKE2B 71e74d3ec7db893858ac3efe533f77edadbe823bc871be82fe1f88a061fd31439b9b2f66061ea315891313e5cb0c0a427014ce6d0ee3a9e3bc1dca299e980a75 SHA512 fd164d707256a0c07dfd584f1439bf0f0c80cd9a66d292dc9bcf7d072e5ba01b64b735c2c87b9251483e08f9e9f757fa704ede9d50bfd6ae3d74bc27bb290f4f
+DIST ktp-common-internals-17.12.2.tar.xz 441140 BLAKE2B ca6f823e9c44b0ecdbec94e15859e2a523d2e83a222263198697c668e33d51913e04d7f92215ae5ba8d5be9b70b3ca06c1869274b12014a6072f00af98ceb7a9 SHA512 f8c0311bf149456c3eec611e4b786c1109371187d682a1ba65cc90322e3e47438500711a606581df5cb369957793b9476a429859c54349b10e95685d095debfb
 EBUILD ktp-common-internals-17.08.3.ebuild 1575 BLAKE2B c107daf0efb0f06aa370a1eae8476690b9cd90f82fb6a7c38d2e2cf6aa11be7bc2f8cdc268dde0bc0c2dd3c01e80ee15af1370bb2290788860256a80a387257c SHA512 6596dcdf5cbf5f025875aa225b57e8b0d4582cafd5d30dad200ed92b9020bf0a8dabd81d043f116a4f192c369009e9f077f44180cb0e45ef3520821c813a7d84
-EBUILD ktp-common-internals-17.12.1.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
+EBUILD ktp-common-internals-17.12.2.ebuild 1577 BLAKE2B 13d5904f8057dc070c46a30faf664df43a09f0a27aa60bb526cf8c254c97ff4feaa3741531888c54591acd0aebe1670934c08e2f24fc63348e677ddade7f0abe SHA512 883bdb30443d1b8999bb0ac2d984224729f2baa5f572824206da23a247fca8a47d46edfe8987c1dfaf1ba11065062c9b071a2fa825b5ab97a21245448bee9d23
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.2.ebuild
index 6325d2580a18..6325d2580a18 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-17.12.1.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-17.12.2.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 7dab09378ff1..0892ac06f5e7 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-17.08.3.tar.xz 132120 BLAKE2B 9aa2022e0c03ec68bf57cb7a4bac528d31d879aef6881cfb8c962e4028ea4c1c4636b16ae3d5cdc8abd5022dc4fa1b60c8ea2ccd49137d5f45f83d6132f34ec1 SHA512 e3c4ebb45125731cb6e00387803bb060113ae39243685444c3bf9eaf87c15827e3b90c2e7c0e4e9d5ff3af26a59bed4c0321369a39a5897d711678e2f251a0ea
-DIST ktp-contact-list-17.12.1.tar.xz 132044 BLAKE2B 3cd356b44c38c226e1a53f93b9c86bc932bdc1f2824cf6e8198a6e81b1956dc06740e485d7eb1c8353cda6c6d0e2712cc2dc51008a726c7849a62f5b32ea889e SHA512 f13d89e3fa113dab4581838332a639b4e15e299f7cec01331e65e6cbd9e4fdc032eab59eb689d6ff3897d3b05d2129c134cf1d4e5dabcaaa85f95edb07d7df8b
+DIST ktp-contact-list-17.12.2.tar.xz 131456 BLAKE2B a5247330d4d155e4b4fc671452d8dda81ef4cd17940b2ffbc43e3ca54f6d29a180849083d86cae2013015ec0f360ba2da3137663dd9ca8fdd9e132b990f45d69 SHA512 645a2059facb25556ff3a9194096cb028513417eebc98eb6f5c59274863019dcca26294505a38c534f788bcd2c3c49fc2410b1028d2760c327df709f1c18c7d5
 EBUILD ktp-contact-list-17.08.3.ebuild 1032 BLAKE2B 408fb1261f26d1a71c5638e3e20886f095314cc212c84a503c5f147bdc4f8ca172bfb8f58132c2ef5d8ddcd0c1591d7a30515f2819f8a22bcb3cfd8ca26654af SHA512 ab9012656027d1449fc8fb06c514a64eac018c692405a5e5f96e934ffa1eda197a80e0352bd8ce9154ed242da043ffc37b075cdf06ea346436f7d8b81f6d9d62
-EBUILD ktp-contact-list-17.12.1.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
+EBUILD ktp-contact-list-17.12.2.ebuild 1034 BLAKE2B 56bc019c2d9917f22c97d7590c00e838b817369bc5c19e3b7fa94a695a5d2e36651b677f6461571a331a9a38e255f606e22d7033a160c3b347cc5a526095d3ad SHA512 7a6442a27d413edd477ae3f4463d300a6eff463df6b5288ed5cd0f16d5840472c10e78679706215a66ba55464049496019fa808e415befe2c885d2c225be7186
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.2.ebuild
index 93ce9c752242..93ce9c752242 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-17.12.1.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-17.12.2.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 62d323173866..a0bd93defac0 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-17.08.3.tar.xz 40088 BLAKE2B 5f547b1108c7d323ad39e879a72dad6146e7dd1a6839de6b154962685f897bf844bce8760b3c0f351cd1eb07c3d5e1d9d9c857f9a6206a5636ef935d2d52e513 SHA512 e4965b95168753a8143e7221129df0e27f746c9b1933ab65b0c10428949ffb7caa82094d9fc01b93484b9028cd9d8719f50bdc253d36c0d79cd4a7581870a9e0
-DIST ktp-contact-runner-17.12.1.tar.xz 40096 BLAKE2B 0a1d5c453625fad40807ef5ab1e0ab7b7e3d084b2a16a5f1d31d8f1eb715d75c7308588cc046b8cfab58421f266fd0a25317eb122607cbb37fbabd8959b84ee5 SHA512 edf7f50921c09082564c2a8cb11e3f7a6bb85381cd0a5f7f06952446e92cba6a99ce7334ca225534c892d70b868274ca31c874afa1759e5f0e29d6c2ece4f6ef
+DIST ktp-contact-runner-17.12.2.tar.xz 40156 BLAKE2B 5ace9e19215c375986e2803efedbbfb025289a4086c8de9c5f8eb7afef866283d24f0d71ed5cc88f6d621c7f7f7bd7406f3c184ffb00538893333c12095ababd SHA512 0177f5e097857a7e7c5d69eae83bb66e13ac3b030e6549421e07079101f0424f99997c70d374c6b9429ed7d678b766e1aca9b361c6fd636ce6ca7e1a98b57e73
 EBUILD ktp-contact-runner-17.08.3.ebuild 602 BLAKE2B b283005800f11289c60687ce73e529996f75c11c15e229f0ad3c7f1b285f600f1fa69f923f06246f2fd27a172da37f82434ed32abecd6250fb633d9ff142364b SHA512 dba1c8cc89ec69cf21f746d16e0bc88846b0537681255b3cdbac74fca0e3532c8d522a2d98a090c0852876a04020d74d54f16538e003513cfe30f23286df6169
-EBUILD ktp-contact-runner-17.12.1.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
+EBUILD ktp-contact-runner-17.12.2.ebuild 604 BLAKE2B 6622ba50a4d80fc7b4d1d363ea4c70784959f9a4d7ee0e14d40ab895acffd1d9ee82192723d1aba091c0967cb153efe696835c1c3bf638b2416cb1fd80d839f3 SHA512 5948d7f4be6801e6f4258d79bfce0a59fd87de8a0635a95fb27d717dd8dfcabf99ccf89c90d37c43dfcb7f8a3175b73aeb5dfbbbec9d0b143e28bebdc24675ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.2.ebuild
index 9aba85ad01ae..9aba85ad01ae 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.1.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.12.2.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 0ec4b213a016..cc930064c8cf 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-17.08.3.tar.xz 43184 BLAKE2B 9d88c4b3ff03f4415e6c49fab58ffdaf35ecdd36a020ebe781e854a7b1b868605d3fe7156e2778fc5c45a2b9705c4353c8609490cc6f51843bf72fc6a0b95fae SHA512 743c6406a8d9d9ca0739e0a8072a6d9e6541e1702b09c53ae05b18feb8209c4b18ab4a9577537b60c0276e49d959cfda2f071ece099b087e38d9a011cc0d52e9
-DIST ktp-desktop-applets-17.12.1.tar.xz 43232 BLAKE2B e72b3adea31337d336d0f8ca8c6862b85d4ccc88f9157add544a09db6aa6eaad7b610f78bbfdd8f54a2c195e38d07d4b53f40c4fc9f8611bf9c40bf0179ad645 SHA512 b5c2f9fb89def06e9f053b2a306c1fd542ed7e45426656e551cdef1b49007598fb072a242f82c334890c0534d684a2e5295ac5b45a94a4696119bd58d5b9aa9f
+DIST ktp-desktop-applets-17.12.2.tar.xz 43176 BLAKE2B 964b3cdd31a91dc28c3b6c26aae457cc6297793f854b24767850177e3b1fd6843af463274ca93af860e8593d4ba4c2c09c4911ac81246d2afb2b36f883fc2789 SHA512 aa9871eeeccb1cfef2789ab939cd50fdd05b9ce9d49d4eba8b67cba22be5b7bbda1047a9a6cd63cc67f50a47162098c4dd9eb95fcacfb97b6a60434341435c6d
 EBUILD ktp-desktop-applets-17.08.3.ebuild 572 BLAKE2B 21e44c9af383ae76874d8112d3153f35a30134fbcc2c4262618ce0348b2c1cdee493c27bbc8ad2fe2dc9dddc0f59ab1b82202ea30d1f35bef88cb9fa12f33a19 SHA512 e54abd9f765a25d718b5de5c49e3e518541af00e4b1f69ee022908bed98f28a5c857ae0fab7dbb719aa03fca6f211aff08239b01f048a6896fb64d2b879e5194
-EBUILD ktp-desktop-applets-17.12.1.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
+EBUILD ktp-desktop-applets-17.12.2.ebuild 574 BLAKE2B 1851b413a5b983170f7e860ab060b37e568045536683a592e487b5809d114b88d21034823ea822ca28d23756c6a1b7d84c7aea11e3169b8fe39186511c453b14 SHA512 9be0e929b6e3875531784f3c6e6d396ad5f1d529570f988d11e1e225329765b20ced20117b8e0bcb44dc16347b27843e665010a76d45e23a8c98b26de2639e53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.2.ebuild
index 71c40a130e42..71c40a130e42 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.1.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.12.2.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 2d1af3505ea0..3182084b8781 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-17.08.3.tar.xz 46052 BLAKE2B dccc6f47a7a29499ff748d6abaf58e51eae8ab71ccb19013a0a38d5fbc48ac693124f9c77c6c073e99c40b2b753767a26c611960873fa1bc72f6eeb7ba6a4d75 SHA512 c67246b00ae0b76773e8b3b0e1a3d79b5b06dabe37941da2262c30bca256270dcca710b866975f20d950719bc319de594ab50de21abd29d3b966e629b50d8a56
-DIST ktp-filetransfer-handler-17.12.1.tar.xz 46092 BLAKE2B 563dc057e0ea6da5f9e45db6879bbbba3ad7825c4f1f6de61bdd2220bad0b459b9e91db0e458caaa1c81d2494e38514ebbdf3447ea6f007b262bb2f400ba9ae5 SHA512 ec3e95ba78913ca60a9c29836e5e7828da016403b42612cf7bc2b2675c8c9807281ac93b4ff5fac730cddd03abaf37bd8a6668bd3539255834d892fe16fc9ba5
+DIST ktp-filetransfer-handler-17.12.2.tar.xz 46008 BLAKE2B 91068cc53e69cbb23f0ed89a72ac0f3aa7c5567ff751adbf439223f866b24c1867650f2e765319e539471b8046064f9fa65668d87bac711c6d9c9453d0923390 SHA512 df06f170269ef31dd46f650e1467b7f46274d2d9443e9c9332c213c8e1f167d297cc99619130def7ce9e407ae4f6d675e8d8afb1d556670f8c7835ba39ee00b3
 EBUILD ktp-filetransfer-handler-17.08.3.ebuild 618 BLAKE2B c7808bb54f0876f2e549d5c7e05ea01c190e7e7b96bf7a3a47973a8fa62168f459a58f483d82f3f93a0bbf4d9927ef03de9825444ae0c0026cb3cc84ec483415 SHA512 793290972d3b45d8787c86a9b6875471a10dbbad1105e97d94a1bc825587e5a5b6a18037a0a6ee50f24c9737da69d2d9929bd0c6cfbb9d57c7324bc148fff0b1
-EBUILD ktp-filetransfer-handler-17.12.1.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
+EBUILD ktp-filetransfer-handler-17.12.2.ebuild 620 BLAKE2B 593dcc7dd236df4297f96770b92fc759329eab0c7e6489961c47e2fe9748eed796380e92a3f47063c0d67b05fc36d042b818938508c8fcb617b23ebeec55b040 SHA512 ff66dba93e4ef81b2d53e34865dba2ecf9f517a814134bc67cdd350e68adface3a82815eeefb5edf2c086da89b71dd87c25969b2c8757e8b3b68f559fe7c366b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.2.ebuild
index a8e607bd7257..a8e607bd7257 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.1.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.12.2.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 9d0d234b8c4b..e3bcc3cf25be 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-17.08.3.tar.xz 81400 BLAKE2B 74fbbcf1426612f59a32843fe48511674c7a251e9ea14c3429f5cfb3d1d7026276a695f9f5c45d5636505fe7f5a8474fbe96669a9443456e110c8f1aac73ba6c SHA512 2631acca0d94b35fe6fdb44e8e7e0c54863c0edae288bb5194fcb85a323b55103ae2a4f13732a3818041fe7168e625b87def71484693dba7f82524feac56efb4
-DIST ktp-kded-module-17.12.1.tar.xz 81404 BLAKE2B 1a9772f1bf4ce5f2e2b3dc6d0af7266941b65a3dcd89d64c0be2512cb1521386e97564ed9672cdaa30bab0a2f5bc215f6a8fbcea0cb8be74489e9db225987ab7 SHA512 6a376acad784c59194f59be76827e69fed73710388f935fe41e6f341559b04a4fe2f502e7d161aafb39eec8d2a2725d50afc57dcbe175f212954cc96883cbf06
+DIST ktp-kded-module-17.12.2.tar.xz 81264 BLAKE2B e674b083c74106838f76aaf5701b15139864bd49df0f825437bd900ea27b337127963ecdd3652317971923cae57fb61b3b5908e8cc5586524cd0a0ca42ff8d44 SHA512 93bbf1a2636019ed7c2fabebbe38c161784e7e65732c31c4c6c3d5f333a097c7ed2cd1082fc184b16d4149354bc9c2bba32e37d2d71d60aa5abf043c49ec8288
 EBUILD ktp-kded-module-17.08.3.ebuild 977 BLAKE2B 81c29fa83f3bc19a7e482b229f9550bc6d3019fe750af0024c277fe15915aa95b3d82af842366af4e0107a3f8d30bf912759256334b77f8425edff32a7050e3b SHA512 91ba3e4eb9e9380fbe50f2cb204a3e4f278e3eec80353b2f4cb1d030547471dc867cae372e9fc9532bd15ce92372b3d97a1ad34346b813fd25f340509055d0e4
-EBUILD ktp-kded-module-17.12.1.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
+EBUILD ktp-kded-module-17.12.2.ebuild 979 BLAKE2B 62dac52cf5e965eabb275e915d898a86347509755c7414de327027b249ce23324ce34b5f9c48eb50c23d11b702241c53a8d955f3efa440b2985e5175f8a7eb4d SHA512 23bdc7544d762b335a2f0b41538bd81517338570905d1019a4f2f7d9790f73f44a6b763a8847e592e2cdde9188d0f97839dd683c6df0bc2a7370e8680edeff3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.2.ebuild
index 6d59197ba41d..6d59197ba41d 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-17.12.1.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-17.12.2.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index b68e190f2aef..a804002fff04 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-17.08.3.tar.xz 28808 BLAKE2B 3ba9dbdbd7d0fbd874818cffcdb8d9e2d5215501eecf081256c49d3a565c7317a1ed835cf23f839bfa1ef6d7adeeda3e833aa1403b359bd3e614a77746f1ca38 SHA512 bba79b9ce1e16635d4d21de5ec25223ccb63908e1a0cc1d25e9bc6808f553b4ad850ed3460481e8cc418b9a8290f056a751c8e2fc14f668dc4e3f20695d6ddfe
-DIST ktp-send-file-17.12.1.tar.xz 28796 BLAKE2B 2851012cc6e98f126dc5b2dd137544653ae44983227199b591550ee293f63768da4d41b8df01813a08734585eeb4ca5390b8a635a21b4c6353e2f2f3e8a91251 SHA512 f86edf512e338a28272e40fbb270fedf1d7ab17fa1a90fce927ee9873ab46b8ad4aeaf8557c0b9a762d8bdb060fa4d3ff8c6cc6326552fb1b2bba8d364b972f3
+DIST ktp-send-file-17.12.2.tar.xz 28776 BLAKE2B 902e33a94aeb19d0ba9681a37f931fe8c7a305af2e771bb212ef0ffd65f53b84d6aa5a5b310850fad5cc54f39a589968c9fa7cad0716a6a052d29db90da7a3b6 SHA512 19b2b62654c8f88253068b8c3b4f432d48a813cfa90ade185784455b4aa0570fabed1fb1f2b71ee465c1f43ad153bdcc87f2c642d8c015c47468e2aed6f45761
 EBUILD ktp-send-file-17.08.3.ebuild 825 BLAKE2B 9d71d1a6a98d2f64b80ead70ae97170b7cec1a9d9806acba174687dd22886e990b31aa9d5c3b2d475c52234b51956935ea122decd20800212977e4509dd07fa5 SHA512 81f031dbfb042cf4a5d9248c893a18945f82ab8ad62bf0593779c46a5fa28b00b2cffedf3c94a948ec5855d8473fa95fac3b60eb23fb132fc912e760249013aa
-EBUILD ktp-send-file-17.12.1.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
+EBUILD ktp-send-file-17.12.2.ebuild 827 BLAKE2B 7d38262647862837204cdd934c6d57f4982cdb6150814a81d839b8efa2172e680e5c609658a2ad8517c8e21368fc68df5104e51763ec6ba8014d48e103c2e28a SHA512 091f5ff352e87aad765423053b464eacac61cbefde4cbc3b095673a4657292516673fd4bd52634f594ccc25593bf8409b5e1571cf5701265e639c6c34abe2d12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-17.12.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-17.12.2.ebuild
index d297bb178cd7..d297bb178cd7 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-17.12.1.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-17.12.2.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 5cf206b6db53..b7a0b78c9861 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-17.08.3.tar.xz 468704 BLAKE2B 651d51416f246d216c0d3e8f835ff672cd21703d2be25c54e91e2d06e98e1b05759969e94b77379d74cb7bc332009894613566980152593b1050279719c365b9 SHA512 4d5f870c2078ab3adf5aab2471ecc945535bb52754b610ce2b3edce1320f09c26554719d4566e4ce9daa36c038846359aeb07e98690ffeb87e0534c2d4c5f23d
-DIST ktp-text-ui-17.12.1.tar.xz 468764 BLAKE2B 34b6aafe1cd34c4d18bd983a316daa23c2746ffa7608ab548d4239767ae3ae1b2efdaf90a560607c3d15d3a54c55d02013369c53978bdadd57505bd58112ec5f SHA512 a1d5a8c6d20d61cc74fc034c0a1ceda57f8d96b949f1568f61afbf9606b0a90183eee15de4249d7997f50e252b12e75125a19d9f1809097f6aa38de406a4f607
+DIST ktp-text-ui-17.12.2.tar.xz 468492 BLAKE2B 32a21f21059d51012bff30168924a3106678cb93ce9eed364a0d854414f18f615c16a974a0490062095a6c47c362dc3abae2c8523f26dda55474e910b4b9f49f SHA512 bb94c43a4b7071246af29e75e8d9ad6219bbe912f696fe1ebf248f171caa480c91abb79ee45d8f94fda2d73937b1aec7bf69d8260974c9fc772145cd65b9350a
 EBUILD ktp-text-ui-17.08.3.ebuild 1487 BLAKE2B c5d88e568bc204f1b89386c805272b8355c6af9d9a5d2ea801c48b04048fdb34b58598a85223802126b2735d8539712d72b24d8958a80991c81c0d7768ad6882 SHA512 3a2d14ae27a280e1f2e9b3a5047f6c641bde31621e6d299b2a3365705d140c5fff5621a0ec7c56f4cea0b9d0ad2da2502b78e7b78e723296424aff3f1eb6fd39
-EBUILD ktp-text-ui-17.12.1.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
+EBUILD ktp-text-ui-17.12.2.ebuild 1489 BLAKE2B c36a18cf0d96100167035bb215b826ec98eb208654a2946cf170123cfd1cbb6c59cea679c5ba1288120d2608308b9809208d4a6d3484dc1c23840d93fa7049ef SHA512 0a64956660b2fe4212400ddf29bd69dda53cc7ad1c708181319d68b283fef21acbd1cf3801b0832ac6eb0e610835afd69651a8aace292c166ea17c6e0f8a5cae
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.2.ebuild
index d8d737632890..d8d737632890 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-17.12.1.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-17.12.2.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 383009c4f002..77cf5dbc1efe 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-17.08.3.tar.xz 32764588 BLAKE2B ee7ece540a46015209ecf3fac3f5a22596aa0e760c15661c489807a01e0cf43c7ffe6edebe39b502abea2cbc23388fd4033a7426ae2cda15dd8e336b2fb4dcbd SHA512 93faa93f9e03adab4b34287aa16b7403e2ef89a09ecacdb9bcd4170ea26074e3527c6e41ea0380b21479a764cc52185a008732a3cd29859f907bcdcc1dffc2fc
-DIST ktuberling-17.12.1.tar.xz 32800868 BLAKE2B 7c4224bf0bcee78ae5908e930a0b8c1b03547c50c75dc32855011a626841c4b4295b2cdad70e05ff680ff3da0f5c3c0ce502bb6f8e70a9843f0aaef84cf0c1a3 SHA512 52557a4a5b11eece8d7bb3655334a54729b69f10708aca6d9036b27760b43a9869020efc537305f19ba216afee9db689ab72edc9949deda6dba15e1eec98024f
+DIST ktuberling-17.12.2.tar.xz 32801956 BLAKE2B 2a1177cb9be4f4c86b84fe765660eb04c73654a6d48d1f979e0199f59465c267f3b67c5cf6c268da419afaf856acfec568abd75f6d25d967f403f220a9359fd2 SHA512 f36e0b4ccc1fd849ef38d1b0a9f935c041a426356afc84c3799210f0b0359c25a4ba8c03eec7af5d3e3326aba5be4eebea4718a97bae312d48e2b6c00a0db195
 EBUILD ktuberling-17.08.3.ebuild 920 BLAKE2B 419347e46978a49e746e156bb4db90407b3dc836bd4f1879c89638d75ffae5aef28e5f886d0cedf372a6ee2e8d8b477a943a0cd3093e9bf388f14b6badabec50 SHA512 591be854a16020d00f976860d65e07748f18bead7f69cb55d852598a838d8b214bfda1f1d98bfb2045d181f272ef58aad52516f558216c6f679081326aee0d1b
-EBUILD ktuberling-17.12.1.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
+EBUILD ktuberling-17.12.2.ebuild 977 BLAKE2B 299bffd77102e299e2416972dddd86fd96e627e656162b2621c2505acd3993562868046c11f958cb858baef5f4e833bca0ed2b408042b17eac8c17b3f66ff7ab SHA512 10095f2c1f4d4e021815fd8d72d2dc2c5be57adfa67be12b3153225db93303a0d38263650880a982f436e1a13999b166e5eff28a149c79c830f96c98ec1084b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-17.12.1.ebuild b/kde-apps/ktuberling/ktuberling-17.12.2.ebuild
index 6f603a18c561..6f603a18c561 100644
--- a/kde-apps/ktuberling/ktuberling-17.12.1.ebuild
+++ b/kde-apps/ktuberling/ktuberling-17.12.2.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 20c7eb1e1bd5..3386aa6fdc24 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-17.08.3.tar.xz 1608652 BLAKE2B 3ab59b2af19bfc55679eb9713cd62a02944e0cec6da8e6382aea56f642e438f1d3db1b9d35bf28cd3f27187fbb78db0b317d4bc146f233422eb637c96651a1ba SHA512 b0b67efe41aebe5d30e7b5a85215190b3d5bcb550f7045d11bdb2032ba27039d14cbecbf8e8d9e09011dfb23557fffe79130ea3b29e1f3c5db08e295b66db6ea
-DIST kturtle-17.12.1.tar.xz 1608860 BLAKE2B 4d208d487e9ae932fa93b307787cdeb8c2946a24ad61914ede2710aab45c15dfa7087544141abef86493d1e1abc1b9b3413753d167af97a45ccdf348045298ac SHA512 a8b725ebf15eb0eceb85fe243c275bfc915bcca791c8afa769d132bf0f8e0308760c009d6bc425f6ba5953565d8643fa641f640690a728cf6414c38645b4d713
+DIST kturtle-17.12.2.tar.xz 1608812 BLAKE2B 744db7aef779d980a162ac1f4cef5410433931c01f39611daf7bf785e810a38ac9e79d02c243ccc3675b8668ab49fd9767b4bc6778d41c9ba611d17069fb682b SHA512 20050ae4349a518940c9fb4e2646bc671a8c63979c19b2176b1f15e7b476e2d3bb2ecdcdb7e1ee6eea95e1b1e847f9e87ec7a87f3457edac110e0466549b6d5e
 EBUILD kturtle-17.08.3.ebuild 843 BLAKE2B 270db9fc65595a7ca2747980b757f15a46891297a483874ad8c8658c3cf889191c5ee194429d838d3b8cae1d80347eb66dcbf9e8d1fc16c43e6729bf2f8e3004 SHA512 c6cacf5d2bf2489d5fc382464679905de5cf74a5c429585316de3ee11110b762afc4d9905e893969f45b8771804be0e6c544625fb87e353b83eb4a5917f21ce1
-EBUILD kturtle-17.12.1.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
+EBUILD kturtle-17.12.2.ebuild 845 BLAKE2B 0e90bf87697adf33bbaa56b35c9b17d9a6ba93c1cb97426bafd41726539ff3e8770f9864978683c720d59e642b5d3ef47f302d697ae57184fb8b1859018f8db6 SHA512 a4c17a088109a03edaf0f9e951a1dde4025ce91a5bb483c62247787652dc244efbb8d0042ecc7781324240a1808ab5ce540cd7ca8cfdbf1c136b37599ce8a3ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-17.12.1.ebuild b/kde-apps/kturtle/kturtle-17.12.2.ebuild
index f1c34975ae1b..f1c34975ae1b 100644
--- a/kde-apps/kturtle/kturtle-17.12.1.ebuild
+++ b/kde-apps/kturtle/kturtle-17.12.2.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 178b2e6de0e7..c9fc8a6e8cec 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-17.08.3.tar.xz 306544 BLAKE2B bd59fdc9cc1f78566f7f741855634b18fcfa4d0ec755352063777ae5ecd49d6f256a7a65fdd4741c9b1a3d8e58e0a120573ec80cf13e787bd3f9a0ffd38c4f9d SHA512 14120974e31aa23d83069f2be025e40835017bc884487ad04db683f80a7159c06ff713f94cc04f4d36bb22ffa968dbe28e078ada2458dd2192a682eeb4a14c23
-DIST kubrick-17.12.1.tar.xz 306860 BLAKE2B eff73b1614c7bc48f34499ba1176b2296d0dd5c46e881e5a8096720ac2768c8a0c51a5c1d5b356f139961a440206b75a2cba7d5c4c03b6ea7d84f6771757fc45 SHA512 e9f0b7a6b281b8c36c0d57a100dfebab775bd3d5365351d69590085022d8611125932072a6193e522c60825c0e38c1c5e9c2e96a823ee6c804bc5d195049e838
+DIST kubrick-17.12.2.tar.xz 306952 BLAKE2B 476eaf26f93b050953494b8c728960b77a1032fc16e0c550667f90a04307042e3005b16514c756a08d7bfb4f9094b62a5462681e56cdc457e5655d2a95bdf70e SHA512 4b7d74db13102479c43441540291d63523265daec4cfd763781e09ebc96bbeca5f263be8593bfdbf3477d4396f5d4f0edc11b09ab451630d6999f5b28c753792
 EBUILD kubrick-17.08.3.ebuild 749 BLAKE2B 562d644386ed9b7676aeeceff31ae29e9cacfc83eb9c460a19dec6f75ee86df90cdb549c6ed6f51771381c568f9b7c80bb44d1f5c804bf58b8afc100f6866a8f SHA512 bcf6eb9805cdcf2e14b4974b24af146124912d1b075a70535de0db4d474f2ad32ffc800cf5a9fc8396f78fb1298376adf5b9538b7ea20a3f88e87ac9771eb31f
-EBUILD kubrick-17.12.1.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
+EBUILD kubrick-17.12.2.ebuild 751 BLAKE2B 6cacf182b70e54fe782431103279e8651a04bd005afa323c309f622b9b74eb16c68b37cd11e5981e5370812c05ac24081521ff91c9843be6efd78b809845765c SHA512 01bbcc27c295fc836dad806987e8a3b3e786762fc7f4be0dd33aeab430a58f644e96adf3973cd444df9cab24a70962e38776afd3dd8818b45bee21ec480bc1bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-17.12.1.ebuild b/kde-apps/kubrick/kubrick-17.12.2.ebuild
index 49fdf450e365..49fdf450e365 100644
--- a/kde-apps/kubrick/kubrick-17.12.1.ebuild
+++ b/kde-apps/kubrick/kubrick-17.12.2.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 3580f50925ba..eb9a9b1fb4a2 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-17.08.3.tar.xz 750136 BLAKE2B 7b4f17d4a461c20864b46f8adb10598b8a60b50ad39d458e570eada768f4ef3d821b15505f3fbdb84e4f699369f66a271229f1132d56a11433482d5c216adcc1 SHA512 60ccefe7441ee9f77b2f8a070320994e194b605f381b1981443510542c5fd55eb8c0e23c31ad5cc0e0994495a209389c844c949a4c6ebc6a91ea81011451742b
-DIST kwalletmanager-17.12.1.tar.xz 778584 BLAKE2B ec8a391ca647b51f45935ba457f1097fe11d15d0ebfd0cc3dc44a603fdc5a7b897e74442bba28f9bafdbbd97d70b4f2e64c8203d180324ea494c198c6a7be3f9 SHA512 53ff49ef51e36976fa00a8661fb0259a03f33209edd22dce51ac30f5738b48fcb98d74c8501da3cd1b254f540465ce3966cc3171cf3e6ab3f66808ffa8e1423e
+DIST kwalletmanager-17.12.2.tar.xz 778528 BLAKE2B 6b81bf0b65b27a4def807196163841ae3a0d73faa188a46540cc93811ab16a827a0bb7b460d3b30883e91898407a8d40a40be5d2923bebadc7e89ae108de9203 SHA512 406becb541024715d781df3c1b6cc4d022ed2714683c1ba5f5f6374410332f5f2e04218ca3d13b2adf747b89ed524cdd8ec1697117a4a6943f1649a295611595
 EBUILD kwalletmanager-17.08.3.ebuild 1246 BLAKE2B 243a7f7acbf11884add1a0d5b6fc8341b6237713d3e34bc101e2cea4b9dc3cd6e96267e151ff7d4ce04655538d32a16e4f009007fb35f7885f674a382955eea8 SHA512 1eede68dab699195b5ee53e05a2c688f8c2571421affed8c6b57b0efd72984121b469f7810386aadf3676f2e752f4b9fac3f245d6c64e0aa374daeb06c126074
-EBUILD kwalletmanager-17.12.1.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
+EBUILD kwalletmanager-17.12.2.ebuild 1248 BLAKE2B 1c1648ca2ce4e47e83986f21e29f868372e726638d87570e41a71128b1c2bdf8c0928a63e8a29a123004c86a146d5b2732b5201649e69b77b22468e0d46fe9c8 SHA512 03769d48ada6730a20e40906a42aaa80b1fc3bd773003636b27728e70f2e9ac4a77a83ef3f0263ad38a6adfabfd99542f46d14f171f3210e16baca82a6a25054
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-17.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-17.12.2.ebuild
index c557ba43034d..c557ba43034d 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-17.12.1.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-17.12.2.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 3d68f8c0e820..a54e15fe4d06 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-17.08.3.tar.xz 4707080 BLAKE2B 97cc1c3203988fbc2207f5f9a22369804ca96c8a2c9997bc9a884f987c8ca38dfb4ff3819afca920ded788f5494a5bf4f64d2e0375de63b25b3c379dc304c7d6 SHA512 705288c599facb3ecb1f2c21bf4c8633622b2938d88d563f7358ed888fc3aaa4c54d10a4e8c4263d19f73eab0f4bff5ce8e61058bb56b10baeb93e05c90d661e
-DIST kwave-17.12.1.tar.xz 4757472 BLAKE2B 68013bf04efcd691474a034ab36aa53b16c59fc5192acedee3c756c453e400786be7c3888fc96221ee448a090add225e77fe83cb011f3d83e40e2b469f397712 SHA512 4e02aaef7322f0c4bc4c889d71baa4093def65df8fd084705e531ad2a91a34d4d3d1983ab25dbfbe1150523447241e5f109c7dbb3a86f55000a5972df458f161
+DIST kwave-17.12.2.tar.xz 4757080 BLAKE2B e4587a4ed09119b4707c5b492d359090b1d5d3621734423bd5dbc410ba09dfaf65d1f6071aefedaf2652fe0b4f11fa42bc210f92fb76245bf8cb616e12ec9b0f SHA512 84d6f72cb9e71a347d7e7e52660c317976634faeb9dd022a1eb3145301574ce61ac6f263f81de7913f9b443e8b5e0c80d0b22405f9f5a6218b1b67db2abc1692
 EBUILD kwave-17.08.3.ebuild 1987 BLAKE2B 845543ae6c1a1066a67e5172942696e1dbe5ea4302dcbf42c4f8e5d888f7963d39ba3b592f30b2a0c6de7f6400c6787631b04ada0d80a09942cfd9be99ca9804 SHA512 096f4b29a67411fa61159c91d15e8424aba0678e65cc3e5d8668f62f5bea35126aa9db6c0907cf2bb7f82a860f9ea94505faef8c0b5bfa42d7f21883bc7180fe
-EBUILD kwave-17.12.1.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
+EBUILD kwave-17.12.2.ebuild 1989 BLAKE2B e8c7647550262f52d7f74f0aeedc8aceef0179c084b845195f7f41eb32b38bba4d67f7fa9ec5ce65d308601ec5cf5ab5c95eb3d9af9d8124395626cd455da6d7 SHA512 728ec4b1fc1ce79f7856f8a28c1566512a132d657c6997b6cbda6f9adb1f8bea02161330e9ca56450806705841e71c3b1c87402467cd74a0b2b3795ff259a08f
 MISC metadata.xml 749 BLAKE2B 860265ca3ab192b9f0eb386b4f8c32d400ffe0d79d9ae52fd1b03e10b6c1955406219641cab9c38cfa3c45de2a7bc2d37525ddb264599922e3359d764add4318 SHA512 ea33dd37159d916ce727354e5183f77e4435553fad594e6f0494419e41137bc29d9f1d7b1035ab88ac982ca4c56a68065783a9336f29a511f681074bf2d772a5
diff --git a/kde-apps/kwave/kwave-17.12.1.ebuild b/kde-apps/kwave/kwave-17.12.2.ebuild
index 5327a15228ed..5327a15228ed 100644
--- a/kde-apps/kwave/kwave-17.12.1.ebuild
+++ b/kde-apps/kwave/kwave-17.12.2.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index bb180ec2eb99..b13b68d6e37b 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-17.08.3.tar.xz 4167380 BLAKE2B 175278b4b09e815a8c33516e741d44f2dc578f9e67184de95f1aa8a3bdd1b7f4a357782985411dec9b9af7d466eeb665babd5064e279de39d4aa908966e774a7 SHA512 8738172267c6016fed00629306ee6fc152549f2e1299077c2b5d2630afaa02af5ebd9f795810bbc40a7e4785502d213d752352ddaff9eedccf79804523094c16
-DIST kwordquiz-17.12.1.tar.xz 4168996 BLAKE2B f633dda56dac2916e5ff0eddef439acad36ebf7f12f4f8214803ba8e232949efdb1d6c04b371bb3a96f35972acec7e75ea5840a2e2c3989f8e1ddeff5e8f84fe SHA512 c96f6e39a1b3bf27b2de5a2fe469070ee40224b6461c9165508ea428cb8c6cee87201166ca5da18f866d63047921887a6485df12514a17f545c03dae38544c6b
+DIST kwordquiz-17.12.2.tar.xz 4168836 BLAKE2B 993aee2e3221bf489ef1528697789a0c382ac77d6312e874a2f3e548ae84e7b36e7274f4d3cd5959e444386b8e61c07dde20675eb2941af08f9e1e977da84639 SHA512 f0210292f6c25b64dce00d221e5ba0797d45c7f1d6354be40dbd294534306f7b328b436f46fbad72d91b97867589694251f8fae7ed2367c1057198c942e3329b
 EBUILD kwordquiz-17.08.3.ebuild 1062 BLAKE2B e96d888870b310d769b9737386f57c39e0629ed7d12c7f73ddc2d55f408a85faa7ed8de4c847fd79de26aaf39982b64f07d09790789c1dd52197533f8e022203 SHA512 aaa2084f7d933bddc21c9439487d274ba790344fb6c44cabdf77d582389fa6e27968a1ea334ab5bf3a4b8cfddbfe47ba01aa51f6d193d4193507c094773a1fac
-EBUILD kwordquiz-17.12.1.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
+EBUILD kwordquiz-17.12.2.ebuild 1064 BLAKE2B f56195944503c694f323cf7071299a9cdd136d6888386f8e8d34d6a1650cc247051f7a4ac71dc1d7b6ea79ae1c4afc106ec8da6ae254b0b338a9fc057deb3353 SHA512 b6ad92dbca261e758eabce63c10f59e5666a5ae1405780d71c00e8055c8d0cf1de120ad10c5cc8216d5570489a7b2cded008950dca8da66bda87fa8257b5bf48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-17.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-17.12.2.ebuild
index 666208ff0dae..666208ff0dae 100644
--- a/kde-apps/kwordquiz/kwordquiz-17.12.1.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-17.12.2.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 39ce0eb2d546..3fe3ead201ee 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-17.08.3.tar.xz 5617380 BLAKE2B 582c128e1904fbd0cec6ff177296aca68c36749581b57b6d71fce3e251838699c5068945a6e43abc05339eca3c2ac9dd5ec53891c20e208e3634771d5a859dd0 SHA512 cf4be33ec05a5451322141beeb4b2a66ff34da9f34fbc1038d7303d707012ffc477510164a65837ea0b94733b0e2812b747109a78049b5e4d31a75887c66bd46
-DIST kate-17.12.1.tar.xz 5630360 BLAKE2B 69f9855fbdb71c4215de58f046fcd88253d2edb7678633f07de4803aff8fc34dad975970e1f3d4800fd3f798d46ea30b0bdfef96ca11e22cacc53b0455d58fad SHA512 63644c093316f864390a67f419be047d9ae7eea8113f5a030bef047ccd2636ba4c8e2aeadcfb71cbebc675f91babef427b23bfbd96df310ff4ac5ad3e82d5e64
+DIST kate-17.12.2.tar.xz 5630528 BLAKE2B 29e0cfe6b25aef849f03e2a87bbdef4e64b1a9ee7ec3550c5257a6902e7fffd0f011ed08a89457f8215750ce8ec22c00b203734161902ee7a75a77fc349f6768 SHA512 cb71a569e4bd04c9ca1aeed81a7261b3838bf78d6bd731e31163f1eb254d81e78b13889d2118483de0d9cae6a92ebbc4e4dec9f3c62e29444ac1c3fd8dc7efe1
 EBUILD kwrite-17.08.3.ebuild 1187 BLAKE2B e7bbece5425177c186240156f593abea61766f9b0a152002822ea75b914d0ab66b37b631f9f0b563416d5d861bd386fed17526af640cbddc3d57ec9f1d415e69 SHA512 290b58fcb54858529738dbff692b8bfd03a8b3dc21c4529a39626e4ac8b7311dabe17c87a84837c4a7d29a48e7038dfd7bafc83b9ec0628933a88af1202d7cc3
-EBUILD kwrite-17.12.1.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
+EBUILD kwrite-17.12.2.ebuild 1189 BLAKE2B d42d84f053107c7d7631f8008515a1022ab162b36c5e55471c9536e6c6b67399c185f6055d6de97f773ecab1481cccec261cfa38c0c2273fdca3ebc616904ce2 SHA512 8dfbabe38a589b0fa4dac0db266d1dd15a276ddf19335352013f5d7f13494cc2f50051d931821a3b180c48c697627382a2014358e9e87c261bdd62b6600c4b7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-17.12.1.ebuild b/kde-apps/kwrite/kwrite-17.12.2.ebuild
index 40a36cff18e3..40a36cff18e3 100644
--- a/kde-apps/kwrite/kwrite-17.12.1.ebuild
+++ b/kde-apps/kwrite/kwrite-17.12.2.ebuild
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index d3c075597e67..f33733efe021 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-17.08.3.tar.xz 28456 BLAKE2B 375fcaa5ed78ba446d150752e0c660fe74a3ae7441987c272eae0238d247ab6329b74c5b8db56bc27d05643162bcc4340e0622e3431849b0dc514e6d2ce47ed5 SHA512 7b22ac61d3ac581d679f07f0ba42a038fabc04a146f6e2e2833d1a17388d41bfb9a43de34ae8ab5e282f002ed7b7a1e49d202e4f85ad62a42cdbdfbd7871a152
-DIST libgravatar-17.12.1.tar.xz 30076 BLAKE2B fb285247b14d3f69e27ce00f6e52ba11a39ccfef271ad6cdcc646291bdd4a36860738cfd782756776a73cd1a963a23f61cfb1cf82f860d701df3148142823496 SHA512 44cbb9664d56bf0705490b7e912be5fa2653d8b59dfe890fba952131a5a328879fefdc9251961f1b63affbb0e1384255115b9e9506dae672fbdceb3a46b9b71f
+DIST libgravatar-17.12.2.tar.xz 30064 BLAKE2B a56c02eb2812cfc39faa0b84296d813050ca065a658a34bdf3664bb36dcb94043d3f25ec147ff267c5a4847799f612e2ab4c19be6c75c8ade4d339e8c034dc8a SHA512 4096ad6d620b5594766e6b79ca5d06d5c299f35739fc1fb2ad00faf1a511cb86084958685d3b2744bfb457b1f20a14b2429411e6df6eec646514c05773813443
 EBUILD libgravatar-17.08.3.ebuild 723 BLAKE2B f72f2facc899cd19e895ca2ecf76abf0806c4d76b19c8150cb820fa40e6fca432bc2eb3ce5d515465cb3d7e4cac15140923efbef3964e6f76c8d4e3501beb3d7 SHA512 702bc2a10498a2efe1347ad3fe313ece5cd5d240ae895a496c28e04f9ef2598bba2d22a1150c379b23f09a2e97a364bbf650c5f705584e5bcad4af4228e031d7
-EBUILD libgravatar-17.12.1.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
+EBUILD libgravatar-17.12.2.ebuild 725 BLAKE2B 0ce98d77067c2fa52d9b36e59961ba0520717cc9f4959b9f05e5498127c78b8984eca411819b04fe22926005d82cdebdabaa1d63ca37a5f2dcec9b0e842cb5fc SHA512 a59206bbb628d9f43f5f058e3d25c7fac8bc21e8328e8c268ac71605e7bae72fb78fb3f609e4c5f1e972d1571dcdb002119428986da5879356199340c12aec54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-17.12.1.ebuild b/kde-apps/libgravatar/libgravatar-17.12.2.ebuild
index 06eba7322aa8..06eba7322aa8 100644
--- a/kde-apps/libgravatar/libgravatar-17.12.1.ebuild
+++ b/kde-apps/libgravatar/libgravatar-17.12.2.ebuild
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index cc75ec853e4f..77ec678006be 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-17.08.3.tar.xz 424036 BLAKE2B bf407f7a32b6ff288e6071bc9fdd2bd88c17262d167b3bc0ce8ba0322c6c415c7e6377b643dceb47fb61265699f971e93119af862e78a9a0d404c3dbee9c627f SHA512 db06ceff8bbebdf746da317ba930ce66610c44374475b6c2024b9ad2b252c6ebf5dc15c588bac7d6626394a30c004bb3d5f09c64e08ac005a27230b268d92cfe
-DIST libkcddb-17.12.1.tar.xz 424012 BLAKE2B e6192ac79c4861a3cda9f2fa1e9f20714774c995d5632651f26b4fde44d3a265da8f1576d6da09f5c0a79a1f1156b45eb5b8f73ec10185871494c56c6e69eda6 SHA512 ab10854e9cb5ee4101f6dd0641f0f3cf2d5078ff17c53b035c20d7f19213f80fcbd16b2865d3fee80090ac5e70f53f760ed77e31fa6054d819cdf7b79efd3673
+DIST libkcddb-17.12.2.tar.xz 423996 BLAKE2B 4c7e94f90fc7e4adcf5b65c22f403d873184ca7b16f5c0d23a3e79a900d0c51ee6323e6bd38322a7d150045c5e2597426e025a53ec2480d8a2400ec26ac60b5d SHA512 3c19f2f7b77ed6334dfeea725f996cdfe73531f0e2be1d42d689e810080d29f1f4f16d6f3e8c9c820e189a08ce560440d012b37aae465e60746e71ba9d9476ba
 EBUILD libkcddb-17.08.3.ebuild 1069 BLAKE2B 5679af8180ca1be41ae3a968306d80bbf0563d86fbfcf3718ea6b9e7d46b003d5443497e7ae647eef2f7ab05c37efe525d4ac6cbbfd2f3da9787ee8ffd382cb3 SHA512 7766c37b3d142d8a0a076b9a5efc8b854488310dfaea73c7a9ceebea7d3b5a99e94e8888921eea80a20a7c2e924458bd0d754eaa67f94f001506d1bb4f4bc9dd
-EBUILD libkcddb-17.12.1.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
+EBUILD libkcddb-17.12.2.ebuild 1071 BLAKE2B f2837e7e3fbfd7781481841030ea90fef579df78c782b7e210d8c062c8cdf1e20868d3b948402fd242c452c26574deb7389cab51b4c44254604c32294e55adcb SHA512 9a3a30e3a3268c65916497944b788b8355d0984c6a41fbc0e3c8f82ae9e0c3d5919b205b92f67cf10a1e65ffbc94005ddc695c19b1d3cf2a03c432b1e8af7145
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-17.12.1.ebuild b/kde-apps/libkcddb/libkcddb-17.12.2.ebuild
index 7c3b36bcccd4..7c3b36bcccd4 100644
--- a/kde-apps/libkcddb/libkcddb-17.12.1.ebuild
+++ b/kde-apps/libkcddb/libkcddb-17.12.2.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 2e5c16b768a0..b25f51bbee08 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-17.08.3.tar.xz 88624 BLAKE2B 8ebd1fce84623574826b0a45e7c583bd9aeb3258b6163d0c85f2b1b9da8137700ee72604242ff6e45d7eef62bb7a0289c2495494faee24d83222ce1e05961c6b SHA512 61e58be1ecef0672c70bb96b181af4d3d38fe00b7dda14b36138c91fbe4b98c17d9f78807777c3f61004c4575f0c3c74d322ca96b437e7f806576a6812188d27
-DIST libkcompactdisc-17.12.1.tar.xz 88588 BLAKE2B 799abd809f8ca3bf705295fee18d98b85a81f498e50fa58c75300019631e9a01f47d2b6bebb52f8efeec84767a90266301c45eb3ddfe846c08a3012c6c9a0066 SHA512 387e9fa54faf92bd6d623eb2f3c236dd512cd6b91e87595be64f48864e458fb230e10212ae783d5754bd23f8bb3ba2e8e9c3a186ec97e03342a09b02e716d5c2
+DIST libkcompactdisc-17.12.2.tar.xz 88612 BLAKE2B 267afe84762adbbdb51d68e66121796431ae630d6f070002bc8ec5e19aabdad492c51785b01df5571e28df5dd9cc1f17c6deba7e4bb2281b0e82a66bc7fe2bf8 SHA512 ff8d7eb487b192b7550e23339b0a91c4a4ccdad50c8358b0cf4bc84e79660a229f7efe0da49b9197d14be77d5cc7bf6c4f1a820dc495c130ac75c84e80088b24
 EBUILD libkcompactdisc-17.08.3.ebuild 574 BLAKE2B cf86c2ea4611d2b91998fcb506da67234559d56111846feb7ea090c2e352380eff01ba6aecb6bbeae774cf23ec08355f7c21e1d436feeaab6dbe67ca1e453f05 SHA512 b645c3ececdf850aa587d9407ec834f313de439dc6b9fd59807078ab3de23cd19433d9dfdb5d49c6d5dd5b09d79d916748127af0e1d55de97cac744eef635627
-EBUILD libkcompactdisc-17.12.1.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
+EBUILD libkcompactdisc-17.12.2.ebuild 576 BLAKE2B cc9c1fe1b60007e8f07343ff96afbedb8762e7f8ae23b9533936d585d17629b8f723d3b20df597785c911362d0b4522832f9aac3a69d56b5fbbec7d52c567d7e SHA512 73e81d8d450aed9a7631f6882e9d3895e3be03d6725edf006242b0312652777c1059cffd5d24d5c3387ac7080305ad0d1b875d7d01cdf3e40ee2da31af4a6739
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.2.ebuild
index 3c73db683d51..3c73db683d51 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.12.1.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.12.2.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index e3e97eb74824..4d4643cf56f9 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-17.08.3.tar.xz 42216 BLAKE2B 1c3af37ba9789979af8269a8bf5594677738095814a00a9c7ffa1d39fd1e31620ce1cfd34fb559a117bfe5a1cfb5e42bff6ccb7f281df5b897fd1e539e6b3adb SHA512 6186cdb256254314109fc4ccb7462e671f305ba792f64f29f14c2e029af9f93b4fd4e13e05c06640e17e2624347e8ba14e70b157c5d6bdfeaaf615950565116f
-DIST libkdcraw-17.12.1.tar.xz 41828 BLAKE2B 5ae14ca452a6973fdd7e21cc278d3fd964cb2001d468d5ec076537261acb6f4c67d9bdccc4d640486430799381d1553353f5bfd5f8695737b6c43fa8f52b7743 SHA512 4e3d57e10e07c47c43559773918852553cfc214cd7b051b495351fa5c85bb3a003fc5e194ad13f0ce81bf5006c195d19c05e2759f14ef4484ccc6225a2da486f
+DIST libkdcraw-17.12.2.tar.xz 41852 BLAKE2B 3d19a173c9bc9946dcd63e83cd1ea4744e0e951b7d8f8743cbe71cab6ceba5b9e1e85d057dbe3e5f9c08ee2b815422d4e420593083ba3cc270967f1630ab15f5 SHA512 e77066ff536ee8b5cfc572e9f96fd280814f8ad40fa75cf928d19b9b99f8b7a31d20dd043d5f12aa8a8f709b09ae79fdfc5611620e8a1560d989313266e7cee2
 EBUILD libkdcraw-17.08.3.ebuild 336 BLAKE2B c72ee6ffdbb082b111824f2ade92c4d9ca5639d00dcb3a9167fcc615b899e0c61718ff430558a6c6b0a556f44c0664653c2d5ba53896a275a47b219ed0e3b5c2 SHA512 38477f722c442b615c97a177f6a394839d60eb8d8ee5fef82158627d30be4518ad5c9905001043bcf02b8060fdeed5de81854be671df3134488b946b06afa81c
-EBUILD libkdcraw-17.12.1.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
+EBUILD libkdcraw-17.12.2.ebuild 338 BLAKE2B bab16be60be734551f780f9b3b3f43cca133a109eecfc384f5b87212e8526691d5b02772690cd1fc1dc2efc9e82b2ed6ad12eaa70f2233f9d2e16dd19538fdc8 SHA512 2525ed91ff4e820d8bc3a1625421b0267d465e6250ea17b0acfed768ec0f6ea59e7184dfdbf9f559c0828d88905dfe6019f2295be9bf4cf1e19ac62c9c009c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-17.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-17.12.2.ebuild
index 88aa2516004a..88aa2516004a 100644
--- a/kde-apps/libkdcraw/libkdcraw-17.12.1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-17.12.2.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index f8bc7ba59ca4..fe56de0b5ae5 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,7 +1,7 @@
 DIST libkdegames-17.08.3.tar.xz 5944824 BLAKE2B e1abf1c137178839447938ba4a895ee1ed9fc556e7391db64ad7374b692a86d8e38d6c2a161e39508f30e147123f841fe13cfbf945cb5c0a61f45d277ad7691b SHA512 0ef25d299b2b330112e9c7e668c3166b3d91138014ed3617d230092decdd7be2c80328e0938a3a32834395ef24ae9c653561688bde80ccbc6214a1f5423f11bc
-DIST libkdegames-17.12.1.tar.xz 5946992 BLAKE2B 3ddac2395dd6f43a4dcc918dc7e330a0926a1692b44dbf06486414c90a53a4ca55252706f1926eb6dcd94a52aee4a31249a1cb479d01f2f7e89a852de4229acb SHA512 189361a38940a4275dc643ea2bb771607a93d179b209b6524f777f17ac513ea03e5240984c01cf6e1605b3472fa99f64cba79bae183177c82bd7a9235f5ef02e
+DIST libkdegames-17.12.2.tar.xz 5947920 BLAKE2B cd9739c18980364b7fc43285bac510a76c52615b196224542d1bb64189b04bfe506bef40fca33d3c1b0866d42d0f8511ed5bde38aed84bd23b69906dcaaf85ba SHA512 48f00d7ee7fcad83bace4858659ca5b44138f8fbb1a92d7bba5394ba6a0689414ece948a7ee51ab1648b59ab0b64be0d091010493cd91f1247e53b769cf285e2
 DIST libkdegames-4.14.3.tar.xz 5827668 BLAKE2B 511d1be860710450e8af72240b60e9df0b22d5415c3bb3f961fcf4b039f3f715ece1e258c5951b19b147a63715dcc5da3c4e711aa9ca2d3975e1c15b52c8674d SHA512 43deba5ea5e4f39eae20425f76f9cb02d5215e0a596ffbdd29585c0bb3ff32f2806755ccb22b3c1c5c7fc5c7bcdb2bffd35fc211ae6e2f55aa751965b5c6d9c3
 EBUILD libkdegames-17.08.3.ebuild 1278 BLAKE2B 96d1644d174ecec0ca3b59048f756c32208edc63bf5851244e858fa0c090f9e54b4c2fdf7c9e6d9055896dea98b2b3f6496489a1a32cb93493020525cf3822c7 SHA512 70c47ae1abdcd2984d596d6e25faac962dca82756aa2fd2f59f3a28d9aeaeb1004df1791938c584a260c82c99f5d71bcccd0dc506859c55ddae84831ba4f1ca8
-EBUILD libkdegames-17.12.1.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
+EBUILD libkdegames-17.12.2.ebuild 1280 BLAKE2B 8f427db1240dc4e26ef8bd7a343d5dc7b5433a9f6217a2f62c930aa2bdb865a5030830a8b9bf6aad154d90633a8c48ef0cd666a317c978cb352d3c0a56e55604 SHA512 e4010308d83818419622692eac3fc26884f77643b8457e48ec33f085fbfb1ae48b5494e2d7cee7e37def7419412c90b7ec49f4d4370d9cda8168e56be84e2750
 EBUILD libkdegames-4.14.3-r1.ebuild 314 BLAKE2B deb4b4885abe2bc91897b0c1c651d1d446238f46d304c860c699263e2f277417db33e75aa23ec0f0369b2b49fc1f08fc6e8c4ec6ed162e64a3e43b61f268b5fb SHA512 f217595bf76404c4998418445a5e3eb3639447d11a801d37297e3122a1f16f4f8e9c7283b4c7d4b0bd8dac8897c025d70bd4c4002318aef0963d218aa8451bf9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-17.12.1.ebuild b/kde-apps/libkdegames/libkdegames-17.12.2.ebuild
index a70604c955d3..a70604c955d3 100644
--- a/kde-apps/libkdegames/libkdegames-17.12.1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-17.12.2.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index a5b4e33035cf..12d53b0563f7 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-17.08.3.tar.xz 339080 BLAKE2B 12d2693410fdda7de25717d12c3952c13963425fdd4f9890ae349555dd78ad1b193f2d0b3a4f5e9113eae06a9ee1e8cefd602b2ba16481908846317dc4d07f9d SHA512 ceb4ae8f2151c1973a5aed7a8510c6a872cb479e5d6cee212977d18dec0645122c0b308231b77a2c35e6366a0452d9df42e8cef0c5bfb91934432ff61383a744
-DIST libkdepim-17.12.1.tar.xz 339892 BLAKE2B dd03e14923c914fff721ea8349c4f6d2d71491e75e24031f09f21997d720999949a79b4a5a57234de836df1f7895d30cad690b670ccf02bc0e8a3f332f3bef9f SHA512 5fad3b527e11d08cc37a8381dd95bcc9464bfba83c9eae4c3e7da056947b6178bf228759b58f801c55f84e9fbf1f95913638d3f45f0f2032ea309978962b4c64
+DIST libkdepim-17.12.2.tar.xz 339996 BLAKE2B 33c385cc72642fec48f104cc3fd5e5b51210adb691e6cecbda4ee11cae56f8879c69f978a0eef99da4f64ba86585584bab13644b9e3834f2da6db33ad802b77e SHA512 fa93a20c4bfb2b04784f20e2f0e8d2b82ef3009a152b991ad0e905be4ed8b3e483f1041999287e36e6befc3b316ba1ee9a8da4405c6eecd59df7717352242998
 EBUILD libkdepim-17.08.3.ebuild 1065 BLAKE2B a9af9641176eff0d026cea9d25d55ec5b979942ff0e184c424a64a19b8d1a979f5ea593cfcde41ad4ddf3f50b5e2be1a53db0a6c22a6584becba3658f1bdc3a6 SHA512 ec8b71c11c68f966238fdf01c34d7192e6c7c708dbe2d10edef267af1062d0ae4315032482a53052701768e39112d14f13322af0b74a80913562cba332ceb881
-EBUILD libkdepim-17.12.1.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
+EBUILD libkdepim-17.12.2.ebuild 1067 BLAKE2B 45a9feb8824992d1dc25deca216965436eebabde4155a4a97ed4136baeb523afabf5aa948c367129f871c6bd89791f3d363c78187184768e5e2b5aa87789d5b5 SHA512 f52b9a8645c67ecb349717833241c866bff426e52b14a618e6dbabcd5abce266d7f1b9478e729e128c8487fa9eb91359eec0691651b55311ace43bd14a98ed96
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-17.12.1.ebuild b/kde-apps/libkdepim/libkdepim-17.12.2.ebuild
index 416b05fa49e7..416b05fa49e7 100644
--- a/kde-apps/libkdepim/libkdepim-17.12.1.ebuild
+++ b/kde-apps/libkdepim/libkdepim-17.12.2.ebuild
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 617fb155f39d..a8e607af5cfe 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-17.08.3.tar.xz 209788 BLAKE2B ff7b39259f7e8d3d6fc0494cf812b6a0785afb3df3e3e74ba1111eec0baf5a6e4b6a69f601c545a79744e9c5ba648af05834747eeb96afa49433060d48aef0c1 SHA512 de1726f73e1b58dee5e68a54c1e2620eceb86e9b0d41107439519b69a71e8fcc41c1030a31953c816a20334a6012a83941f728cdadd73303d285ef160c4bafd8
-DIST libkeduvocdocument-17.12.1.tar.xz 209760 BLAKE2B 03f95543208c0918f04a2c2cc4173f081ec05ad5bbadd26c1396ddf9dbaeac538249b8649c1b0bb00f8cd04451377d5e4806f4d3dff05e6a589de454b1404470 SHA512 063791900716cff6c228cdc4e26bac091d3a8908cb172277028ef30a2e5ff0c52cfd042a4315e7be9664cd26abdefea8508952fd1ac07c1c556cbc5cfd8777bd
+DIST libkeduvocdocument-17.12.2.tar.xz 205644 BLAKE2B cc29ed5c09a6750057232432ad33d2c204dbbc636453a75065976067dd83dd865fe4a8cab7ebe1719991b83f23ea3d59728e52b1a173ef82488e783714b4f56d SHA512 acf87a3931c6d21cd28a169084aa2ec72ea9f491c858111aa8bbc5267e12e654dd5ea05b2b21360327143e82fd730adde0bd7e1d50fd4e87af7905a90efabce6
 EBUILD libkeduvocdocument-17.08.3.ebuild 599 BLAKE2B 63ca6d04bd20946f22cde11799268b28b29f4158a861e4c7b06dc58f87df7337dc2f88fe39e3f77ac861a97a55a3f027d85b84a4dbdf6ad6d3c7c2daf4735508 SHA512 79e6f1643cc9f1cd665091ebdcc69fb3478a8b63a5b4a3671fbd779d9f9dd1ef1813511b373b2c016d39a7aca895b4452320cc39430938f33c989fd2a3900215
-EBUILD libkeduvocdocument-17.12.1.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
+EBUILD libkeduvocdocument-17.12.2.ebuild 601 BLAKE2B 74d7d9eeee13777e79a09e3f315acb4a9df6c126b7b39f3b1f483e4c61101622cdbc5cd73a5acd7b8161442a1a976913f8602c1eb252559eac09055ebf4b00b0 SHA512 cdf8a940df3c45216d0b61d17a419ba34790f61c43fae374e9271ffb938a7b2560303f214bd1ee62fdd8b0b019f8a90093fc0274cf489c18a6aea203a08dad45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.2.ebuild
index caf1c7213dda..caf1c7213dda 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.1.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.12.2.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 0ace131d2f72..2ace60fdce36 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-17.08.3.tar.xz 64716 BLAKE2B 6b34734624eb7d3b286c3bfbd633985b45796a5f89f10083e06f4d7f3c1fef5bb725b7319a84cb882a50bf1a9968880dfa46de8856276ece51604ed6739b90e2 SHA512 620dac3d0cc2151365f015acc10699183f8c9b553ebfd4610f38b84fe79adfd8a91876363ef8a62f7cc1929706e18469ce85727143ef7da011272685b5c912c6
-DIST libkexiv2-17.12.1.tar.xz 64312 BLAKE2B efb18c61ffee51f7669f48e59e1a6f2530126e0da30232c7ef4836305d78aabc0922678a71c94db3bc0e41cf41789dd907a2df691c8afd6b3d1ad968579befed SHA512 574fe6bc2f1e8ac32d468220679172b9dea0c85a0377d3b3cfc3e7e8327f41a9f9285b38d7c68b37ac3e91ae915c42a9733b99b1e13a20fe4690ec059eaa0b71
+DIST libkexiv2-17.12.2.tar.xz 64340 BLAKE2B 141d98cf3cb137ab0e879581e3106cc72d9ff6781b7cb218caa4840025c6e67220071cb46ed077e3748f865b0a861e0004504b5ffe936fa33337975b0ecb5ce7 SHA512 ecdf0ec0e845c6b1c1780d8f5cacf055ae8374d16358b2dbb196a750140e2257a98ac17e04fdf648d5eeecdd24f9ef53ceb62a900dd6a960e601adc22d88005c
 EBUILD libkexiv2-17.08.3.ebuild 356 BLAKE2B 778de27c4c73d6d4072207ee40fff437bf474a6bf980b2af4c4b820aefd63faa714209b5c9210aa486c7618682608ff79daa6380aa07208fa1fb3b6e6f28c6d2 SHA512 bec7bff4c75d5df3db1210a473228d759603c823678caf5ba2d149f7def1b90fdb1c22c17ced8b40b22c55b2e968cc3babda551aeaaf082a3ba92027624757aa
-EBUILD libkexiv2-17.12.1.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
+EBUILD libkexiv2-17.12.2.ebuild 358 BLAKE2B ec256b620c25093496b98d7f3203e7247720a51b3fc6adbabd6670940553a4d810c4fde10b465c9a5c496cb54500178ed6ee5f32a7335bf9cf80cd3fdf6ae653 SHA512 208c67ba5fc4e5ed887725efd846994099f8f914f880865107261b81cc9edfb19f08820e61a2d8a2ad83bf02d4d27390428fd576b3deda3bd2538500f7d013ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-17.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-17.12.2.ebuild
index 8566db655bed..8566db655bed 100644
--- a/kde-apps/libkexiv2/libkexiv2-17.12.1.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-17.12.2.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 890a7cad13cb..a5443350579c 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,6 +1,5 @@
-AUX libkgapi-17.12.1-gmail-tokenpage.patch 1489 BLAKE2B e7bdc938d26b41e2e880f3932adc7e6db4aea6ea6d9fbfc6fd56143f783978617241ed61f3e8588c3c537a994406449c1ecb424ce5299698c0976637d71a0f71 SHA512 393da4cb35cc9e0c55e7073113cb51aecb72ab7d2c6b062512d1d7c46fafa3dbd7b091fd2377608930cb0a7413d7d7260580d565f07fd0531070a594136176e8
 DIST libkgapi-17.08.3.tar.xz 175300 BLAKE2B 80b1d6a19bd8953d4bae36f13da2b92d8f14314ec557ee61b0d1d86d0a856c0635fa2e0b96e0d8e2b2b2b5d9577d25a61b07af2a7226c3e57326171f3ad96334 SHA512 6f0c6afb39a0654d8cb5d03a43439fda3b3a1e508b579f46c8c6c7ace050b6b749e2c2673bc5fd9d8a502e91315d8f60f052c290ba31e9cd3cf9413d7ecd3906
-DIST libkgapi-17.12.1.tar.xz 175212 BLAKE2B e3a3792df13085bc6c18b3d36f120c4a49efd171524affe3f6f8a26d07acbc2e958cd812ddd0f46df17a8dda350a59d9cbdd57a68ef0c18279a3a374a5a9ff2b SHA512 62b6e392aa79469991d4293792fb1f21316f369c5f3c7885d073a82d5e1510ec45217dd5199023337108108aa043b66c51e8b3710c3aa6df80538df76a7844e4
+DIST libkgapi-17.12.2.tar.xz 175456 BLAKE2B 2cd76562364f52f9d622c3343a1e4f7e701f9af476786a0d24080c184807f1949047f8548846e3a28b922c897f947a262783e28d70c0d1d9b264cd4815561b72 SHA512 0ee8ab776989b47027f6ab04716679090fcf9435abd1279e972e01c723fa27832794205725058353486b1a34bf59f2380327e29611af1b8185a3b4a8baebcbb2
 EBUILD libkgapi-17.08.3.ebuild 779 BLAKE2B ada0fc1706910256912f006c7a6832709cf8d8aa5544bfba952f2bafe7edb9a80b0e99db6c542cccda0adede7a42992305f0639404383183eff2e7e721d9610f SHA512 3f6c35f56a065c7e4bf75b9bf35d3d861288a05c8603fb63f74c3341d1560f7b84257c7aad10278d1f63e94d9499f2fded4ae215e89efeb968861428fe7ca068
-EBUILD libkgapi-17.12.1-r1.ebuild 811 BLAKE2B 07f51a4a19b2f2f0831390277cac06dfb1fd49540c342d676e57d69681eea438673874379fb43e7c003433c925cdfdd205f89f9cef0fbf1bfdd66975aad87361 SHA512 15c2535c1842054a54a7f721d131bc2cae91869f4418c106e0156f1a95f62896106a5ff50ebd827211757ef888deb70ae6f5a5ff7dd5b1420304033556b219b2
+EBUILD libkgapi-17.12.2.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch b/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch
deleted file mode 100644
index 61162ddf7c0d..000000000000
--- a/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fa572d93cfa463f61432dd92239e747f9642fbae Mon Sep 17 00:00:00 2001
-From: David Kahles <david.kahles96@gmail.com>
-Date: Fri, 12 Jan 2018 15:23:53 +0100
-Subject: Fix token page URL
-
-Summary:
-It seems like Google changed the URL of the token page.
-Maybe we should use QString::startsWith, to be futureproof?
-
-BUG: 388483
-
-Test Plan:
-- Login in KOrganizer and KMail works again
-- All tests pass (though i think there is no oauth2 test)
-
-Reviewers: dvratil, mlaurent
-
-Reviewed By: mlaurent
-
-Differential Revision: https://phabricator.kde.org/D9843
----
- src/core/ui/authwidget_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/ui/authwidget_p.h b/src/core/ui/authwidget_p.h
-index 78b0e7f..29ece44 100644
---- a/src/core/ui/authwidget_p.h
-+++ b/src/core/ui/authwidget_p.h
-@@ -79,7 +79,7 @@ class Q_DECL_HIDDEN AuthWidgetPrivate: public QObject {
-     bool isSigninPage(const QUrl &url) const { return url.path() == QLatin1String("/signin/oauth"); }
-     bool isUsernameFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/oauth/identifier"); }
-     bool isPasswordFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/v2/challenge/pwd"); }
--    bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2"); }
-+    bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2/approvalnativeapp"); }
- 
-     void setSslIcon(const QString &icon);
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
deleted file mode 100644
index d3c67b28e4f0..000000000000
--- a/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://cgit.kde.org/libkgapi.git"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${P}-gmail-tokenpage.patch" )
diff --git a/kde-apps/libkgapi/libkgapi-17.12.2.ebuild b/kde-apps/libkgapi/libkgapi-17.12.2.ebuild
new file mode 100644
index 000000000000..9f3e37a77649
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-17.12.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://cgit.kde.org/libkgapi.git"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index fdc1c0992f2f..ae6a7827ea30 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-17.08.3.tar.xz 150180 BLAKE2B 9ccea1fc0a0f28446358700c62b52c6870c6ff5d8fbd53313e1b313291986ecbe70c46d0df16d34a427b8b3d09b980193f5004e7c113a84b37eb289a8bc85064 SHA512 3b9cd482272c484298a3663c04ca04f4b9b46b9b78de949aa426df338d1029500b1664a88ce184b2035d69809a697db6ae1c67894b2419f8b9030359f9d58588
-DIST libkgeomap-17.12.1.tar.xz 149592 BLAKE2B 2d380eb1e3b71c5c4fd8ba1aeb0ed6bc24055c97ccde76b33e53c63296a578f112a04971dc07d9c4054a3d7b91f889c92da2cb00b3d9594021a7e2beccc7631e SHA512 f93f866990ad52a13284c32669ef6053abc4ae35792df32c8bc532c67a782db65d4f3d803c20bc07733c1d61525050481cd78cfa1105355bfcfdf23d9f0602cb
+DIST libkgeomap-17.12.2.tar.xz 149580 BLAKE2B 17c86926765a5e8ec8f37b5076184097701ad291344d66add49076fcef787d7a40e73ae4323abaf7894282c0ce9b2168aff80b999e2d4d7dc3e21ccff0caa64b SHA512 9fa63ad20c1f0a07df91c17b3705c43c46554795690c1ad2144be678de57e4b77f96d4688e07024c2eab1a0a4210cef059e4204cda71d61c4ee2431c858c9c13
 EBUILD libkgeomap-17.08.3.ebuild 774 BLAKE2B 8c4d3a7718254a8a4f771e7ea17614614cead9dc77db3a62f9d1dfc99ab375596da255ae0210f267be0ffe97d252b77566b15cb2914c94a9d61c583f1036f6c3 SHA512 857e278443d6ab71138d54267193d8b63dfb9a3bac6d6e5e2e5bde0d96800ba2a94f039e73c19b2cdfae1c2a9431d9294180722eff516a796119c575aefa06de
-EBUILD libkgeomap-17.12.1.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
+EBUILD libkgeomap-17.12.2.ebuild 776 BLAKE2B 6701ec26ccb7b89b13e30655352621824984faf2e962c2fc8b44137db64c073aa9afc996b743c9cda4214a3eec774064fef547e688c5f6f48996656bcd47b376 SHA512 b2f15bcf21166f30c6f2261d8a4c500923ac47d6a9b33b0504dacc50911c3f6472b4342413735424bf2e66a3897dcbfa0b8c4c97cc2993ede7c841367f498f53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-17.12.1.ebuild b/kde-apps/libkgeomap/libkgeomap-17.12.2.ebuild
index 5bbaf24dbc0d..5bbaf24dbc0d 100644
--- a/kde-apps/libkgeomap/libkgeomap-17.12.1.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-17.12.2.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index e31d6f99e783..0eb3474b7d25 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-17.08.3.tar.xz 103752 BLAKE2B 847f09a81c1549f4bdf5b931fb76802897502c2d29b61c402e6f9b44bb991db750ec1f490d35054742db05ded890ad0e374405835fe677d85f8b9d74393abd43 SHA512 a91eb9444dd710b2ea6bf652dbacadfc1ccb4fcae3b0a04e1324b145a8a0b81fa9885e59686736a966224c032db6c06a8e95912a0e13bdb11b87c6469465f071
-DIST libkipi-17.12.1.tar.xz 103492 BLAKE2B a6693d5be58ccd83a4dade826c746ef909097a65d4eac3f1b62c9fb6a21fe085836f9b80e26cb7f874a2a0ff9d7c2638b6060da4db06aba66cd7a8c75dbb92ee SHA512 c0caff916767ceb84d58f06b6f1b237edf3fe77d1dd8f1e3a9be8002739ab76b95b7853429a235ebea38e220ef0111ce06e2b1b0c11a02ace66f658a99269ca2
+DIST libkipi-17.12.2.tar.xz 103488 BLAKE2B 11806b69a378f91e393f16d2b3b0d724cb9114707b47547d23dbcbd7aea1de140c364c9c1306963678ec67e9bdf4bfa770c5470198ec23e0445f869e59816b39 SHA512 8f80bcc86174fa9a0e4e746b1b3e59dad4dc313fb1f6a8a28ea442a171a84059a70611eaff1c00469e156f89641f8c51cbcc4b997961caccf7309d64db0039fc
 EBUILD libkipi-17.08.3.ebuild 565 BLAKE2B a490c4a53467ee8e8b85c4aa336d276474b781a4d44720fabe88d1171966b8f0d52ee63c2967cfb9749d2dd6f7dcf194b596367370ff07e5aa2651550e9c68cc SHA512 1fbc53e2c4cc4bdb81f2a9b500b06220866ffff3af9fe038c1f9bbdbe1bd2e2beaca2cdb90c4bcd63cb92a6499f5aaf0e87c359607585a7954e3a33c348d0e4a
-EBUILD libkipi-17.12.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
+EBUILD libkipi-17.12.2.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkipi/libkipi-17.12.1.ebuild b/kde-apps/libkipi/libkipi-17.12.2.ebuild
index a0615d81f262..a0615d81f262 100644
--- a/kde-apps/libkipi/libkipi-17.12.1.ebuild
+++ b/kde-apps/libkipi/libkipi-17.12.2.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 031f4efa755c..9359ed0bc2b7 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-17.08.3.tar.xz 291208 BLAKE2B 21d93042ab8ac7e12a9429ea469885c6c3cb94623ceca70647129c8ab5a70b018a9fb663beb7eac02a729f6fb3f2a83a108d79047bc3ed8aae452e2ef15b32ca SHA512 1b077fa9fdb56bd762cec5dfdf21a898de2a0ef24db79c0ae7ec9caa5f6af3a1d67e218a7b25fd879ef0d22a71448b888cdf6036da0ccdb041e1647520dbe11e
-DIST libkleo-17.12.1.tar.xz 315800 BLAKE2B 67778228b4f8dab74768e7f3e2537880c212a6bd8a5f2e77c031f9c0ccc012d774b16afde7f2ebb7a2a03f62f03a8ced07ae5ddfda2abb88138ec15e21c58a37 SHA512 6e1218e9bdbacbe379a82fb86803bbee02344d02fb1ca0a891e3fb9d9e8f7c3aecd8a1d94277b2e2fd12e44f403075af0a3d26f767cc69205f591b0386ef8f2c
+DIST libkleo-17.12.2.tar.xz 315168 BLAKE2B ac0b68f59e24d783f9e8104f4855c7245490be43ebd33ca9a789331f3945a144a257f00695e8f3fcfc5a2690a6b52879de071727e00589c68b63ff6d77a26488 SHA512 bc697f39310d7fa84dfd3ac186b3f1f7715b272bb70b4505439ef64c6fb1b453274cf46c5cce7d89c579a3e5be197fcfb7aa9a097a22081964c2a16d90e17607
 EBUILD libkleo-17.08.3.ebuild 736 BLAKE2B b5ecf7873521897059d6cf3cd9546dbbfb027734b25e1cb970a3fdc2a8c48060d1dc55fa885d339ef224c4f56cdb41fc58ca77bb3dd04bc94cd657855f72ad2d SHA512 7b0b83feedb065322d980a4e4e0ecd4a2c20043048a793e2de4ee7017f77b9b1998e8d04c5f23317bfef72890fbd4e621534fcc46eaf4b4511261598adb8284d
-EBUILD libkleo-17.12.1.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
+EBUILD libkleo-17.12.2.ebuild 738 BLAKE2B d36242f36d93cf29b4c01df38a358e8c917193f3dc4c97f05cd5d9a1ef6b2df2ac4dbe4eb1f068e58533276f3bd3911c7d20870c73681bac774f1776c92a9fc6 SHA512 86a5a68c07859e2c58222fdf95ea538968ba78afea0a1660d0d3991b440a4bcdfa4789d7476fa6107f411d454a3f1212192f145e01921f3b0ffbf937964abc96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-17.12.1.ebuild b/kde-apps/libkleo/libkleo-17.12.2.ebuild
index c7fd42409ee4..c7fd42409ee4 100644
--- a/kde-apps/libkleo/libkleo-17.12.1.ebuild
+++ b/kde-apps/libkleo/libkleo-17.12.2.ebuild
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 3d659a78dff7..47eed3f93ff8 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-17.08.3.tar.xz 1685732 BLAKE2B 11c3f4e2a7d773b11d71b7c7247e126182dd5b5b0a9487806e205d2ed76d0086a73b567de945996bb2c06876620f152e582b455188be9935302147f90c3afaa8 SHA512 b3f91f4c8a9f431c8f080888a29ca8c5c1ee9551cf197eeb7236349e5af2570e45681d9d90fabf47448515eb1765da1b1d3e078bf2bd1f4f8383635b1ed0894d
-DIST libkmahjongg-17.12.1.tar.xz 1686180 BLAKE2B e98ef4af8fbddd94450b200bf7ac3a031d81ef371df092bc733dc6d2cea29a898c9cfda0d137a2a3fe2dad7255301d1105b446a9f8b00f30f3c51cc355f2bce6 SHA512 c3e61f0a0e816cf9a973dca75645385e0c1404b12ee3f555201d5ac68ef408506b9425d97a729ff252d22284e3b0ac2335827f21a0961d26520c6a010d23949e
+DIST libkmahjongg-17.12.2.tar.xz 1686216 BLAKE2B 6d5fd1d66d4cefba4addeba8a8d6aca2b804b421f2978d56bbfcde3b75d9f78308d62e6b50326b9d5eb2b0b1e62064c4f9e7d86f7ac123afb640ad2323d56f79 SHA512 72df346ca92610bcb49e2067a35b1ca441b4649139998f3ed36104f92bb0a93a1bcc5283fd49901b5b66ed35fd8e865d04360267edc75a779ac0bce02047944a
 EBUILD libkmahjongg-17.08.3.ebuild 546 BLAKE2B 8b127dc50692d79fb790b8ebe6473f8fa0db04f525083078c19a0d851b54d5bb85565b5ce0c2b5b9ae5030dae81b15d52c54819e74fdc6e4a052c32e129660f1 SHA512 7d4a4a5350c2ee82e7113b1e69991cc85a09b919f860ebd32e7a2d634102223785a2b68e235c8099865c52199cb1687dcdd5dd37712a2f9e17db25f89d59351f
-EBUILD libkmahjongg-17.12.1.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
+EBUILD libkmahjongg-17.12.2.ebuild 548 BLAKE2B 41d9fbafa13eac18be62234c1d05d2ade61a9acdbc27008f45d261edcc76a9d975d96b5d553dd778bd1befa69faf5affe0d2aeb9bc197915fd2b26f1dcef7767 SHA512 b4d012f712fb6ca3b46ea181c5191dda4c0dd6914a67e305d69d07146e8e121ff993d822f740ff44951dbfc0a5eb267a6849bf35227fc54aea9f9c7a9077b97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.12.2.ebuild
index d8054495d76b..d8054495d76b 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-17.12.1.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-17.12.2.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index ff7b2cabdf87..1683dfe15f51 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-17.08.3.tar.xz 176728 BLAKE2B 32f19d3e449e3771b11c5016d8a5167873387e673ff3c022be14b1a097c8b89ecb6bc44c7dab0f8de768dc6d71644027e360c368b45f2204ce8885a62ee3cc5a SHA512 66c69da612f50bfbfbfa7c3067300db0f05cd52f0d5282f89c1c3a06694f5ff2aa3daf60f0c4cf40def201f6f55783acbc77c1ab74aaee30b978ba2825185af5
-DIST libkomparediff2-17.12.1.tar.xz 176908 BLAKE2B eead532065aaeb7100c6c2b49a10a6143bd70096bb9fd4b815c3251bb9e715fda36356f612c6af00822a5dee996bd33c95a51f9561093d5d93e808836583ac89 SHA512 902299ddd99657ef2c3da64df79485b7024371e0687773ec7181f490216535f2ee268210d0135bc7434689f965e615bf0af19bad3f1a8ab5efffd01eefabe8d2
+DIST libkomparediff2-17.12.2.tar.xz 173860 BLAKE2B 71f11aad1bd09a9c2e9a4ddae95cbc7a8c2eb281ca1891754b5183f80ca617477679575cd4811d10e013b03e17503837f5b70d270ae300cced39bc93a575aafd SHA512 e31fbd1bcfd0c6a1473d6282dd3775d4fbfb02d0f29f83ab8d564551da2af4b81f24cf61b951ef5d546d87f6620f4254acbe0f6275a236abe53e631933cf3837
 EBUILD libkomparediff2-17.08.3.ebuild 530 BLAKE2B 2798d96ffc2340818ad06219e9f3aeda03af7d5dfddfcdb8bcff7a8d3df51f229ddfb1dfd4d16bb003104a30eab8835df01e387910a90fa5e1ec47bb993b5e13 SHA512 f898b01a28774e5bd99f70f8cfe4d2edbc6630dd7aef04787842d084ada7c8fc45b0c8cde56b7134953edeab0f221f64a5f33a117acdccd43c6ba3034de7c935
-EBUILD libkomparediff2-17.12.1.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
+EBUILD libkomparediff2-17.12.2.ebuild 532 BLAKE2B f258ad870b88155127698612a950ffb630846ab4734b29fc274ade0f1c83afff84b91037c0b70c012560f39434a09d2797a01a7d8e370fb93b20dca21e581435 SHA512 5033558286497a0f1036d3a1a28c5e363a949097c408a78353646bbdec694db715ac378c0b2165de3fed0a93d6675645838d8200bb91755f21784324c29ba5c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-17.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-17.12.2.ebuild
index 78b78d3cb9ce..78b78d3cb9ce 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-17.12.1.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-17.12.2.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 522af33bbb9d..699b1eb63b6c 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-17.08.3.tar.xz 137444 BLAKE2B b3b7e32f4bae04d0d032bb3d28d2b2a341b58c3b7feb59f03ee18a20dc7e22f763b692da41267ee5e625d1a7f937c0eaed689c1f9bd5f5c362e97c07a8abdc9b SHA512 313afff1ef59b5ed2b4139c398c7ceac0737d005857cc34e4cbc8f7859f593259773fd851ebaa8ef64601434d971b5b211e50e4e6d8ce8dcdd3c21a712109832
-DIST libksane-17.12.1.tar.xz 137112 BLAKE2B bf95d13f4a996212259bf27aaaf2b74114a49c4698efe82146cc00d66ae443ba9d461da7cf09c7a420a219e9363d8f8c6cb3a4272b303615de1134fa7b18361a SHA512 9acbe0e5ad82d21919b4b56ba8f13092dd9edcf6450811f4461fa9eb319a9e06062937ef909febbadd3fd02752438e99fc888fa109ad17d8f67d2a0bb42cf8f0
+DIST libksane-17.12.2.tar.xz 136904 BLAKE2B 647805c4e99d894c6c32aa4cfd54a77be53e95698a5903966427ccbb2dd9a736d3490bed857d295b39651ceab04006c4b2336533532b5ba906101d07226eb658 SHA512 8567fc8da31ded406dfe2e72ff0a209741e437e51ab4beca75feabbb915842e1b3e7f692c94b448512e76f2b60487030da94518d240422653a90eaa0ef3205c1
 EBUILD libksane-17.08.3.ebuild 573 BLAKE2B 71e402cbaf80b9e4468b44128370b457b1af2694257348e025147da4e4625be0e8c6482f3cb4433e9f41e8ba9fd900939ff80e6557313d869d8f596148118013 SHA512 235c0a854aa4efe926958b9c263c986ce2a4037e39393a76d4c74460e0b7680c380bc46b7ced67ee91da545ce791db767d24d48ea8bf02ef0f557eeaba1d9ccc
-EBUILD libksane-17.12.1.ebuild 575 BLAKE2B ca5e02a7aff60ad286a079d518cc1d3e6033ea631ecd5518b617f58a315024795504eef97e8e8d162353d8b00e9d616c6faf2683104ae4fa68db2c28197c005b SHA512 e4695fe16ffb854ec2f412c03b5b99c8642737a1a6c3b2cc324936cd406d373a7207c3045304e6401b80481fc91c1ae7f83424b64ada413b359265e857652e29
+EBUILD libksane-17.12.2.ebuild 575 BLAKE2B ca5e02a7aff60ad286a079d518cc1d3e6033ea631ecd5518b617f58a315024795504eef97e8e8d162353d8b00e9d616c6faf2683104ae4fa68db2c28197c005b SHA512 e4695fe16ffb854ec2f412c03b5b99c8642737a1a6c3b2cc324936cd406d373a7207c3045304e6401b80481fc91c1ae7f83424b64ada413b359265e857652e29
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksane/libksane-17.12.1.ebuild b/kde-apps/libksane/libksane-17.12.2.ebuild
index 605af3a82574..605af3a82574 100644
--- a/kde-apps/libksane/libksane-17.12.1.ebuild
+++ b/kde-apps/libksane/libksane-17.12.2.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index d9c4279ce22e..615916b5b8c7 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-17.08.3.tar.xz 545808 BLAKE2B 694246b2a449581dc059bef146ae8c6966fe6b2e1335b7c1c4aeacd78ba468a3a1c754094fb7a5a9028f3485c9ed681ba3ec95c05f4bc5f1277d8452137fd29b SHA512 52b671c50c3045da44223424de67965ea15c1b6683be3c21d5aecc63e867c25b4970b0a345fe069749b9747bf8eb5d6f8ba30e8724b8e2def40a2e4b80ac28d6
-DIST libksieve-17.12.1.tar.xz 548088 BLAKE2B de459cd9c3d47847ca14239b1fc81f29e3b04d22877271bc3e0152eff0ba87e0df5037b09c7a21a89b8b19edc035682e55b75f374eba9696e66dc90e4abdec1c SHA512 9131904ed047f78bbd1481905ecfb337435f23b07dd3bf3f9fda0ad4f755acd2152983cca70e3d0bf8b8949d7348ca4d41fa261c1a5bb934cff8d963d734a252
+DIST libksieve-17.12.2.tar.xz 548008 BLAKE2B bb31911ebee1aafebbafa150f8a993fde1ba21beb9d032af164d4706246294d4c90292e92c06872d2f6c0248aaae19c64585cde5d34898ab728d438c8962477c SHA512 8c41459644535e4e35906e490daba4f0e83d4b344cc4b00649c7d9000d956670f9bb6c76a776de61ebe774f6c23cfab1f09c70d107c51671627da0bd07b5fffb
 EBUILD libksieve-17.08.3.ebuild 1533 BLAKE2B e7d3856bf17df772e53497078bc135fa199bdb53813a7e1156999593e74996e727069b81de54780d0795a8d386c3a2c8f1dd54f0db0b33307d9b7f0816622630 SHA512 2faecd5ebc6dbbd4b24ad88434f4dd5bdf4bff974ec0232f570e6a2e5f388d513dd5a501ee40b94b399b761ee6cc7430495162c188eb1c3724d7ea510370c057
-EBUILD libksieve-17.12.1.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
+EBUILD libksieve-17.12.2.ebuild 1466 BLAKE2B 298be1cdb6d281c4e9c4f835b1e6bcaca255ba52975f908dd49bd6cb898b4912ad485f46577538a1aa8b91af377c3a648ae8da54f5c2cbde937cd3700620a09e SHA512 ecaa71d696c464badfd030cfc31caaad7fcc65b0bdb6381b40157daac905d106a7ceca13a76b90e5357b13c7fa246f3a1ba45cf73ef160409bdf219eaa23b203
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-17.12.1.ebuild b/kde-apps/libksieve/libksieve-17.12.2.ebuild
index aed045a2025a..aed045a2025a 100644
--- a/kde-apps/libksieve/libksieve-17.12.1.ebuild
+++ b/kde-apps/libksieve/libksieve-17.12.2.ebuild
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 2476514d5b75..31bd4f66e7aa 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-17.08.3.tar.xz 300000 BLAKE2B be1a3ae28b5a77d35f8b76d4b00157dfbc90a433ad6b4fc414ef56161a540af35ea0b2b7e4018a798932d66e3053dd43eea30a700d18863b7f932e7f92c2156c SHA512 89f9fdd37716c45d49884b56c81dd6e8e3461b54a2a5d6c5c15d757fc9b070dd5c13d2c76cca546b509652426085bd9d356d4135b27f7e30cdec091b1e292b40
-DIST ktnef-17.12.1.tar.xz 299936 BLAKE2B a378b049a32ec4bfc943944a7753695d1f32d4c50f28ab37f602c1929b24153b5a2194196e827d5a4fe3578a7eab9ce2cc5f560861de23e72dfda1baf9dafa2e SHA512 5cb402d0ea6ee1db7843c30555f31916f00429723c802a7c37d64a93d52e0ab626f1ae36ac1636d597911da8cbd4a4860b39b0e98d668f20bfdf55546d89463a
+DIST ktnef-17.12.2.tar.xz 299996 BLAKE2B 3e1f8bffe846f78f34619de64dd1ce030b15cb145141b2aa98dbd3494f5106d4ce4f46ea8bf9b73119480139f0e0491675ef36a9d18b2ad9c136f97156df333a SHA512 680d483bea33627ca03f159a73d6e914c5ae576e615182ae6ad09961eacc8d1a29d43beece714f3fe8f9c02ab02592c83c43534cac2795862352ae225c59810c
 EBUILD libktnef-17.08.3.ebuild 465 BLAKE2B 430eac8163868861d5397302a80a0fa288e27c360b22c58607cc5fef01ee25f430d1a352d1b8874060386efc40d58c1525994ecd8fb1a4995e1b0754e9c8a5c1 SHA512 9180b41fceb1a71c55a3e41bbf4cda63143c964bc691fc9300cbdae182b7b0fbf1a14b8e0c0fee66c55fcd639db2c2235b7c1c7b924daf6097b1af2755b22c8c
-EBUILD libktnef-17.12.1.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
+EBUILD libktnef-17.12.2.ebuild 453 BLAKE2B 17349c18c88369bb03bae390beaa38601028d127362bbbdc4954a4271d3787cfd42f3d9e1a3c56d26cbe9099294428ab36ea140079200b1ec83895ab71fa6e22 SHA512 3ec1b90fb9d308800ceac53827ab9c5376ea0853b6bec07d0955f41515748562ea7383df8c320ae128e28f91e77bd2933fb5309c8863a2b384eae686acfcb86d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-17.12.1.ebuild b/kde-apps/libktnef/libktnef-17.12.2.ebuild
index bd9497e32c2e..bd9497e32c2e 100644
--- a/kde-apps/libktnef/libktnef-17.12.1.ebuild
+++ b/kde-apps/libktnef/libktnef-17.12.2.ebuild
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index b2cb0cf40306..2748d4e7dc37 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-17.08.3.tar.xz 2214924 BLAKE2B 4715c0fac043c1a58dafc1edb77720a7219aa83f71f899dd189a9a39a0932192ef8249ed8685ad2bdb1a9b22cdeb386c2324cfc1063aef21ff9c36f247391eda SHA512 536fcf1085e55b89c5cf3f945d458d93f953fbbcf22436cc77ecbad90c1bdc2c263ff3fb4f9b6e365ba394814f0e3ccc4dbdda74702f8cab01da11470e386d8d
-DIST lokalize-17.12.1.tar.xz 2219776 BLAKE2B 89fb56c4f7ad55e1da41de6873776afc32a6b9925d19b984dd6c66ad9d2cccf2bb695270ac96e61f5eb80351f1d695c8f74a5a539e912841c8c252dd88ebb27e SHA512 a06648303b88331da1e5def919790eafafd3c58fdbf74583b9bfeba704f7449718e9f66cbb6783ee3dc7f68d29de40c10cf189436f138c1d6bf82c6b73fb8a79
+DIST lokalize-17.12.2.tar.xz 2219192 BLAKE2B 1eec80c4412ba0cdc6da942cb2997ecb1a137768bd5977d001cd050ea15f73924d8904d87fac3a578f5c3b28b8fda14999243405d0a86b098b648c0e740c18ac SHA512 fa8a6bc4b72245ac5b54306d4c11b44d03c74c6377ac500b5c5ed67e03085f5aa240c8c8178b60f4954e9354c5056993aa2a44d665d85ef3440d43b127f8d8c0
 EBUILD lokalize-17.08.3.ebuild 1550 BLAKE2B 470c0d3b1448da22d472d0b046552dc798d8dfc0208f3182736d541d274125160cc38ff9013b78b603303fbb074f818907c520777f3db9cc2cc27637198c9915 SHA512 d41d8cd4d06e2de04f5d38d0b1d12a737d55fcca76b8195174b14783b94ac0a4f6718b2ee8e6f50a94de3f2fb01cae72b3275813e7e86bfd02ae0d079eeb5b71
-EBUILD lokalize-17.12.1.ebuild 1552 BLAKE2B 5fd2fa07b79bd14d84b1eb525ad1d04dc357be540ff52a356d5cd33744e5c23bfea188ef818a3633db66fbfc531bfa6acdbbf5b3244adf7471ee1a5c0eee148e SHA512 8b9dcc64a7c528484c1dfdb6e7a5f5796b11f7795786c62036a4f5b7abb7feb808180bc3d84acfca540a1f5213e20ed8ecffe470cb606bc31f8f243bbcbf39a3
+EBUILD lokalize-17.12.2.ebuild 1552 BLAKE2B 5fd2fa07b79bd14d84b1eb525ad1d04dc357be540ff52a356d5cd33744e5c23bfea188ef818a3633db66fbfc531bfa6acdbbf5b3244adf7471ee1a5c0eee148e SHA512 8b9dcc64a7c528484c1dfdb6e7a5f5796b11f7795786c62036a4f5b7abb7feb808180bc3d84acfca540a1f5213e20ed8ecffe470cb606bc31f8f243bbcbf39a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-17.12.1.ebuild b/kde-apps/lokalize/lokalize-17.12.2.ebuild
index ccedc7183012..ccedc7183012 100644
--- a/kde-apps/lokalize/lokalize-17.12.1.ebuild
+++ b/kde-apps/lokalize/lokalize-17.12.2.ebuild
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 457dc5adb947..132777474da0 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-17.08.3.tar.xz 1215888 BLAKE2B 790bc4fe6f448d7928014d0c440e8bd87db1f896f19c0faa1b76a93723f7def6e048d06c550b4cf2aaf32274bd5e371b2b69049e2d9517cbd56efca0bd82eff9 SHA512 9e966cda37cf03b377d4ac3c5b71098169a15d1c50cc60d4954dc9aee6620898709e6fe5dd33af38ca31f02ce1ffe2ee0e4bae6551d25da55f7121d0751d9088
-DIST lskat-17.12.1.tar.xz 1216100 BLAKE2B 64e954c5256012f8639c9531ac1def3aa9a2ded99c18606453efbf9b470485cb4042f28295d169f50b5ed6c39657e1f57590e28796a27dc45b5449749c4c223e SHA512 1f0a11ee4098758717d26f88d149864d56931ad4025a674e30bc26f807c3ea40f8eea3b8b0b960ab653d6f25d42d92058944ea5f7772e6bbed1b97d11fdbcca6
+DIST lskat-17.12.2.tar.xz 1216532 BLAKE2B 3c2bc889873d6c94bd96bac1482e18d454f8a96ae13bd14050b065775a68d7a1b13c941de0fd4c5e8113b40106855c2a575e252b7d557f8e5075e314720da59f SHA512 320d30ccb8511c7e7701bbd619973387da2ff6a5cf79d5dae0576627efa3d0b99870d58498a8baf5edbc26fcdf6e061d6c28c6a5344600c010db7d032f8c9003
 EBUILD lskat-17.08.3.ebuild 729 BLAKE2B eabe31f158e83a31ebe5e86082a1f8d5426ab9d837cab0001e2d83a3f36cf4787619989a1ccd156c7bc7ffc7a165abdd1dfcff86af3a70a771b986ae8182bfa9 SHA512 e7474b480165dfce91552c11b127f0baabbb06635252f29d5d2e043aac05eb14c0c773d44b0eb16fe9ce7d5d9714a21f0259e4f42770420f022564dc7525d56b
-EBUILD lskat-17.12.1.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
+EBUILD lskat-17.12.2.ebuild 731 BLAKE2B 139bdfd056ac84ecc4a9dc8ea79782c99fed057d4ea09d076bdb5b158dd66bef54067475ff1deaa9a8f780be92964c7f67055c45672ee45acf79a08ca7d72b3e SHA512 478a0dfc87d26092cd71e3dfa43da39bd1cccbeba41de83687dbf95f8a3f3f36856ca5ca8455b50cb04c0045c2016b7e1245ab983bd82f17849095425b1154d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-17.12.1.ebuild b/kde-apps/lskat/lskat-17.12.2.ebuild
index ca1d75ae4777..ca1d75ae4777 100644
--- a/kde-apps/lskat/lskat-17.12.1.ebuild
+++ b/kde-apps/lskat/lskat-17.12.2.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index bde0af53ad43..94608746a066 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-17.08.3.tar.xz 657612 BLAKE2B 9816c21b706b2999d143b4a2c003188caf21df6eb5297e1b9176b7086461bde00ba30522d601793e934be1470a2c308e326273c916edde0d02dbf04075e23c52 SHA512 b6b35cb5b7342ffcae789c098bc3c8593f8139d2222f7957da4691c3419c2d0468f7d0e503545d299f54619f8ac9747b9cf674cae760f878a609c78170e7bdd9
-DIST mailcommon-17.12.1.tar.xz 685204 BLAKE2B e9fb0b78eecc76b1b1b844e8a1f43655b312bb0c644be769f59175734389bf5028c7cd82812335106f520d883d24dc1d45f9f986d6892c08dd306f495bb22c7f SHA512 7f29908d492a0c4a35cbc8010ea4989f2ec39ccc35fd47fd6f0acb4d8f0e01edb37e55b3f49c4f267495a567e76a34b5fa92911cdd1ba4193eb6d988b4de16d4
+DIST mailcommon-17.12.2.tar.xz 684432 BLAKE2B c60a679df505a2fc361855d655e16572230a37a2ce26388aa1cc64f93606dacc3231c6d26b3070fd5093d7b587aa1d5978ff12c2140cf81f6d5def66e7203464 SHA512 5bd6afb9dbfe0f21f07b23781f134f0349a7dbee338bdcf06d5e18260d719a00414e36faf7ff44e5a21a9f9b3f68c9fe8f2e53a8e35f9fe79c500de1248bfc16
 EBUILD mailcommon-17.08.3.ebuild 1396 BLAKE2B 2e7c2788576a7e62440b10265142849b937575f4ce7a0ed0fbf6b697ab89e22fbe36e9ae48589ce28e9caa683f327d9a94b03fdc91cd32b6ec413d7c1ea9d845 SHA512 743566959269291de0e76e87b9af24163f20a543cb124e2c0386349f0419997f0d42e9fd8b01cb194d8b21060fba3ab82437c55095115d594ecb7db0c815995c
-EBUILD mailcommon-17.12.1.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
+EBUILD mailcommon-17.12.2.ebuild 1441 BLAKE2B 49ab94d207419115653979f9992bbb77c37996f6270285c66d1d297b6f01ecf56d4b0d85579b50cf9bccd3010a598fd7452361bf980b8d2ec79732c44ed9d8b2 SHA512 7f8aadc824fcc06f54e90a4cf16e99d732827bc8a3dc00afdc3b828b65f2a31fa9b67882bd9a643c9651b96402a4ad55b73bc2525c94998c1034d962d1c210aa
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-17.12.1.ebuild b/kde-apps/mailcommon/mailcommon-17.12.2.ebuild
index 22fe87d28fff..22fe87d28fff 100644
--- a/kde-apps/mailcommon/mailcommon-17.12.1.ebuild
+++ b/kde-apps/mailcommon/mailcommon-17.12.2.ebuild
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 03fa5f8faf6f..e6aec51775ee 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-17.08.3.tar.xz 538272 BLAKE2B 45b08afbfaad23d404aaaf7df87fb6dc24c229344b0d5111aa66a52ab6a70ad70559fe868005154e514d0fb5758def863d377d0987adf06a9ed18eac31fa3739 SHA512 987f2745c9c2a6b14ecbae1ad52dd72ea13fb580668e30e9265ea69eee5f36b6d6b6b5a81a8f51666d1d401be61c5a2dbf0bb8e8c98dbc66ea2f8ceb28bdb1b9
-DIST mailimporter-17.12.1.tar.xz 541296 BLAKE2B 9f80522e710b381c4ca6bb9bb8e651fdbe022da4be25b1b36627a13e732c850d8ec6ebd72335291f2e2cfd8ed56bbf10fbd3ca98dcc7dad23639f8b4dec4a5e4 SHA512 423e87e3235b0cf1cc5dce14bbe1da5508ab5fa79872e1582f29900955699e025003fc192f1298d0c1d60b382064488b370bd2a423bae7ecd56cc8bdeac857da
+DIST mailimporter-17.12.2.tar.xz 541468 BLAKE2B 99230ed9170e0a2cd7b0124110b4505d326309805117b265d024040bcb36d9f2d1deb0b92e3a9a3b73f2654e6870024393670327d8a07b885d4b83399b58bd5e SHA512 8887a7eb44890c48471996a8358762cd95f3fe8452ac93c5414a6bc72c5a9892c4f7f400f1d160378f952827e2ccc0c5cff564375bc828b5f87912900923b5e8
 EBUILD mailimporter-17.08.3.ebuild 652 BLAKE2B 575bb7e7bb41544b59eeaed72b27f5cc080c313e73c4f87b68ca1b2ddebaa2bd6811d527d5bd9650b8fc13480f48418a0cf88b70f63372757589bd8acc3e9f00 SHA512 d8e5c1f7c242e4dd9f492e82310a4c55a705ba1df2331b96b30b459d9b232eb8abd083ac5a6669c052a4d37cd9303529b1d15f0efc1b88f87421f1e681892227
-EBUILD mailimporter-17.12.1.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
+EBUILD mailimporter-17.12.2.ebuild 654 BLAKE2B 9ef5a0b869e5b13e9ea6e51df8fc22effc796235ada13277a9ed4b81d184646b73be1ccdcefe705ee34f78df15ea6c90220dd201c20cbd7608fe80049230f877 SHA512 7b4da4ee77779f525a895ff3752afb86e15b6eb84a79b7b62dd0c0f9ffd72b71a9877a952329b6a4de359630a2011bb5b821fda30a03396cd574ed28749982aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-17.12.1.ebuild b/kde-apps/mailimporter/mailimporter-17.12.2.ebuild
index 948285cee867..948285cee867 100644
--- a/kde-apps/mailimporter/mailimporter-17.12.1.ebuild
+++ b/kde-apps/mailimporter/mailimporter-17.12.2.ebuild
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 1bde4cedff4d..8d821725eb6e 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-17.08.3.tar.xz 52280688 BLAKE2B 915e7358d1dcbe25cf480a6c4e602a4bbdb866cab1391469823c9e910ba8165ab408e0d159a804230ca55e7bc7e42caa890a8c01d0d2182a9dbd41b94d430ee3 SHA512 9991dc9137e63462ae7d6086063d07d6012a22c4dfa137209517010db1f71ea5c7a494600d251f63b73a54943fbcfa237f1fdc749442dadd399a5717162f5e1d
-DIST marble-17.12.1.tar.xz 52353260 BLAKE2B be00effd0ee2e278caf628fde50816ce3f3782988a834dfbbe1524973ea69ea06bc36fc4653859d673f2184e567be1d24424c5273fd127f9c9b56ab574ac5a0d SHA512 38bb2155a9f1ce7ba5b7bd47aef225c8d484a72db37dc23e0afa3730e9943dc57b47409a2fb12126ce5ab2bcb413ef08b484b520228206b7493cd37f2223feac
+DIST marble-17.12.2.tar.xz 52349180 BLAKE2B 4f5d49ea98bddd0b445cebc50f993d44ce1b8b6cad3ae10970e3958baa19425d6649c6a6f689a8a66035fc5cdc1667f0e751dcb5ec2b804db8713748f1677200 SHA512 a8641e0d380f666b5402d83ccf01772442d8df0bb06d5de82f43abc56c19f544a1a3f148889f297758ae0ac6654e90cfdeac7a97b05be49c61985eb83bf7194f
 EBUILD marble-17.08.3.ebuild 2246 BLAKE2B db0c96ada76ee661bd3f127188e9ea89a2a5c672f234b02eecf94da24442f1105ae7cee6aa6403566cea8add3f0d4e40e9fda89a4d4ace5b753636213b6fb0f2 SHA512 7317d5a669c65df1c9acaa2a7219ef53c6299854f7376989626f5efe48a6fea3e700173e69a24f64df946ca05069d6a538307a1548d81eaa5c85e2c408e84f11
-EBUILD marble-17.12.1.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
+EBUILD marble-17.12.2.ebuild 2248 BLAKE2B e622a677351777436a7f289a140df55b73d506e66d336d7c8f8234e0a19cb7ff9416cf92e593fa2cf86d7b2514fe1a4249dc436ee7a985ce607729914c796f23 SHA512 e3721957e6ad93db7a0b3730ddec083f78dd83968fe881d314c1ea802c519f4b4faf5a4ef5704cf54f15da53daf182010dad4577705369463091e215d7346c60
 MISC metadata.xml 555 BLAKE2B ed7e086f8e61359a372578496b4fe57dc271bd0b55dac188774cdc91131771a2ae6b07846fb80c59205350cb0e806e67cb9cd66fc77b29cef6d81dce2f4bc286 SHA512 d686018c9a8e8ee6cfb4504506994d4fbdb75c615b866356f7280b5f6d6a49ad71539cacab5868ada9f67f2ab22a3cc89f78121034424ace4be98307fff2faef
diff --git a/kde-apps/marble/marble-17.12.1.ebuild b/kde-apps/marble/marble-17.12.2.ebuild
index 428bed2765e2..428bed2765e2 100644
--- a/kde-apps/marble/marble-17.12.1.ebuild
+++ b/kde-apps/marble/marble-17.12.2.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index ad58c2a4648b..74f9b32f4b64 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-17.08.3.tar.xz 33032 BLAKE2B 6d4d2ece24f5581f09d2f45afebbdc961c268a1926de3c322d8073c84e59be48677377eb8c34f352f7e2deb05e1aee127bc2840faff3a5f0c17f13d61425a979 SHA512 6b5daa7800aca63cde814464b9471eb14cac76112a374258644cbfbf0cb16f5777ed27f37c4a3f22973062fe9ed65d92366e77154ec106a4a84c9d034e8d9b58
-DIST mbox-importer-17.12.1.tar.xz 32904 BLAKE2B 4ac5c610161d0b22a7d1cd06f0294907d24b0b9d2bc841824311b991c61d6366dda8d9fb6a2b9bac436a11f016b242781105fa45d1ffaf4bc0faef75f40e4fd2 SHA512 cb1a02f67693360831af52db98fbb6f9ca4db8d46b3b0df30d919087f993ad2693dc4d0d902235dd32db8dd596d7eca023a3c08a1703a75b1ad062204cbc3e9f
+DIST mbox-importer-17.12.2.tar.xz 32912 BLAKE2B f1812c9773fe430e130e5b2fc96d660bae11c3c1323ef933abb78251329cbebcc082b44919c9f48865b43abcf804f14ebd9ded68b8becc96b5b2daaada7e76b0 SHA512 5d9cf263c90ffaa7e1284c70a4a0c0c6622ed2898d5c8fcbd5bc7f742b6c68e4e8c49381d35961570e4a297e0e00ce3f585cf01d2bff03d8f712246ebda6af84
 EBUILD mbox-importer-17.08.3.ebuild 825 BLAKE2B 1546fb5aad8d08474af21a3319ea0036d3a617ab087b293dcc71696c5b0e59f65a5bc9c3c4369f99d19587446109f7d8c34676951d4ad895d7af2ad10456fc32 SHA512 acf89446d56f7893587c791058e6557880035ed87bfb010fe37b596a7e06dca1fb5e1f4f9b9711c0f881d9798150499496d6452ae4096f3057b42375c2b489bf
-EBUILD mbox-importer-17.12.1.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
+EBUILD mbox-importer-17.12.2.ebuild 827 BLAKE2B 9a2ece799fd5f1526a24c0501844b31e3933000040e426f1ef466e5f3b4a89384e2ff75ae749a1dae030d9c388ed5c2911f8179474791112e56a8a51aae55314 SHA512 c18b40ec4b237a9acf9f6d84f8bd65fe1fb65a23f3996a45af1399b7378352fcf4bb4cc387fa8b5e4e1e055e73eb0edbc69bc566ea0f6bbc2a9524113207a8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-17.12.1.ebuild b/kde-apps/mbox-importer/mbox-importer-17.12.2.ebuild
index 7e0ab68ff2a9..7e0ab68ff2a9 100644
--- a/kde-apps/mbox-importer/mbox-importer-17.12.1.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-17.12.2.ebuild
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index ab543d639bc9..d387b15e6fea 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,6 +1,6 @@
 AUX messagelib-17.08.3-richtextsetting.patch 1098 BLAKE2B 45a3cbbff333616d1de0a13042482d8bc819d5a8d0ce910739aae4265ca32847355024e84c5029372aee1ddfa2ddb2fb72c6ba5f2fe1c61526aa69d5b567a3dd SHA512 120c7c850947b777b682e56cd24b267344b0434e5dc7f053ba64b55f91f5a5d6f053c2b5d102b9ab80b30e5497256d50dcff34892aa9f4bab33d8dbad42f22ed
 DIST messagelib-17.08.3.tar.xz 10463496 BLAKE2B 612672462e77217555fd48e7038e727d8115d1f151e82720e2934f2c98ac3012abbb3e1402befa4704fbcb7234b604f93ad3d1af4fb853e3f7173758240c6f12 SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a
-DIST messagelib-17.12.1.tar.xz 10485352 BLAKE2B 85da09eb98885bfe8e20e41b0e768882c734dae7c8d3e629bfb4654608d041fadd1abf5195cf02282e5f9e111972380d713bcbd3558c37457520a2c309eafb9e SHA512 86a7aafab63119b68231f5d62e463bf3d5e9fbb2d447f44d8a170a674f67f934b626edddfb3db75338150504180052c39db7df9464d1c88991da2256138a0bb6
+DIST messagelib-17.12.2.tar.xz 10472692 BLAKE2B 917c89180630c95d3a59401bc910a67350a87ab9011614c87a0f7bc66b2c740fcbaad5ef4ac1bfc4f732f1ba9a9d2fa62a7dd736827b53dfcf1abd312fb5eea1 SHA512 50d9dabe1144200f065388b3c92acf9163d5531b0725d78ccbb81685f5aa2a972a37ff166a55160053f5a649274ac04e075b986def9a956b0b06f182fc9e7797
 EBUILD messagelib-17.08.3-r1.ebuild 2057 BLAKE2B 9628cbb8c6ea65613e1d95621e19890144a677207cdc741a03cf9c6f854127039d063b4bd2dab194db0055886ff5ad78d74bff20e66024de7784deb588b6b9bf SHA512 25698507fbf9b6b1bee29854fcd32542e1344560df2c67426352300aafd65c12c8c546c9504d1941daa0cff581d7b88876aa71ff408173f8453a7a7cb37ad8e3
-EBUILD messagelib-17.12.1.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
+EBUILD messagelib-17.12.2.ebuild 1939 BLAKE2B 5a13ce58b75c27ca9a4f3410bdb2e6535db06202e33feec882dcf0d6c827f916bfcf900a92b15b4bf406bae13376de0ae77ac3711a085b10c6796ca826c4c878 SHA512 692d1b92a062b6a67512c415fd7341070c1aa44335bb3e637ec3e73f4ea5836e891428ba5f80e5cc9ea2e1601ee12eda73f243eb5d798d6d458882c677c570cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-17.12.1.ebuild b/kde-apps/messagelib/messagelib-17.12.2.ebuild
index 2c9ae95e4387..2c9ae95e4387 100644
--- a/kde-apps/messagelib/messagelib-17.12.1.ebuild
+++ b/kde-apps/messagelib/messagelib-17.12.2.ebuild
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 25625d256002..5c7f17e8d7c6 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-17.08.3.tar.xz 27852560 BLAKE2B 1e1a0966493ccec052de9ddf4f8b5fb188495f051b74aa7d005ef91a3ee7862402b6a741f9d04c291aab64f1369aaaf00422c98aeb5d69d5b73e885de81625d2 SHA512 bea19e3e661235b5d2e944d260f3dd00cc7caab5c27887e6f6aeb785e239e2bab4dbe2aed34bd363e69462b2cd806f0dc20e54b1bbea6ca02aa9bd7ec53790c3
-DIST minuet-17.12.1.tar.xz 27858388 BLAKE2B 60cc913cc42647eaa379eb30401346445c26dd607589d6371b87bc3a8155e095613c1eeae6c25ddb04648d6a98907df021131c8eb4419d8e9a8ac468120f8b15 SHA512 dca62267c3cb87a750046dc321045b330e4dc3ba5f51e17285d1d32a8fae03c678d218283d7912aee16d5fb749cc3e8cae8d842136d7ad3c213590a35d1b0597
+DIST minuet-17.12.2.tar.xz 27848724 BLAKE2B a9eec3f4553c24884a099d37ca964f2670139df6c444864a872027a621774285cbb93d96fce1e3211bf5b87b361b555151e470d4bff2a52d7edede29b5ca2be2 SHA512 e9c45baf8d6ebc6055ca9d80ec5592916015307c8f961bc9fb204c3ecf843775854eeb3fb21284cf81f2493fae61c00507e119bd1d8aa6f68ffe7a0d6d67846b
 EBUILD minuet-17.08.3.ebuild 586 BLAKE2B da94be4615f9b2849fa40945d21cb5380324a8ed5a133efa2cbded0dfe15e91db7c14fba8424bd62e0199fe2ddeb3a630066f6a654404010dcc8d005e4d68718 SHA512 6a4cd1a8dade432a3463feea552d049c08da3537e4efcbba25359cf99637e926a1491a164fe3f77e554a905350f1fac16ad12b5c6611ac800d3c3a90e9420eec
-EBUILD minuet-17.12.1.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
+EBUILD minuet-17.12.2.ebuild 588 BLAKE2B e9be0a1f2b0971d041ec3cb99dbf250ecd862421adef49d028443d1a94b8861f137683a791b0cae25d194bd9c61414efe428821a5a63e34a15cb4c402173c7af SHA512 9315c52f7b0bba2f2764cffeca373edf4ab5d709b4f5e6238a910f5019f809c430535452cffed512ee0a70bf605773a91f9abc08ee20a74c5bedf0e87fdc63bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-17.12.1.ebuild b/kde-apps/minuet/minuet-17.12.2.ebuild
index c0bd89a53dfc..c0bd89a53dfc 100644
--- a/kde-apps/minuet/minuet-17.12.1.ebuild
+++ b/kde-apps/minuet/minuet-17.12.2.ebuild
diff --git a/kde-apps/okteta/Manifest b/kde-apps/okteta/Manifest
index ca2e8de347f8..b7a36bc1370a 100644
--- a/kde-apps/okteta/Manifest
+++ b/kde-apps/okteta/Manifest
@@ -1,5 +1,5 @@
 DIST okteta-17.08.3.tar.xz 962236 BLAKE2B c17022a0bc449c92a281d928e7f32b7d31fc5c2fe2325abf572a84563bf2f173bfa838cae9da99e1aef52a9271ae9fb67654c29abce8409391c4c86c88c84137 SHA512 47517531c9e780c94f81325e0ce54756e85d9da8f38372904ed43c6eeb29c824afab66159a0f1e3648553544edd597138678983b74442fce65cdeefef14190ed
-DIST okteta-17.12.1.tar.xz 962940 BLAKE2B 7530a8cf4e427fc57e258e89b4c591ccf64a128d34c0b1c324153fbc2ca811f0ecd6184fc82ae4d0452ce9c6f81248ef90cd488d2e46e438f5ff5d2a31d196f3 SHA512 229ec2803a95dcca3ed207caba5b231dd37233a16a3d5e331a6b29f43f2523ad5c83fa0789c5853dbfbc83bf50d213dcccb6be7831e85eef49b4ea4e35f58ca3
+DIST okteta-17.12.2.tar.xz 962820 BLAKE2B af241c7da16696bf7aa4a8ac5662c0c6e604dab9d49c529b308e8102c928731e809ae429efa3834c4be847b40fdcf58aa3a5a30392acbc0a8bb135896fd684d8 SHA512 f7a113c2b65761ed2edd538491f0bcf2e47aebdc5ba5a4ed8d583a33e00ce57ed86918b57ca5dac806f68573d63ebeca3fcde74564c2c09f5bd1a94bbd024d8c
 EBUILD okteta-17.08.3.ebuild 1401 BLAKE2B fe633e5a2c91fb9c9da2fca04cafcf4432883fa499f8453a253317fefffb4afcfcf4556046821ab4b4ef185bfbc3b1ecd41bb312a7cad7679ab03e32d5fc21c3 SHA512 826ac7c7b32a9a29b44c80101fc6656b1005758d66af1a42306860363c885b34201f78ae8619f0a15af672ac60cd0569cd76804135cd09176559f75b0a18e10e
-EBUILD okteta-17.12.1.ebuild 1534 BLAKE2B 0d21c34f9c76b882028a453de2536fd31a5addd54ab6f8e7b752b14943687cb1efffa7b3a4e0e9a9d633209be7fed6a59fc236ab47fdcd76b2055a9ea52cbd1e SHA512 73e7a0484b9f51c8e3d0d81b5e41e2ae63ca26f0e5c4f0ca6ad74b8df973e04562b5f6042d0bb229fe1309a8b02d1c109a27e548fff6d48ee3cb6205e4353754
+EBUILD okteta-17.12.2.ebuild 1534 BLAKE2B 0d21c34f9c76b882028a453de2536fd31a5addd54ab6f8e7b752b14943687cb1efffa7b3a4e0e9a9d633209be7fed6a59fc236ab47fdcd76b2055a9ea52cbd1e SHA512 73e7a0484b9f51c8e3d0d81b5e41e2ae63ca26f0e5c4f0ca6ad74b8df973e04562b5f6042d0bb229fe1309a8b02d1c109a27e548fff6d48ee3cb6205e4353754
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/okteta/okteta-17.12.1.ebuild b/kde-apps/okteta/okteta-17.12.2.ebuild
index 6c85fd84816a..6c85fd84816a 100644
--- a/kde-apps/okteta/okteta-17.12.1.ebuild
+++ b/kde-apps/okteta/okteta-17.12.2.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 047f4820a4a1..c3a6ab0f7e6b 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-17.08.3-cmake-3.10.patch 1615 BLAKE2B fa352ae2212f04ce20968fcc54906eb6cb96708d076c2a9e2b9ba95a8aeccbceedbf131b698d07e7a391e3e8ccbbb85422cb8937731116348f16e5163810e605 SHA512 2f06c6b54bba5241b3d5b72724363b3acc5554d314ea8bb5d77b0fd28963283cceee1c81627f6701ba2afd8e88f1239a14b05fea7271148bde55e4bc6d93adb1
 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 DIST okular-17.08.3.tar.xz 5618588 BLAKE2B b9f36211ba2620bcd984e715c37112d92f56c0f8d1d1298d54db3092fe205ac4abef18cf64756b81ac20e91fcbfe6dc18fbe6de682cc71caf0f24be4d2b7c15e SHA512 33b8f1bbf1f4c5814b6df8bfd87a3deccc762564f312729a50956c85fc95f1ce9f057a8b43b51a368a3f0c2a4d9705dde09d1e575f7325ae32420c0106ce28b0
-DIST okular-17.12.1.tar.xz 5720272 BLAKE2B 90407129339939619e8c06cf02e0dcb933d64e7e0b07f42645811fb99345575498b353179b693ba464b33321ded73b82ca05d47962a5012383d9fba5ab49b8ab SHA512 875254e9a7e7832535f832900b74628db72c60dd0e49ba171aa5e1d5baea3cdf593148d693d1fd986cbe99f2b0519ab8c1b357d98d2dde846f128d9729cef614
+DIST okular-17.12.2.tar.xz 5737180 BLAKE2B 7949261241ac06755616ba454a524dbc4a0b4895cfa93bcaa29b82f2413a4b69d3305142dbd2b817ae611b315817edba492bc1ddf1ae3c064bc67ee09d74559c SHA512 4bd6eda7a5ebe3b0fb4a0e4518a321e2e8ecb74984c89085eba24afe76828f0f7af16f066519b52926edbb593965ce294dc28d1281200e9d284a6b630e92da2a
 EBUILD okular-17.08.3.ebuild 2545 BLAKE2B 4c5ea67e0e889c61c6fc140e7481f1f95453a6e60094653bc92fe1d33eb5a4d4a5728dbf181c7cd7392ceb3e4516b856ebccca3511f48e07ccaaa849712c3c2d SHA512 98fa1c9da0dd4e106bd8e17d1750e80df925eb3dab91120a6981f915de007cb4fa41d12faacea41a3b7de8b9bdbf40f3a493e7dcf51c8c1b57b456fb705e8147
-EBUILD okular-17.12.1.ebuild 2907 BLAKE2B bb221b36047ed8f94e11640f95bd751bb8008e4c87dd170e8c7a7742721de1b64978cc2a2abfd0b09b9ff3b32dd958a0f29ab636e654ad1de1c94cfd1e5a7458 SHA512 165ee18ca37a6c03b93f011c5a1b2d60aa93f2375b2b69e734807b8ce22ef8b09bacd2423b106ffa590ff4ecc5763a45f81a249e744626595667cd82f2c1ec08
+EBUILD okular-17.12.2.ebuild 2921 BLAKE2B 0c636de87c004761406dc8bd2bfa265edb80eb6634427e90c3a33092db3aaed5b1483b93552ce49b26fb70055149db62fa557f320cb5b84089ac5f3cbba20b7d SHA512 d281eb098217cd48beccde795bc81da60f0d725990b270445d70ae0622e25285fdc254456676ad7f943afed1f188f2330baaca4f1752d7960135ab5bffae46a2
 MISC metadata.xml 926 BLAKE2B e2afad30e18aa62424c2f3bfdb6b3904fe8fdacc7540b05ebe16381bb39ffaa2c93a97706bd264f0a2a2497ed1d1a7171fe971eab6642410f0555c639af32c93 SHA512 badde2fb8455146d7d0e320290900417eac11c4a07b222fcc6efd56e9291ff10a95df26169498cc5018c906c109cc78c626eac0c8e67c3f535be563abf169062
diff --git a/kde-apps/okular/okular-17.12.1.ebuild b/kde-apps/okular/okular-17.12.1.ebuild
deleted file mode 100644
index 20ecfc164b14..000000000000
--- a/kde-apps/okular/okular-17.12.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		$(add_frameworks_dep khtml)
-		dev-libs/chmlib
-	)
-	crypt? ( app-crypt/qca:2[qt5] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
-	)
-	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( kde-frameworks/purpose:5 )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/okular/okular-17.12.2.ebuild b/kde-apps/okular/okular-17.12.2.ebuild
new file mode 100644
index 000000000000..4e89a23c7962
--- /dev/null
+++ b/kde-apps/okular/okular-17.12.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/freetype
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	chm? (
+		$(add_frameworks_dep khtml)
+		dev-libs/chmlib
+	)
+	crypt? ( app-crypt/qca:2[qt5] )
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		$(add_kdeapps_dep libkexiv2)
+		$(add_qt_dep qtgui 'gif,jpeg,png')
+	)
+	markdown? ( app-text/discount )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( $(add_frameworks_dep purpose '' 1.2.1) )
+	speech? ( $(add_qt_dep qtspeech) )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( $(add_frameworks_dep kimageformats) )
+	mobile? (
+		$(add_frameworks_dep kirigami)
+		$(add_qt_dep qtquickcontrols)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
+	use test || cmake_comment_add_subdirectory conf/autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package chm CHM)
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake-utils_use_find_package djvu DjVuLibre)
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package image-backend KF5KExiv2)
+		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake-utils_use_find_package mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package plucker JPEG)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest|parttest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index ed1041776b5b..cc8de4bdb5c1 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-17.08.3.tar.xz 1754620 BLAKE2B 00e5a8e1b6ae47e6ade7031e698798d1ef0c047de0d829c16006e0eed1c75d1efaf7ac97f1692b69321e5ef6f306a27a46e90cc5a642599483e6e458f1a41105 SHA512 da0c937a2a8bb57b9688744a645e504b7262dee4fb605ca7ee0f16d44f11eef182968127670cb45b5bf3148d958c24a6f548bd9882666675252a7f01f4e19fd6
-DIST palapeli-17.12.1.tar.xz 2061700 BLAKE2B 247e133547a2d9a0cbd114997371d14b248ae8aacd349024f6d4c2e62b3594813c30d70e2d8a142bb7b5b6032469d2993c67c324956967f65b4304ace3958747 SHA512 585c413db7389da0764f25142135f065bb3a02388ef1bae5b621d5b5ad2b6f82ecc7e1705fab64621992663b9c902eaa27f63630ff5a9432d48ae453d69b0b73
+DIST palapeli-17.12.2.tar.xz 2061580 BLAKE2B 1eee798013164529b2283ecd2c554d8b5a7856dab1ddc361a071c0b2e07511134738291b9802fb21fe52f323e04efa4bc411f6731e2e39fc8d0bf0c45764e671 SHA512 c3384a372e7601ddec4fa91e7c2e7a1496b0bd26b42fd6ad8ccc4e81de45018d75848a00dd55aaf3c5aad8499d1d4fe90ddb42cbd2c29a1a7bae777b2dea6ea3
 EBUILD palapeli-17.08.3.ebuild 351 BLAKE2B 2f79396ea246219ddb448443b941eca1cc29c8124b0e6ab413e827cada1f496b20c45d4b77a72387129c94c4927ce166674eea5bb70a7f2757732be561631c9a SHA512 1ffb3f9e7de14667ff7515ca2d1eb113aa88349eaf0ae24c0d93aa9233f1db155c108ed19a5535408cb7c2772c0a3df14e64048a319ba6be6bc2c7f49ca7d25f
-EBUILD palapeli-17.12.1.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
+EBUILD palapeli-17.12.2.ebuild 937 BLAKE2B 57aef5a7c39f7945679db1f5bca34bff7d08ee04adee1e14197de68ee3fe7ca07989c6e1267018404b418ae0ea6a4b29bc321c0aa14a17727c606ac6d0c5486f SHA512 ce341d56efa545e4ea7f4cf8e71fa17d77e39ab14cadc8e6941d20a2e8c800bfb7b0072847036eddb2b495d34be81738573ee4c428db2bcbc365f8bd919cc4c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-17.12.1.ebuild b/kde-apps/palapeli/palapeli-17.12.2.ebuild
index 40ee410a23a5..40ee410a23a5 100644
--- a/kde-apps/palapeli/palapeli-17.12.1.ebuild
+++ b/kde-apps/palapeli/palapeli-17.12.2.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index a7743291673f..61467f9ab88f 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-17.08.3.tar.xz 8825020 BLAKE2B 65c540658c65249a531013e8e8a9d73d3fc0eccc89e6c3bb897ea23ead16c34aec359e7fb113616a0fa6a544bfa039fc165ec68269cc541e527f823e09f6ac02 SHA512 1a46d20cb8146002812b0485bb74089fef5a46b38b804442ad77bf903b26cd41d27bb83d6513acc94d7a77a2686533baf758bf7d276cfb65dd545e53723ca156
-DIST parley-17.12.1.tar.xz 8827004 BLAKE2B 44c794ffd0df17fe4ba7176de23fd16aec61d164f75bc591da7b98f06c2f8aeaf0b96983338906bf3aab9009530190696c500e2d52d9d5518e5583b666e077eb SHA512 0f2fce5fa750ba32a6c48a6a0720d89d6401b818868e420f9c100b8ee48f5c8db28770d74144cc058dc8a38d9665c8528793f9b48b83863cacbeed7cfc13558d
+DIST parley-17.12.2.tar.xz 8826396 BLAKE2B 2f98a627f89f909b822cdb3a7a360f748c88105e59aac1cfdf02f91b929a3069f9780bee78c0b27e61306171a785988cf516c4ae6ad17600e7ed3991f05bb6df SHA512 d43c26d561babb3bd459ab43d8c623ee674ad51d2ee0bac900073015557bdf01643ad78b7006a9980f6a5b056b6cbb2e2d9715f9a76ad79a6e3f7130e7912fe1
 EBUILD parley-17.08.3.ebuild 1218 BLAKE2B 9fe973c99c68acafa6bb1b685809010982e1dde32d8108bccff029d97b2060516957b5789302f76a7eadbbbd103102aa583384955b95b7263e4e6505961a36ee SHA512 0b4c54f2dd237f57d5c878fca5b1b8ed137df8a39ff71427a4f3edff31047caea380bf91c068eb1b25bbba8818fc7be26798644c77fdbd2c4dd042b36cfb835e
-EBUILD parley-17.12.1.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
+EBUILD parley-17.12.2.ebuild 1257 BLAKE2B 094b00436dac68f3c5899f9f70f97433970eddf2d48ff34b90621f3777e77c60ff9b6d1785827dd9075e21bd50c7946bb15a6019d0d931cc519f75d0ae41f8de SHA512 68bf20bcc3ae12d15ab4b3297fc3760af9da33b09de58993db688bda01365301fe958063cb37a1935d3a89efa2fef82082b9f9450f9267e6a0c2377839ca4df3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-17.12.1.ebuild b/kde-apps/parley/parley-17.12.2.ebuild
index d059e01c325e..d059e01c325e 100644
--- a/kde-apps/parley/parley-17.12.1.ebuild
+++ b/kde-apps/parley/parley-17.12.2.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 4ff10824d00e..c0173261c1cc 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-17.08.3.tar.xz 1147820 BLAKE2B d7c6146962fcb980c1edd3abaca8621ba711d024cd95a83161dd8f5e3a11f62620f3bc43630f249ac6820f19396d4f166c90fd4f0c454051a57b2d309444a3d5 SHA512 b4d163d54e0d36c017e7a5ca6c62fedbcf1c6bbf9202abdf8a6c5e1f9c40fbb0994fc41fb16c21f84970fb7fb87d059ac639a6a6b92e62443d4879cf2103870f
-DIST picmi-17.12.1.tar.xz 1147432 BLAKE2B 2a9f7f8eb5e35f6c00cd16bc50b9436ca7008312687bb2f9f454f4e82b8098dda0e4fd85a11a78b0f3c9fb10c5d2ad37d6cc452730f480d1e30fb31d6e057e14 SHA512 8bf752f284768c2a7fdff630daf70ed6ae7157e5973e6ada4903fd867f9a1f10bd2f63f38ffe54b364b5ee5a3d642efab62586e817a3a74c7e8a7bc87bb3e705
+DIST picmi-17.12.2.tar.xz 1147620 BLAKE2B dfd46a7e850c55863fb62de5ee0719db0270870d336e7b82f0071dfbea88dfc0de0a7bd5c9b5716c5e210723dc6f90f32fced181ece77664ae53e46e44d39ad6 SHA512 c376719455c9516c227d130514a2032843e1cfb2a24480dce40f9cbc78ddccb21bfc38ee4150ed607cb3f34df7cd9372a80a4fadac608618b73f2a79c08c9fcf
 EBUILD picmi-17.08.3.ebuild 845 BLAKE2B a34d4f68e5335482b3898ba5f6f9c4ba82e7eb39e86f5c958edc11b6e74eacf56199e1cca8fe63612810446286b4846318703220eac9116dc286045eb1c3c2ef SHA512 17d77d3c770dcea52523d0368c4e7a560ca7f82049e0bc6a7fb0257b930d65063598f979b48b90019b813ad7d41638f293aac99e7fa26635a16722d90fde1711
-EBUILD picmi-17.12.1.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
+EBUILD picmi-17.12.2.ebuild 847 BLAKE2B dd6afeaa9bb3bce256d0cc34cef6ab1f47db8d08e1c79596373de2145614ec107b8fe477abed8966cbd836a25145fd77dbf0dda5e1a4ca4b39616d5f8019594f SHA512 07c00e401719efdc9e9be168aace9dc97521465cbc19b07268a776637f09ee403a58837221fb0bbe1631b02bd7d52a518a3d8110b7a3af09621bfc44094c43bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-17.12.1.ebuild b/kde-apps/picmi/picmi-17.12.2.ebuild
index c25ff58b234c..c25ff58b234c 100644
--- a/kde-apps/picmi/picmi-17.12.1.ebuild
+++ b/kde-apps/picmi/picmi-17.12.2.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index f24aaf12f5dc..8d910c7339c7 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-17.08.3.tar.xz 266964 BLAKE2B cbc5bf00939e6f89a694ddc611dd1f206b41ef9c376d70a4d85a4b71a48e80cebcc58309fbd7b490323f6dd7ec9af9bcf5e3f768fcb806b0271afba232d7579d SHA512 eb6f32d98c8aaee3393030ade6686fe6944dcef92ae530de1b8f980e4d5ffc2c543361bc3a988283b85ce70bd1902bb33a1575f1d6580da8cf0dcc2c141e34e7
-DIST pim-data-exporter-17.12.1.tar.xz 267468 BLAKE2B 112887cd75ef13f0d8bb52565905dd86554bd65693b8ce98739adf051e70d097b0784e931a010d175e6d077b3d42bbfd6ce0c23f133f74482c8262275eb97ae1 SHA512 a8e819da5c50e8fe86c8f989b3ec5fd1eb45f3581c90606dd4debd13a26815d44d7628f56db8977e8797e085261e7a539ac09db203647dd1f18bd16ddf3ba3cc
+DIST pim-data-exporter-17.12.2.tar.xz 267244 BLAKE2B 3a473d1e111b25fadcd97e350f104ce441efc55b3aa94e56453e9a34161f72d6c1024fb376fe67c8ccec5245c25bca1ba0e09139544f645428c5fdea2b214db4 SHA512 39cb22da75b35d9c5f50ff6f0aa77139305b106e44ac113839829874446412765afe9b07018f1e45a8214327bcd18da19d9dbdf127d83ed7651f3451cb580945
 EBUILD pim-data-exporter-17.08.3.ebuild 1233 BLAKE2B 039f076f046e711d86360b5d12ceb2c893e65a6420ae3a97dc59f1dc9caf12e42ebbeac268f766c8d1af5e0c4845b89fc0bd576e16a95a02d5b9e9e9be67a6ce SHA512 edb6d6e8b7fb3e43acb28cfdd7e590bf7c38bc3000c2d7d4c5faec5816211a656ed58f9016fb92bbca010278bee97bc1942f65706f4393416430785bc17ccd21
-EBUILD pim-data-exporter-17.12.1.ebuild 1235 BLAKE2B a3581139c6ca650da6c086d745b845a1973aa56aa8663b3569325feb2188070aad62a0f862d28450fcc30a2978ef711e52576ee69b2100d11abb2a35dd053188 SHA512 0e95b3206134934e093e6c33f3bc03b7facd86155affe5feefba6a7124be4d5ed2919ec5332edc336450b92bfaaa5b05d3fed61efa099e692f0f0e677782d810
+EBUILD pim-data-exporter-17.12.2.ebuild 1235 BLAKE2B a3581139c6ca650da6c086d745b845a1973aa56aa8663b3569325feb2188070aad62a0f862d28450fcc30a2978ef711e52576ee69b2100d11abb2a35dd053188 SHA512 0e95b3206134934e093e6c33f3bc03b7facd86155affe5feefba6a7124be4d5ed2919ec5332edc336450b92bfaaa5b05d3fed61efa099e692f0f0e677782d810
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.2.ebuild
index 35bc56084186..35bc56084186 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-17.12.1.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-17.12.2.ebuild
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index e5b2b59dbcaa..34b04d4ea428 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-17.08.3.tar.xz 444420 BLAKE2B fadd4e9b544c691f7d75e6f7c61b7d84ded866559f95f1e8353e532cbd2805515c4aa022a08c76f69e3ae0b41958cfed336e8088793d316e709f7de68abc7fc9 SHA512 521f8bc2bb23b28cf4d173ae6c4ce5222fb9b948fcc08e9982a345b18b4b56a9255739b5a7c56568f11a45bbbdbd6c92ed554ef24fe653dbe9a04df365439b5b
-DIST pim-sieve-editor-17.12.1.tar.xz 444628 BLAKE2B 067bbdce84ea55ad9126fe562858697c3529cb041b6cbed47dd40b466081146aa432699ea3eeb5507964f61fecaf2a96a7f431b2d0206a60e877d613e1e0054c SHA512 423b7d8169aa4853359d21061e82e0c97bea972599928123ffbe1c8fc8da0421f49808257f52a5cd2c25f87b2353870d2c39bd0a288f2b9981320492e2c7a1ac
+DIST pim-sieve-editor-17.12.2.tar.xz 444520 BLAKE2B 2473f06ea08d715a129d6cee9feda21f27358d6883e66487c87ee936eaf89581440dd17c49e64b151f55b548aa364a3226433a2f5471a2f576dbfca0d051a2d1 SHA512 586ed7554c8e4f0ef7e1ffdcf28f421dd4edad90b1b3ce8faf48e889625b93c78bb9595ec52191cde3a916223481eaf2615ab156c94cd9c82cbc968b4a92fdd3
 EBUILD pim-sieve-editor-17.08.3.ebuild 1147 BLAKE2B 2aaca75c1a107417b56248fdf734e49eb236c8713eb2a2e3798238798672f69da53b31f08c1f28da404d8906bb8457a9f0913d3db78aecd9a66eac78e580388d SHA512 3660b50e3b112e0119bf26232031d4b5b4b5dfb8ab6312725c6bbbf6e5136897a690e2cc641dbf0316b854bc838dfd6433454ee4a3c8e9a45b8a1714ac34a87b
-EBUILD pim-sieve-editor-17.12.1.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
+EBUILD pim-sieve-editor-17.12.2.ebuild 1149 BLAKE2B dd7bccd086023a6ae4577ce85173e664cdc9d70c380268355f772e00d45b106d6977f280414e90bb6b13900463469f48e35d00fab154eda674d6f4d99b0a6309 SHA512 2cc007e8ef84d2dddad22bba7ad9316b04e4d90b707d3d55f4d4cf74909bf66d0282c474a03975b28fe299f71b564053a6e4358670ea89ffd37a7b16f167141a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.2.ebuild
index 844361049fc3..844361049fc3 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.1.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.12.2.ebuild
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 8949ea6eb41a..1915815ad701 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,6 +1,6 @@
 AUX pimcommon-17.04.3-deps.patch 2275 BLAKE2B e7fae2bb57f660c853e5e3c6e37a0ccabeea2676c16e16822d40eb9d3b3a2581c8d5bd5464ab55bcad95b4b1e5bb00313a3c6b7ad68694b2bf17cec1bec89c27 SHA512 8e123d9e5e952503120b329d7f94e7fd09dd364eb3871580cb2d8c444626daff2a538a07577b90ba40ca7ee9204344614392ea76df4c92dea1a4daf39b3ac8ec
 DIST pimcommon-17.08.3.tar.xz 275848 BLAKE2B 9b0d60f9dcc427d7e83b39bc36204406fd0b5b6abf32c24364bb2e8f7a3b3bee7442eb8ae324bcd4f150249783daa44b79b40811396558029436978793c74c5c SHA512 f5de67a51ce69332e0d61c10d2baa97cd8b5128d4f4e48b0503191b9cab283fcf32b4e205be2ce360acb3a523cdfd6ae416264b718c633ef6a1603a939c55bd1
-DIST pimcommon-17.12.1.tar.xz 289220 BLAKE2B c4991d481464c726dfed6860f9a2c9939d97af2441dc73802c81801aa2bad74528d1aa56af53ff9e324fe8d6faa186f7492a3dd2763d41cff7ce9c7f5c6da552 SHA512 0eac9a905bae91a054f38aefbd012fe074ba42792f978791441aa44c3d3f380bdba8dd2e031a4583ba5bf8aa825c6696f29976ecc7c66f4201bc14e0e60280c8
+DIST pimcommon-17.12.2.tar.xz 287768 BLAKE2B 1ae6b830829259bff824aca564e432e6b863c2d67e01838b4ed88a065f015a86cd0a875cdc3d35baa08c1e8f3a697eac8756c043c213c04abd557a3cc318d455 SHA512 a997c22285188f58686bc0872c935a9d5fee97af5e0a7682724d7d5076d1807f7986244146a8ed9f964f5faf87d0404bd2783f8c30770a74f0a3a8ece2032af4
 EBUILD pimcommon-17.08.3.ebuild 1413 BLAKE2B 1ded71ba7b1a4e22a9a94325f70a2fce81012113b1d3c2828edc3d7d575ff7d4673bc75913723600147579b151121ac16e6ba5c31b1d0a59cc41f336b4e6e054 SHA512 d63ca2120c97d9df881a04ab8a9360aab220808f3c639ea101657b66065f71e3af009f8a44f6beb379ade2d4ace87d1e333a605e8618930b4ba1e0d871294ecd
-EBUILD pimcommon-17.12.1.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
+EBUILD pimcommon-17.12.2.ebuild 1461 BLAKE2B 1e9e2decb5d661e13a23511c10f3038fb4422cdf972f5b0367ddbb75ee2ab6e444f0380a8d1c1d5e40e4cab1b1a22a938d03abd2e2a94486a34cea90e3efbbbe SHA512 c220857379e90d1c470057b13b503679ca7f4c488765382990f72836b572a57ab0633a4c0498a1a6d0e221dc88428b14ddb0cb3fea387a3456945cfd49ed9ca1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-17.12.1.ebuild b/kde-apps/pimcommon/pimcommon-17.12.2.ebuild
index 6295115f9d17..6295115f9d17 100644
--- a/kde-apps/pimcommon/pimcommon-17.12.1.ebuild
+++ b/kde-apps/pimcommon/pimcommon-17.12.2.ebuild
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 2bc64e78df53..efad15589efc 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-17.08.3.ebuild 936 BLAKE2B db5856ec2ebf1204d125fb4dfbd1f57845f3ce1a00bf494456a9b657aa3dc20f38b12c1d0edfebb5e9a764a0b2d91c71eb05378dd30f646f0192289767630cff SHA512 ce5a8249c85e79140cf5d6f63c6cd7debcf56e431a552f9f3a618e056924582066def0bf33c68809b23a81551825b9a939066caedebc36c63782ad9d1b648049
-EBUILD plasma-telepathy-meta-17.12.1.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
+EBUILD plasma-telepathy-meta-17.12.2.ebuild 938 BLAKE2B 8db0a9c7f43f15bd87173c274bda17aaf9a8d608e761c786e023e580c3a0e2abbf9366744d6777b3a64fc5152b721b2af31356e7b906a28638c9cdc7755e6b59 SHA512 dc03d147befe8be681fdf9839bcca74e14c7aef11d6e6b371dfea235e57c9ade24245f1205f0119fc4210888a8bd74c487b275104803edba1243886a82db2124
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.2.ebuild
index c133533744d5..c133533744d5 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.1.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.12.2.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 99434df72eec..8ce2fff292fc 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-17.08.3.tar.xz 43032 BLAKE2B cc19cab7028e2e3a5f09f45a233164688f99e72e71be55d8da2639530a9528af6a459978009ef84777ad5e844ac1f887639d454f39a9bc1a5ac95dc3d23dcc07 SHA512 da3eb9910c7d8f7febff12a00001a66e1f82035fc05bef88551abff2d0b6d7d4050155189a5fd8c99c8db259306cca55244fea58d36ce167d0bcfd06ad4c49aa
-DIST poxml-17.12.1.tar.xz 42976 BLAKE2B f5fe951932080a8d14bbb4767ca977f530ca2ca37b4e834b08cf0443668f7b7fe2c50a389a1aa83c0cd53b1d77915efdb50437864cf20c667f4ae4c9957bcc03 SHA512 e3c1e42d82ede72222323367edc238741012b31ad96b6dfb56f1af7d21450c5866d016833592d31decce9a7b41324497bfac6e61a796590d05b9fa4f4391d679
+DIST poxml-17.12.2.tar.xz 43008 BLAKE2B de2b2633f977d3b808fff8f314c6fea3167732eace43ab294b539f9a9457609d260739593fa13805022051e59d2e7739270cfe8a72270575e16f1cb169fb3aba SHA512 5ff4d78640dc5025a22d3be96292f29f73d27fda08218c374fdb9b697c068b4fff3a639a400176778555819cfc3781b67fd4a7b86403d96d5d3c8e6ce55f271d
 EBUILD poxml-17.08.3.ebuild 340 BLAKE2B 2f34faaf802d8565d79ab99bda7da65cb461528dfcb09682f4fb30cdf0c7665443f8811bd28cd413a02b969febdc50c0fb0807c4a53afe3f0b90d937f4c64431 SHA512 89a7e6fbb07f68d9d359fe1c515bccd57867ae1231a8d84a43d19a6e4d3bba7407325429751e38547d24ca22da8240e4a05fe4f48639c8f1b04014e5560c45ef
-EBUILD poxml-17.12.1.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
+EBUILD poxml-17.12.2.ebuild 342 BLAKE2B da47dd0d971b37d1a80e6791ecf18d17aa4b051914edf17404219f16a3f944f1f139d44c97b0375cb6ba57b1ca059b3934df902105e4744f45b8a017dfea6a83 SHA512 8271762279435f773cc4b7565d1afaa4f4a731cbdb4fee1e4e46cf0bb990e7ba6b7ed78a7f5e6ca8cdd28e4c83ada388fc76f60c2cc9a04d9217b22ed2860946
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-17.12.1.ebuild b/kde-apps/poxml/poxml-17.12.2.ebuild
index 3c605a013f0f..3c605a013f0f 100644
--- a/kde-apps/poxml/poxml-17.12.1.ebuild
+++ b/kde-apps/poxml/poxml-17.12.2.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 243306cac1a5..4e8292a97e05 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-17.08.3.tar.xz 237084 BLAKE2B c85e6fb2e41cd2264fe33af6585363bea85bee57a8c42f85da6ed3a0b4972c8d1647dd4e4b10e42f8c0ba98ce9c7e93efbf90a938396341dac04782ca1272a2a SHA512 cb09762fc736a88c41850593b8c0d3ff1eb0f3308653a93ee1b370dd8a4b7d13de64fcea3b76f7407f430faf5d5cc2cc5a2a3c58dbd80f4c076af4a60788181c
-DIST print-manager-17.12.1.tar.xz 237224 BLAKE2B 11b51c9d3be44ed2f29a56f9044241ea22db127eacc4bc9ee10eb93d2c8cb84b977345658de134efb55d993392609ed1185bb61d144def0aa81578e2f41f8227 SHA512 30a69341067a62e3e955dc5d4e027fa9f99029f1ff8615c4af68e9b5647b0328e50ba3f11e208b1a333ef37208113534303d87a6b299af6c7c0cceedc689b35d
+DIST print-manager-17.12.2.tar.xz 237132 BLAKE2B 3b4169d5974f634eafdf6d5c8e3c90fd66f8248fa61dd71e77d21969987af54fe06f17d032dde463d93b8d23205e46fb5d85b1fa0cb17cbb967a025d3f8e672c SHA512 82e99d595c2e00e6d1f5f481039bd5482310002ac7851bd3d682e19e4a49432165a443d8614e026b83536543e55068ba0d15679ef0aa110223285536e62aa339
 EBUILD print-manager-17.08.3.ebuild 1439 BLAKE2B f6c37b90e2af505b9d3f9b403bff960685b933245330f3505ac0d86b24091dc511cf4aeda9ab0da96a49163e7f8748c614c0ce0f8bcb5c4b8cbe073a761e78d2 SHA512 5ee6409cc9a8a45cda02eb582e94755c026e4f6b9d3a8be15785ee5780420cd5c0a564069677d3ae556c1c893b627db104c1f39ec29afed91711c94d1dc075af
-EBUILD print-manager-17.12.1.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
+EBUILD print-manager-17.12.2.ebuild 1441 BLAKE2B ae4ce614d01293367cd277e0018874f25901aa90e82904701c3a4b90cc73ef96bf72d9b9804840c35a665f16ba5b5204cab1c82df2fbb45c23fde8a039907e97 SHA512 a47f846b9276a5b9116e2e76e595aba7688292440e7934f05f435c62009b6c6afa16d1212aa54f431db20e9c83f30579fda50fc801fb50af6df51a32edddc820
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-17.12.1.ebuild b/kde-apps/print-manager/print-manager-17.12.2.ebuild
index e59f9d37adbc..e59f9d37adbc 100644
--- a/kde-apps/print-manager/print-manager-17.12.1.ebuild
+++ b/kde-apps/print-manager/print-manager-17.12.2.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 90d300935074..55eceeca8b74 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-17.08.3.tar.xz 1534300 BLAKE2B c63592008f99f3135a61504b2cccf80e8933379717279dd37f9d9a2ceadd5281abd2be39715928d4aee5142c7d7fd3a6c456a143d2ec23c40cf5142d32288d01 SHA512 56d44bd74c4906c296e2ae213e3e3c1be0b2cd48f0be8b8774d4c8e074af0becc6747cce72d3d9dc4082d877a4dc2b49f91359a72d801ecf825cd1297d9117ea
-DIST rocs-17.12.1.tar.xz 1535504 BLAKE2B 415617e7b6b451c5185eb8c52176733ac92aec663979e93ea767c9b1f7018770af153e7c33bc1bb81af88779871204c286658ec0b4bc0635c7aacc6edece983a SHA512 e242c618cf03741c73f98235a26d7afeef64153445603176d340fe5f285e02c32ff30ac81ad0005b2735f97b69c519e2c2bc8f588f351b88202f7f9c0efef450
+DIST rocs-17.12.2.tar.xz 1529992 BLAKE2B bba4e222594b70dec65aeeedea4b771dc479d3ca1fdaad055e762887ae1c60f3c49ddea6a464353ae5677898a6e6eac9bde35f83b3669212a6b859f162554b65 SHA512 db1311f627a5fa77811379d02b23c947236dce6febd5a8d14ca24ee46a8b54255f1befe98043c70b785c7fe01a50d1d3c0cde271f724b57f2a2100b80bb6933d
 EBUILD rocs-17.08.3.ebuild 1159 BLAKE2B f32e3f0509a9ebfaedbb9e2b6f82d3f80d92c4443ddf81c334d55b34c7a55d4dab0777107fb5c4b4e68ecd178c1999a8b746674620310a62c9f657ce3c03ed61 SHA512 8985087ad7b20be5353ed0e0a06ea7dc929f26f4e7c2a7ea40e4f05b245033c17385a1dd83fa9981cce249202039521477e5a9a8b7da1b491b984c706b7af15d
-EBUILD rocs-17.12.1.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
+EBUILD rocs-17.12.2.ebuild 1161 BLAKE2B 30882ac451dd49a4fc551be55d678e659417d00bb10663b5a3607eb7dff79b270648dc53e61cab589505e6f6759b289ffc38bc779720de2877e386439aeb4ee5 SHA512 c98f2c0dba40578a6c1927dd3f5f6648c584e6798b834670314f7e668aef0c561d5ac5d082c186801f0caaef3630383618265f2e55dce777cefecc72ca1c91fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-17.12.1.ebuild b/kde-apps/rocs/rocs-17.12.2.ebuild
index e20797a7baff..e20797a7baff 100644
--- a/kde-apps/rocs/rocs-17.12.1.ebuild
+++ b/kde-apps/rocs/rocs-17.12.2.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index eb582d02c125..0340102aa7f1 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-17.08.3.tar.xz 10588 BLAKE2B 6613491a71ed33a4f08f5b40a32b58f46682b94e0c6f9f1e1423bdfe13a14c4459af588e55bd035ae7839edbe0ba91ccc04375f8599daed55096a5095e158335 SHA512 670247e5100608f136fc7cbfad63492ced712570bf314906d9b074f3c18d4b955a7ba82470d92fbdc944d956e5f008b1775d42d013800565cf2a35c7716f44df
-DIST signon-kwallet-extension-17.12.1.tar.xz 10576 BLAKE2B 24b20c5f2502d560b639a6268dd2f7fbfe22c9aa1ec2c0b414c30eff195d6991ac3535b8d630a5f2c4cab0e52a26add00a3f44c75c5d720f7662efb3a8c33600 SHA512 92fbc598f195944185a44839c5875077551f643c7bb0e6a4379c271fb46107f7f64e4b1a5627d2590fc5fe1acf51b3ae74e63cde76aa8a24ccfed9cf4c0df99e
+DIST signon-kwallet-extension-17.12.2.tar.xz 10580 BLAKE2B d0eef8b4e28675b565df9a71650c0c2fdfca8606728f8b9ca87876646ac0bfe68b4c2b50b9afeaadd42eb592ccebf3d8c35be389bd57ef4f5b1923c41ee4d11a SHA512 2bf51b52e934b30125ca02a5778308e4c7dbebf0d43dd813eb10793cc3a4f24f02a479a4dd7f458de6fb9633ee6f4d49237830cba91547ef6111461e2c515fcc
 EBUILD signon-kwallet-extension-17.08.3.ebuild 325 BLAKE2B f7ad614390afc5dfa92b14e026e72215935eaf9d32204fe0834b5836e0a43b488941e4548a836c557bcd5ce411815716d50a82a105c092abbe0f561004a82e9a SHA512 249122488ea0fc1e59507352c30860bcf3ff613dac32938e86f4b9add363d50eae4d8f401afafcc6df20fcf5eb6340d0ef36cbed954932b402539c7f4b63290c
-EBUILD signon-kwallet-extension-17.12.1.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
+EBUILD signon-kwallet-extension-17.12.2.ebuild 327 BLAKE2B 0a3f7e51e8e27cabcefeb6237fa06c72f2f57be9fa3c64d689589a2cd6526ef09997765b6cedd21e41d7f607f3e80b2f361fa6f4018595212f6a148708f724b9 SHA512 b61412c9e2dbf34b877161d5b6f49509fc9610ba7206a248bb5bb1dd66c3799aea371321fa528258490ca0ec93d34192ae4112fd37bd8ccd0895cbb7ef9e48bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.2.ebuild
index ce5d29586a9f..ce5d29586a9f 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.1.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.12.2.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 1939a35e4689..f21861f98947 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-17.08.3.tar.xz 667336 BLAKE2B 23af827a74263fac4b264531d903a636a0b31a0f72cb2c62f065518abb0e3f22d22a53e7600f557427a2033dd09343f36fe9f67b9f8fd21b18c06ee3ad003f89 SHA512 dc7a12bad8bf764736d4149a576f5af3119c18c19689247dd3a6cc87cfa38d92777bbe757e88b94f227fd80079c72f6e87c1b2664be80a3e4f40f8bc37dd71e0
-DIST spectacle-17.12.1.tar.xz 766320 BLAKE2B bf3f1a235b6885d8840762fda45962f7dfc83663e97f1eefab3fc0eb6b1c08ad6e13288e19a08e3c6e78e59f0bdd985bfcba52966072b2ab990599b97c5d3453 SHA512 41e04060481439321199b3710a71dcbe0cea3e11f26502d7e1cf0124c351710008420c6687dd4dcc78a0d78e2038326db4b15e7848fa07aadd911aac6dcb7a09
+DIST spectacle-17.12.2.tar.xz 764956 BLAKE2B 8f12a62f1499a3ba8a361b163795088fd4deb11090f47329604cb5a577e27678c61a015c2a33cf4add38ea63f23442bad15a26e559c08b524c375c0b323ea1a7 SHA512 b6725931831d0faa02e2f4f65b53be7d2a2e25fab48b785432540d89c2f3fd4134c86f647f60a51c757428db2ea88aee7174295b50c14c3a5bfeb97b478443f4
 EBUILD spectacle-17.08.3.ebuild 1327 BLAKE2B c3aeece5f9ed86b9e700a2e125274d681d33cc096588e01c2e3b89693c76f6c493c19ee65a60be4814d9fce2a07cc60ad972feb618d9eda62c5bd03a04c23f56 SHA512 12ba3d292b20858ad498111ba3d273f9ceac497809dd17654869cbfffcd2c77f7eddd2abcc4dcffc119968e889fabc65c5b1f31807a2f933d3d6d77305fb4af2
-EBUILD spectacle-17.12.1.ebuild 1329 BLAKE2B fe5bb7a96eb8034d26a79b5dd38e5979ceb3921fa6eaa9d1d729c31dab1a731cd7c5b0b1382f331b0a0e13bbbd097e207b978df151fb2280a98dba3b7c9d2959 SHA512 0efbfbde791dc5dc9fbc365c4fd5380e5465e8669ded0ce86bca701a1cc7d7aa414cf0737da74efd9387f2e8928f6ecbad33321dc0e0035fbaf5d90f1c909dbc
+EBUILD spectacle-17.12.2.ebuild 1334 BLAKE2B 9ad5fb46992bb3e3fe8076aad8b68ced44610dbf45e7356d469bc82e02dcebbef5aeb57d1a646b15f814035390c603dfc4be6b33f17be31b1d12bc73674e8233 SHA512 22a664c150b210f0b2be8fa87838743b4d2e5b242db79572aef08f15c106e4bc114cad8f334eb452ce570af84bef952465a531d1f50996851534af86363a562b
 MISC metadata.xml 435 BLAKE2B 87fdf17969c490793aec4f5d1a53c7becdbd7f3b5cba7da9405741ce3832d5e53dbdeba0b2f8e51b0a4340f2c267a0c3268967e67af4efb404a2ea7860e1084d SHA512 c8aee95e54da221bfc66214d1bcd15f4df2b723a6a9603b400f98ee81db8ef0973e06ce69b2679a4dfecb426e1cc96c5da1fcfe6d5954aeff327d57722047d23
diff --git a/kde-apps/spectacle/spectacle-17.12.1.ebuild b/kde-apps/spectacle/spectacle-17.12.1.ebuild
deleted file mode 100644
index 10e7f8bc1074..000000000000
--- a/kde-apps/spectacle/spectacle-17.12.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( kde-frameworks/purpose:5 )
-"
-RDEPEND="${DEPEND}
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!kde-apps/ksnapshot
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-17.12.2.ebuild b/kde-apps/spectacle/spectacle-17.12.2.ebuild
new file mode 100644
index 000000000000..cf8b419f4a56
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-17.12.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="kipi share"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	share? ( $(add_frameworks_dep purpose) )
+"
+RDEPEND="${DEPEND}
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!kde-apps/ksnapshot
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index daab1344a2a5..e051b01fcd0f 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-17.08.3.tar.xz 859888 BLAKE2B 2765d2fe006fec31eb147898b343ab6758a60a4895a36675bbf4365afe13ec9762eddef2fd15f86a102a28ca4afff2f8d785aa821dda134578099d1969f1fc79 SHA512 f97e28d9fca2aa9f039afb85218de8a38d1eb6b6b15416a269b9522dc485951a39eda75a7db668c6a589a6fe10ae7d117155955e580995d8a6839ba4cf98c1df
-DIST step-17.12.1.tar.xz 862548 BLAKE2B ddfc2e26ecc78ede7f28149ef7dff0a9aa3bd81026af66f2c47bfcc559f640e9dcbfbe52711a5e0cbed77e2da2e6d02e73993066c6caed0318e09b2b3de39b62 SHA512 83024225bbd84d1fa685c0d0b77f88567faa2893943db5a1f4ee1c81e1fd0d5fc658da7eb239eab64bc8cabbd89ca1dc2878637e325889d5a979cc4b9cc90eb3
+DIST step-17.12.2.tar.xz 862316 BLAKE2B bf80af65924ba90e091e45307b64ec0490cee11171a828892fba9568d5943f6b25469171359a131cf51f1f08cb93a321fe893c71f9daa9b94aa5812ddc2fb56c SHA512 025bdc9e3560feb93782a1462a3d2ed152ad9981194425de73fcaa26fbfae74a67016507ebe368776da27b1dda63863106567620e39ed82cc8e95e414f219616
 EBUILD step-17.08.3.ebuild 1578 BLAKE2B 6da5f49d27a7b57f400826c7630f1f5dcab0704043d4329fd8da49d67807e353a9b7ae52dbd799ff68563940fbe11d4eaaf0d89ce03a8fb207dd310f70c1d2c7 SHA512 bb9ace64783f78369dab6510ca4b4e4d8b9d83e7970edeca9211f9d0b1e14ddbb45d890ad81f9bf2e6522cca1609beb7cbcdcf3dde19d6150585f60decc4035b
-EBUILD step-17.12.1.ebuild 1580 BLAKE2B 2cda00ee46c13e85e50491834c3a38b6a5f66c52f2454b8f6500039aef38ea23eec026d6c5d95d32e99f7313df2f1947bab88f9d2a3ad5e903fb1af4bcf4988a SHA512 57828f84ba5476b3b3b106b319ce9939d9dee85f82e1bac9489acf86cbbe2b9874cb1fdce41e0e0b7c3fcba1c15ce1d1701497b03d4a08a1c3e7baa218be8c9b
+EBUILD step-17.12.2.ebuild 1580 BLAKE2B 2cda00ee46c13e85e50491834c3a38b6a5f66c52f2454b8f6500039aef38ea23eec026d6c5d95d32e99f7313df2f1947bab88f9d2a3ad5e903fb1af4bcf4988a SHA512 57828f84ba5476b3b3b106b319ce9939d9dee85f82e1bac9489acf86cbbe2b9874cb1fdce41e0e0b7c3fcba1c15ce1d1701497b03d4a08a1c3e7baa218be8c9b
 MISC metadata.xml 348 BLAKE2B e238f960586796416f3a60ab5c9fab8df0d88b79c76530be5243c3b2f4dedc98c87c343aae8e950a40a9876d75622fb6da96b6c697a3ff55fb6bede25fe160a5 SHA512 58a3225b3993d3bd5db5d5cc5b0660fd42034e593e8fb4d657f8e6ed86e4db57df66b99a6edafc6aebf356542edcb7516cd6fe70cda6b7c8ce9a002455531b70
diff --git a/kde-apps/step/step-17.12.1.ebuild b/kde-apps/step/step-17.12.2.ebuild
index ab8570cd5703..ab8570cd5703 100644
--- a/kde-apps/step/step-17.12.1.ebuild
+++ b/kde-apps/step/step-17.12.2.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index ec7940512122..85284dcd41a7 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-17.08.3.tar.xz 19052 BLAKE2B df37006bd0f1035debfcdeb2ee6435cdf9748121af13949e18b1e279ab6730d8c7fc26b8c85589b51de39a4ec8cc8d0dfddb90be3e2e87e8a4194e160fd512b9 SHA512 6f93bb911d708f1ece02df3b74e97af17947dbc5c6964733376561e1565fefaa3b79bd4bbc4669f8e1706d23acbf5b65148c8f0c971e801ab37769c5ee001225
-DIST svgpart-17.12.1.tar.xz 20840 BLAKE2B 32d3f81a6997d25dd9e3938a2d70d38fceb164b717f41c3ac3481b137c532535504254cfc730090d0759beb77731a36d362d3044bfa3c461da21651fadb6f58c SHA512 740f7f340a8325f84e730a617d9c364490abbdeb583cf6649e7b9e7401d5c17f745dbace5d5a355c5339e2fb5ba47328c0ad991b37d833a405638b2a05dbe612
+DIST svgpart-17.12.2.tar.xz 20820 BLAKE2B 409cc247c38f0277e0c4dc0a626d164be81afd5c9fe45f67c2d5f7cd29fa3c4c9bd31293abab051d19614809b12bcde755751ad8ea248f4475b3c8adb7349ad5 SHA512 4b68c0743152bd209615c72869431dd53e65d150ebbbcb0b5e3ca620fbf058f4a558d92602b3b73264b95a3c6f3fc3a57c953fbceb463d446aa1306309623043
 EBUILD svgpart-17.08.3.ebuild 499 BLAKE2B 997469de4ce1e1b87cf7115ce56b3aaea8629da12137ac331f65ce5430fddcae2b5f0f2013ff3aa3598cacbf982a735c5c0a0127ffe97ce33e53b53fb22d5b82 SHA512 6fa19803b89f3891be344f63f7732b1dc36d6d27f7ea1fa5dadafb9160b93690880b6d4bae49bee2c4751159d5335df0ab708b68638086c829f67e4770db8775
-EBUILD svgpart-17.12.1.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
+EBUILD svgpart-17.12.2.ebuild 501 BLAKE2B 23f8b66931dc752d8d102a23d5f27ab3901a0f6be8fb80607999e5956bc80616429fb494a003633b161c4e5bafd1929e41cd86442e8561349bed5a785842ae98 SHA512 ab3a934803b623bb17348ae70822fe73d96e04669e94a43d353e1890131d1104125d4ff7d19d20e9b58a79a99973a51e9165c95dd79e9eaed5bb1f15472d5c05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-17.12.1.ebuild b/kde-apps/svgpart/svgpart-17.12.2.ebuild
index a2929a955b58..a2929a955b58 100644
--- a/kde-apps/svgpart/svgpart-17.12.1.ebuild
+++ b/kde-apps/svgpart/svgpart-17.12.2.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 0e8729298bda..5d7907de41e3 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-17.08.3.tar.xz 82304 BLAKE2B 57abb646fcec3b56606643ed99a03acb221ff6612d5a80b023e14e0509904da217306f46dc218da8f4a893041bcde08266e26af093af5b354dbcbfb7b0822e02 SHA512 ded9922042294d2d9c1f5f7b07ce705075f674818b8e39a9af86dba2d74665db4c761363353d3aa007d9401bc664a9f0cf0b08026c82e585042b0bec415b0e05
-DIST sweeper-17.12.1.tar.xz 382556 BLAKE2B 29efe55d60cd6f094ac13f0278355e8cbdf4142d3814b33000135527bf2f743c617a0f9b0f7f8ba63335c14237bd1524f329f24ffb7b82f631184d781175d4dc SHA512 d48cf00076fc3d1508e4e63df5e0dc3c353a4d361a6817653a175e74486c33d7e65b1d026224c8bbc49fee0835394c216586872d20f4b58c2213bc246d8d336e
+DIST sweeper-17.12.2.tar.xz 382208 BLAKE2B 378dbe83e1c0c7096687b1d32c82de63ed90de8a6fbdea534fa60c312c00117d9b0d8154545862a02d0e82aaaa40375ca1186434747f93bf5c15336271c0dc87 SHA512 d01e1ac266ff17c4294b581bbe0c5413384b9a02dbfdee181da0509a4afec5260a30dcf557a8698690bad3515519ec4c8cc0f8708edb95d9923fad4ef4998db6
 EBUILD sweeper-17.08.3.ebuild 336 BLAKE2B ece528250c97c07d56c4713c890e5f6fd7a51213397656462ddcd4ce3aed83cb6b9e3456894b1c14dfc7ca1baccbdb1ff4f35aa044ec603ba0ab94b32c0d4b84 SHA512 09ca159c2e05012d0e9583826396b48127d6565fdf6e332cdc9f6f9ada3a1de132b41d8289cd9394b58163f727b814b5df5606b1164d835bccef16a44684bd1d
-EBUILD sweeper-17.12.1.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
+EBUILD sweeper-17.12.2.ebuild 882 BLAKE2B 19021a1432adcd1efcea32b0967f4ae8189734c615f54bfa602f42ccdc2ed5f0e089d89169d158f1f6cbe5ba7189233806d1afe4291a6b1a3f1444562c9daf4f SHA512 fbb82a22e966acd01aae418831169aa48c5bcbb7b160b0e8edbec8d91900f056ca8e89a40742f6465b03392fb90a8d231240782645699257960aa3e409325ded
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-17.12.1.ebuild b/kde-apps/sweeper/sweeper-17.12.2.ebuild
index 41e32c5dd330..41e32c5dd330 100644
--- a/kde-apps/sweeper/sweeper-17.12.1.ebuild
+++ b/kde-apps/sweeper/sweeper-17.12.2.ebuild
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index 9b14892b5912..153de9379e48 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-17.08.3.tar.xz 159968 BLAKE2B 13688fc7f72d737587fdfd6cf89b08724207c47ec1b1848f19fa4306e714f67e50ec11596fdffaaa3703b9ba834fb41fea5acecda56e73b789a0d69c09920876 SHA512 0a8b2e271d0518f44d6b93dc3304d922d67bc36104fa64fae663be8763f2b5be0a0720f7f39e2324593a1875eae1ccf384efc14ca55e10540889c43f86b75d4a
-DIST syndication-17.12.1.tar.xz 159844 BLAKE2B b7a78bf25614d3c1219f6c6959dd4fa1dcb6d3491539ba8520ce120d0ed84eca868696e79eada19b7f299640d4aa76fb335ecaa7ea8e45abfb75e2d5becf892a SHA512 a1cdf152d70c7e23bcd503dd50c2cba2098f70efa6a8dcc366da925ee2f604fb2a71d650ddfbcd79c9d748e89eeced9fd219e7b11a7f9db2740fd0d43af8f4ee
+DIST syndication-17.12.2.tar.xz 159796 BLAKE2B 265aac04480d51da5953a540e56baa34ce920d90f93b7d3ea766756ec843d98af71bd651c06b041d062ad01ec8163f5d39bd1b6febf8fe2d781fc14e3bfbc129 SHA512 cebd16b9f20960106c1361c2549727e03a6c907095584a90303c232ca1c01819a6e350807e96053677f8f34aecd6ad0ce856d01c7804519f89463236de53f211
 EBUILD syndication-17.08.3.ebuild 392 BLAKE2B 592727aa8067c9e9fbba95ea89ee43acf4e1b7eafbe90fdcbada867660b084604713f535f519fc2a09a5194d1f51b7a25a990dffdd5dc06362a50fac0dcd1d1a SHA512 3de11552de196c507dca3c61ff47bdf38b5dffddcfee4f5d38dcf214493750e2d25bd6eafc2929fdfd49cbda22272b281a86dae21928e25449a5ef62b2131220
-EBUILD syndication-17.12.1.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
+EBUILD syndication-17.12.2.ebuild 394 BLAKE2B ced8fdbdf1e87b6dc082522243b990771d532221ce7b79f17a2aa0781f107d0a7b36e6a582a8a19372219a83f3cec01bcc7a759558bf7bbe5c0b32ba273890eb SHA512 bf4cdaa30b49c0f364692c541a011dce1feebc900f8d2a45113338e0832a63d5ed42afca6f59c5e699d71fbb969728b164868ba60bc1927cb8acc615ee253388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/syndication/syndication-17.12.1.ebuild b/kde-apps/syndication/syndication-17.12.2.ebuild
index 3ee4afc41ebb..3ee4afc41ebb 100644
--- a/kde-apps/syndication/syndication-17.12.1.ebuild
+++ b/kde-apps/syndication/syndication-17.12.2.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index f74b6a4cdaba..24a4317cb5c3 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-17.08.3.tar.xz 41488 BLAKE2B 415204552ee63ca69d656d36b30daceaa53519c72cc923eede2dc77be12008d8338198d46a3a2da15e02790c72890321878e194c597daf8194a58229647f9b2f SHA512 25c533cfbf0e515fb8167143c724e877e4ed7a2100a1c0625cd53b10969a9127ae0b1f9e1a42abd076258525737a3862e7cc11bc31401551d9cdc5473c188485
-DIST kdegraphics-thumbnailers-17.12.1.tar.xz 41492 BLAKE2B f554c025f54250e586b960ba139270480a1a5801e261659e15be9f8c38165243e2dda6f465b79b7ab336e235a39b9b6c39c20e933d7f9d6ddb62c82b8b2159fb SHA512 d5ffba0def6dad6f36b2690c353947a4d6d34d94a27faef92ae45ea762b489ed863603a6dd6923a4918d26cdde0c0a796575394a277c644dbceeb4ca58c6895a
+DIST kdegraphics-thumbnailers-17.12.2.tar.xz 41616 BLAKE2B 3a5c4f4b9120bf34e0b79ad2995a82f976f3d53256c5348b724e9233140c4a053fcdb9c686c892170d79ccac8d04324279700535991372695c436f631293502c SHA512 0fdf3222fd833a5bb1290906885fc1d576207db0d80e9e7c9a561ed1453db6d783c4e0001f0437f618423f99678ba81d974ab8cef1e5aad5e03ab6f1b8e4fa62
 EBUILD thumbnailers-17.08.3.ebuild 610 BLAKE2B cce61c56fcf3b374112349e1d58685a312f8769e6d98efada349292246bd608f57a77ba76353b0c9e2b7aeea9cda55bda433461db9e19a4d42a29074d0294cee SHA512 53a5fa9467b42ef4d1ffd746dd773ecbc6c373a834090f997cfb4029a266650fc11afdc65f8969dc1901c77a7ff9ac88447f82ee3b81178f31a407cc48765353
-EBUILD thumbnailers-17.12.1.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
+EBUILD thumbnailers-17.12.2.ebuild 612 BLAKE2B cb2d75bcd8a1a07288e7c3d4776dba4883079527d0f38e8f147fea9eafefdf657b3fcef66124d46bc58405655839d2127d67d0fb6f84955508158769cd13197d SHA512 4d1dceb5d12f96997ee5df7a2c55f408e230ff232cb5cb05a5eecda7efcabd296fbf83a02c6b3783346dba31844816b350cbb17d612af150ed1172020c4d740c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-17.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-17.12.2.ebuild
index ff1362dbc75b..ff1362dbc75b 100644
--- a/kde-apps/thumbnailers/thumbnailers-17.12.1.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-17.12.2.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 4a1c615b0597..36e556af7826 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-17.08.3.tar.xz 2937664 BLAKE2B 66e814ca8d581e9024a370da0823171373bc52798328e46ac2cdad5cff7b84a10d78eecaf057caba4c254fe58be33960819cbfcd4064c35ce83eb417b85e5199 SHA512 e4574cd6134c080ff5bf49b2c6d1a7e617c2e12b8c5b969cb0dfcec884527371689606274ba5c4be3e9dd6ef2345b05b6411b05bba9c1eee3625ee5322b8c4ad
-DIST umbrello-17.12.1.tar.xz 2962712 BLAKE2B f34022f1e20022ba07c57c9198b0f023784d99a330155a13ff391e1350b87364bd17205fecd3ae2f19781edd24ebb96c0cb6a8b8e5fb3877574026b6d5ff576c SHA512 9c229f6c757876b74cd471fbc92d1faf049fe97ab1029b258e3908e6549708aaea6a3c0ef4f07d01e5e00ecaa55393756fae9dde83ca1e68d9d04179187da63f
+DIST umbrello-17.12.2.tar.xz 2961536 BLAKE2B c8f537298695d50cdaf0687954f1d19dc37a58d984121b48c2bca906c021ae09412fa7d7af59a5c4179bbce0179372fe9f693395b7d73733a03d9858e678612b SHA512 1ad128a798b429c3ccfaac2e754d57b3df9d62a697f43a0397f7f26958036a78e9a07d0bc62d923b3af39bcc97f830a88149e2505fcc0c36404a12190806254d
 EBUILD umbrello-17.08.3.ebuild 1372 BLAKE2B 9d8fbfd40bd45668f6d95534cfdd91593df59c66b0686fa9469eff9013beabc3e7789ffd1191d167c4502cba10ebda21760e73a0ae03f248747b253dd081988d SHA512 90443fe7edc0806a0399b5239ba18c24d433627f38239abac1dfd0b972ddb4ab22644e40b79e02d4f8ed4135c376d1485171fc1ba7e36b5266a6e3460a6fb369
-EBUILD umbrello-17.12.1.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
+EBUILD umbrello-17.12.2.ebuild 1374 BLAKE2B 1141ee3a928cd4bb47b90c7352cd7b0b9a9ecd4e90ee0765d37b0c66844cd4c2572076de1aa6a5c5b043885f236525466996341ad0ea84431442be851226ff7c SHA512 c6cde8863f1bed8e4bd142095799e9b4c4aa3392a1baa7dbc25707158e429218f270d20a3866c6c31ff5e50e352800b00bdeebcfba5c2eaea3f5507796dd298e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-17.12.1.ebuild b/kde-apps/umbrello/umbrello-17.12.2.ebuild
index 7b9d3d5c2d81..7b9d3d5c2d81 100644
--- a/kde-apps/umbrello/umbrello-17.12.1.ebuild
+++ b/kde-apps/umbrello/umbrello-17.12.2.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 937bdabb98f7..14ead287f545 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-17.08.3.tar.xz 25964 BLAKE2B c73a544bb78b5223e187748a32c95dbf4020d00f876154a3381b28da4de2fd36107ccf5d9d5569ef02ba29b12438efd30ea548ded1b361f7c9a8075b26e2d067 SHA512 4027a8a6d4507c5a3d2167aec2fbb44ff4227990d04ab42888dc6c3458971314e31961ea13e43d6bed7a584eda112591d7a940a45258d92c2491e9eff9c5d1ae
-DIST zeroconf-ioslave-17.12.1.tar.xz 38604 BLAKE2B 86d06b1cad1f6f9a23b489656fd625fe470e0b683989181057e3dc475ceaff0cae26bef9381f55283ba2a79b656f1364502e079904b9a3d9ba949a7ca407292d SHA512 e01ba99adf278838b857378eed276a4e2f86a1b34c1f1ba50e4da62b2109ed23209c2251110cf4eeb3347c219339384da4d66e4e67c99e4fa26d22f4c7f7ff0e
+DIST zeroconf-ioslave-17.12.2.tar.xz 38580 BLAKE2B a7fd663f99c63d46e3decfa09a989e76dbc814a61d376aea84d9df74afa0f8f59a2f98dcccdc5b35b0bd46f8733d6afb9a25bfc0807af4dbd9469c4840f9529b SHA512 37a2d3b0efcb856a1916d9274ab2d25e02de479230cf54709ca7c50ae18479c9b26e549afce8664bb95319091c6fece661a88c1c13a77183ae29ca2ec3d2b72c
 EBUILD zeroconf-ioslave-17.08.3.ebuild 260 BLAKE2B 41d12dbd8101dde5b8c08942e968db26f36470638e2c4b47a22c8b982fde24c76edc7e7b304af507bce08cf78249951f63c8ee49cc317889805c8d2e0fe225ac SHA512 026e2d5ba45c46f647835da0d8fc539fa7c1b9c8bc17384ff0b49ef75f6bee4d21da012891fc236be6576b469129c8d6270391b37b4769010b0858cab61ce129
-EBUILD zeroconf-ioslave-17.12.1.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
+EBUILD zeroconf-ioslave-17.12.2.ebuild 482 BLAKE2B 982c5e9af2f7868325b995b89bbccd8126357095be79b1fcf8164e22139ba36dd4c865e9f1faccf53138db60049162185c954060ccc5006f1d307d7bdf2da67c SHA512 af3773c381108def72974d02c96fa175a5fb5c132a812d333a277ab2b1b6510b119a06b0ad87e7fc82c24cfea3200ff246dc65577c0c74ebd3bb58f803a7f97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.2.ebuild
index 9b485d5e9478..9b485d5e9478 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.1.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.12.2.ebuild
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index cb90593f1ecb..8346b9307b42 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index ec00de516370..32f20c7795fc 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.40.0.tar.xz 60612 BLAKE2B c9b251b01ed6215f5f16be2956cde75b1cc09632d7072b5d38ec1a983d13777d6a1e67df5fb171849f8596134e385b22508d37dd63ecc8be0fdef74fb6db1ad3 SHA512 860a33820f3ad44b079bbd1c72a5dd751bb7b23ac26f729a72241dac5167fa63f43c9184c07494036ae2a0a39819afd24094c18c18fbc330e9b3679c1eaca5ff
-DIST attica-5.42.0.tar.xz 60488 BLAKE2B 386306540ba33716e9ec241285d7156fa8b391e9e6e88a95c1b11f7faf232493125f1cff9aea93160885735dea6021e5c0fbd9e2169546406285e1a6e0b4a3bb SHA512 289fa868e0c79b2075d1c60472fcab21315cf5fb1ae48b28475a13492967fdef38a25f037ff63e4e66bd18da7bf1f618a4a838d36fbe6b47523a4c58d46a017e
+DIST attica-5.43.0.tar.xz 60480 BLAKE2B dd6ebebd56d83a494099b7c6f91b1de3b92752a536a01007aed399a22a3d6e60a31c7807475cd76658f0d0ad069467b826c80b2d6ffe0d717db512aa67567627 SHA512 1584c7f121c4e5092e1f694d0ebed1ac2b31a3a7ce5ee9330ee00852a470266011d3e076da3174b3f37207aad93dd2070fcee9384e466afe202d8e5175fb81e1
 EBUILD attica-5.40.0.ebuild 321 BLAKE2B 1b2d7f4a25ee2c7ba7388f2a9e53755e1c7bdec090e13af8759133c7cac582c1f7b51c6365945d739e7aed6ab97ec703d30079944a84aa4a97dad33938322576 SHA512 d3cd744fbe3bc24974c8093c97e19067f8e95f4f1991b56a79593a7cc6d0e7eaf67a91cae6b156feb152c7b7b0acd06d95beac505f75f94629a9ab5636ded24b
-EBUILD attica-5.42.0.ebuild 323 BLAKE2B 10d24bfc3130b477b0a80f9310fe263d355a874013d0b340ee7a1c4ca6dac9aa21f26148a0e7b391d510906d4877d8774dc1cca7ccf3f127cdb529863496f9a7 SHA512 798f06b78cdc2d373579ec994fbcab32b33560ed7674412ca4039c0d39ac337d9d5c74f2e47b0337bdfa71aa0f0288518fd5ea110225f01c8f2af424164df856
+EBUILD attica-5.43.0.ebuild 323 BLAKE2B 10d24bfc3130b477b0a80f9310fe263d355a874013d0b340ee7a1c4ca6dac9aa21f26148a0e7b391d510906d4877d8774dc1cca7ccf3f127cdb529863496f9a7 SHA512 798f06b78cdc2d373579ec994fbcab32b33560ed7674412ca4039c0d39ac337d9d5c74f2e47b0337bdfa71aa0f0288518fd5ea110225f01c8f2af424164df856
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.42.0.ebuild b/kde-frameworks/attica/attica-5.43.0.ebuild
index d88c4abe8dfe..d88c4abe8dfe 100644
--- a/kde-frameworks/attica/attica-5.42.0.ebuild
+++ b/kde-frameworks/attica/attica-5.43.0.ebuild
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index c70f886e81c5..7334464ed10a 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.40.0.tar.xz 198976 BLAKE2B 55411bca6ad06e4267f7421a3f75b62bf144bba51e4198127a393d19b86bff8b4bdcdd3634cc0b37d93f18d2eaebdf2c21d3af297878fe7fd2a9614a70fbe86e SHA512 5853246ac632ef6e528956d35e4b0a0321dd62e266e6e7f4f6c3be2ef1650191dacd248cfdc1b7cdc35f6d6eb0e4cb763a8336d5bde9329fbb27ca4f2a0b7e50
-DIST baloo-5.42.0.tar.xz 200144 BLAKE2B 86d0baeea0abd88996296896ed9add8cbcbd4022580a6c50ebf703664e0aab65b134d5a123c2e5137710ea6d2d8bbfe852bb3362aff78fce01462141e4dd4172 SHA512 a21b9e09f07b296049fe46a00ca22628cb7148e1619aa6575304100f3abb2622eedada6d64712bae484995c623db5d0dedb775667c127b6edd82c4558701ea08
+DIST baloo-5.43.0.tar.xz 207280 BLAKE2B 3ab5b9045e5784ad7cc3ee1c65d29cde410eeb73c81d81d42328986b577603f36f09206a1df5f4bdedd5ac2804fb73c951950124a8ea6eb068fde86ca5c19cb9 SHA512 918d615adc07ee71414eabe15cd18f3cfee264c206cbef32f6807cff2eac701a58ae7eebb087e618e9bc7741ad8409514af8361e216ff68b07b65dd0da0a802a
 EBUILD baloo-5.40.0.ebuild 789 BLAKE2B f5f0304711b345756b52826f5756c9474926b4251380cac610c5de612cd20e625610c45d08ce3e4ba2c873d636b8fec6300c51a70ac544378158a1a6e3a5d7f9 SHA512 222be451e522aac82c5c85d6b5a52b50f0f8505427b30e73cdda35085d0b2574d7f7a0f2f004ead91f5167f7f37ac93025a0dc3e5f173680df1bf42ff6e71ea1
-EBUILD baloo-5.42.0.ebuild 791 BLAKE2B 396c35df159caf113dce902dc0a252afab6e6661c537c1cbdcbc451e7df32656e246b540cd93f1587dec60dd0e4c0e5c0c71fba932f133291460877cbeeb827e SHA512 2ff91122affc58c8a014d332e685ec93f8ba6d8cfd80dda43c0c35b0e11b0e5972666cdb2ff359c7535188e0aa51c7ac695d705e6a2d529645aaeb98f47b030b
+EBUILD baloo-5.43.0.ebuild 791 BLAKE2B 396c35df159caf113dce902dc0a252afab6e6661c537c1cbdcbc451e7df32656e246b540cd93f1587dec60dd0e4c0e5c0c71fba932f133291460877cbeeb827e SHA512 2ff91122affc58c8a014d332e685ec93f8ba6d8cfd80dda43c0c35b0e11b0e5972666cdb2ff359c7535188e0aa51c7ac695d705e6a2d529645aaeb98f47b030b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.42.0.ebuild b/kde-frameworks/baloo/baloo-5.43.0.ebuild
index 564ee8abea0d..564ee8abea0d 100644
--- a/kde-frameworks/baloo/baloo-5.42.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.43.0.ebuild
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index b4bd9d8eced7..2ef55dfd043d 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.40.0.tar.xz 75084 BLAKE2B abc377c66b04f509e8566554e35333f4a55c68d5ef623e29473d77a1ee564de340d7b434fafe634c8e9f15b86c5b8456533915d960630eeace4761b38a0093f1 SHA512 72743afb56b9d393b9ef6d03c42869a416feca3f543ef6d8b6aef9be23203fe8d28a2371d9d79a3a2ebb6e48a2ddce63b7010dfe736c8e3e4e706be84d12a09e
-DIST bluez-qt-5.42.0.tar.xz 74940 BLAKE2B 761614821e0de988be54ed954e9f133fca751e3edb67a393c790ceed61b35c48f69a73f2bee7d315c9f5dd68c8e83e3706bc227e40a2eacef32a0a0d7943be53 SHA512 86f5ff8ae56f1846ea969b8769ed458db3140fec887659a4dbaaca500914b8c8997a943997ab041b44d87221b45b4e4429defd0a64b3910eade87aafa84ad79e
+DIST bluez-qt-5.43.0.tar.xz 74944 BLAKE2B abd1efa02801b8a2cf90a28224a340c4ce58911cebfd90a5285b19db7812b755049ae6dcaa41e4a86133e64ba5d0cbde4c7317ef49a86cd114b742296f0d5c1b SHA512 0c1105f167ddcbc0f398a8f48b68c45f7f36520abf400dbe01ded84151e6553f24cbc4a660db8999fc4c16b018873ec2b0a4c4b21e01dfb3851f64e7a6806cbd
 EBUILD bluez-qt-5.40.0.ebuild 557 BLAKE2B a29e1bf9ab9514b61973235de668eab23b06e9ded36df13fb15995c50435e38534fe5f777c5a684aad87c63af4c7efbc97a7529990612fdf495ae20864350b19 SHA512 440464ca9784f727869bf542c07405f3e4ea016b15ca8861395f07b682e17e2be80e2a936252c76e3ed9ca0b6903598930c8c122277c24c926091df7fa33dc88
-EBUILD bluez-qt-5.42.0.ebuild 559 BLAKE2B 09d6e4ca6a265de4ae4f04abad0fde059ce6e656acd57c8640e14cfa82d72056e4ed924ea103f5d0872d60b97f5c11f5cbe618a39b484eb92fc01c5c3942a688 SHA512 246d327d235bf3d896bc14dee45889655eb841a30954373927d900a058b8f327def4aecd1dd7357e0f80f4cf11c684f77ed7c8d6a1f78238198e4b97eaa522fe
+EBUILD bluez-qt-5.43.0.ebuild 559 BLAKE2B 09d6e4ca6a265de4ae4f04abad0fde059ce6e656acd57c8640e14cfa82d72056e4ed924ea103f5d0872d60b97f5c11f5cbe618a39b484eb92fc01c5c3942a688 SHA512 246d327d235bf3d896bc14dee45889655eb841a30954373927d900a058b8f327def4aecd1dd7357e0f80f4cf11c684f77ed7c8d6a1f78238198e4b97eaa522fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.42.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild
index adc7a124e0af..adc7a124e0af 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.42.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.43.0.ebuild
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 0cfa6c574514..037460e5311c 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
-DIST breeze-icons-5.42.0.tar.xz 1521352 BLAKE2B 2d899ed0f87ad54174170794813dc8de8295b816f0409375719c3b8fdc55ddcb1d252ff48a4bee9f1a12458ffca6ea8645e758bef0d2a98dd8a68da8208bee10 SHA512 344234615c96a865a37f662c0f197ff0953f80a06666166e3580e3afead0fe4976ddfe5e3dbe0467bc89faac12c699b4b8a9e003bd16e849a85357da32c35890
+DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 EBUILD breeze-icons-rcc-5.40.0.ebuild 569 BLAKE2B 021e75b3b73378fa68c0faff0d7a05334e452fc47fe36d261cc67a82061600e622c787a1483d6418612923ca6997e19c8ce9bd429f27da287f79df6d39a993f1 SHA512 78339e09171f24f36b2080b5495fc6dcab066b1e299654c9f0d050192ac31ee047b66e05a92b94ae95f94f08eb55c63353ec84b9e150847a12744cebe6093552
-EBUILD breeze-icons-rcc-5.42.0.ebuild 590 BLAKE2B ef41e44fabb258f55cf012e8531820e3843debf8d21fd47ca41979481f183dc95e6892f1acdddb1f1465c4c2da4fce5e08974d2ea69cbd1443265ee6efd09eae SHA512 c66103bbd26a5ee5760ee6651cd805806f8d83e2f3cdc13f5ec887266398baaf7b5f2356e1e7dee0596d01110956a4b375eb3304af068cd07ce8ea2b2d9ea9b6
+EBUILD breeze-icons-rcc-5.43.0.ebuild 571 BLAKE2B 478ba0537ce2a381e9fe24e461525419e8aa35b11b79d250848094bb5c06441b332139827e8521235f70fa524bd256a5d8f8863f45dbad2618a47e469d10cd2f SHA512 3ae8d5969305e5e99256102a67d41571bfab241166a1e707a40b6f0502f1154b01d12e006b2b8c04948fc742a85e74a663cd7e35fafef8886e9c15b3793e97c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild
deleted file mode 100644
index 5b60e3013816..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KMNAME="breeze-icons"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild
new file mode 100644
index 000000000000..93736a98856c
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.43.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KMNAME="breeze-icons"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 5d7c5bcab685..ef74295c245d 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
-DIST breeze-icons-5.42.0.tar.xz 1521352 BLAKE2B 2d899ed0f87ad54174170794813dc8de8295b816f0409375719c3b8fdc55ddcb1d252ff48a4bee9f1a12458ffca6ea8645e758bef0d2a98dd8a68da8208bee10 SHA512 344234615c96a865a37f662c0f197ff0953f80a06666166e3580e3afead0fe4976ddfe5e3dbe0467bc89faac12c699b4b8a9e003bd16e849a85357da32c35890
+DIST breeze-icons-5.43.0.tar.xz 1526628 BLAKE2B 230a91698dd2ce00e19cb4fa374c3a173559c09d35de287c21d19d2b6ef1f7b49e2964460d2b27574cec5d7b959da5334f6bc2ea3cb90f6e9b20a2c28d4ce72e SHA512 ebc090a41c9377152ac99352bcd096e59932fbd9f4e4717cd652c0abce122c0812f18bb62f76b3321f774da8bb3a89f8287d23f2a36d3f3b4ac3c083aa402c78
 EBUILD breeze-icons-5.40.0.ebuild 518 BLAKE2B 087b62c6ce19fbf2843c8d3792f612c431dcf528cd2b9da16118e4194d96748b3e21e7ec2a55eb6395d0b915c3fc25e026d4469910075b3340c2a75c03789e11 SHA512 249ffcf270b91df18a0a027f29d879bf0f47f5d76b4855081cfc41032f8b18d678490448bfc1b9f6d8b9938c70dc71a2e02f6afbd23f89f40d1fa4246e56b485
-EBUILD breeze-icons-5.42.0.ebuild 539 BLAKE2B 438c03ff8e7ad285948c8e0d04f0c6e6f85f9df2c4025743f04568dc3cebb4a34c3f83ca162600e03236e9d15cda4e798aa632b86728e911c394d74e0f0d5abd SHA512 7bccf3175fc52547da6fa58d89bf31885665fd5ebb8b1406f6b77e3632d418d558089786dd8da133a0abae6a47ea739b6b60a9773377aa55a7444862bc6b58b0
+EBUILD breeze-icons-5.43.0.ebuild 520 BLAKE2B 28fccdc501d57456712777ee0fc16c28e55fe25926fa03a110690bda6e1741b687df71a887796fa5245f16f7698b66ff1f6d51c6fdd0fcd08e763cd7f446d21b SHA512 baddb289a6fef59de8c062915a1bbadb88d1a582c0ce8ae9d35cebb531191dc8108298dc81794a6d66ee1fc9f5f114dfc0fcb5ac2ab4028bab9bb719d636ee35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild
deleted file mode 100644
index 04a8cc8f202b..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild
new file mode 100644
index 000000000000..f35c78d7beb2
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.43.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index b5bb0d371fd3..e85efa14250f 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
 AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 2734 BLAKE2B 8ca74b3886fec8d18874a50eb82a170d3610f49d449ef53956f58b91a67c0a115de90c86776110f8d19d53929e42a80f5d986608c11bc1816ed3719dbd2238f8 SHA512 132d1b6d4af195ddd8bbeb1b3a084ae7838dfede85fabea9d70385b8abd41d1b76569c9d94eece8bcbfb7a1b047b4dd6a86fa29a61534d71c4b9b4dab0a271f9
 DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c
-DIST extra-cmake-modules-5.42.0.tar.xz 313692 BLAKE2B 1758744fc97bc47ff4cb6f9cc1838843b2de53f687d768ea34feb66d057d97403f354483bacfd829e3e974252c1478902ac201be35e8a6c52de7abf81108bad3 SHA512 43bc1afb0bdb5fc74771e9ea30479995c43d7b74c7469c4d4e04303e209cfc1982834d085c6f4586271761832892fb0b3cb8e0723c332d01e544a4cd26e21e14
+DIST extra-cmake-modules-5.43.0.tar.xz 314064 BLAKE2B b1866e66c2d12d450aada3f5dca86bf1638906cb3f4a2aa36dea43d3d0b2edde5cba85caa6ca7e0f6bd007733db16f88c2108103b588d637f1001f711037561b SHA512 fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5
 EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1319 BLAKE2B 51f4dd46c267d65f194eb8608bb7fd3fb7762827826bbe7bf9c1dc451d9b451ce4498c68cccdc714d8e47861d4e54728a401c3c40e206d69162c169849da9ef5 SHA512 8c227a7e9ec6085e03e6249c4397389320b5d054538f833194ed2a20d886b5b5c57dc70a62ffc4c4e70aed46c881c1c971e19454c16ac119eca3fc15f2b1b300
-EBUILD extra-cmake-modules-5.42.0-r1.ebuild 1332 BLAKE2B e2ed1fa7566b9e171471d58449598ffc9bca186d09da0ff6763eadda6023d1e52ea92345009f8ccfe834628a650432ad0d243608b4815908f8cffd4bc2feb0d2 SHA512 4e379286cd6fa455232d85395218f826f00293ee8840e04aaacefa975aa1ef12b973b92e34ab9b507216129ff6035fb63fec808f826f34239dd00e949d2c3ccb
+EBUILD extra-cmake-modules-5.43.0.ebuild 1267 BLAKE2B 16cc49f1d8f9e322683fb43069d04b185d90153f165c3ba73e20956d20765932f17262f5147618c968536b1614e5bf2ecb1d121d0ff6d06ef67114472d892e66 SHA512 28b6f6101dd030d122ab97bd4b2da8f22bff631a4ca44245e05e667cd5d4bc1ff11f5ab90e46f2e96c06b6e9de43dc3253ca455d4efc122417d599c56cc9063b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild
deleted file mode 100644
index fb96d8450171..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-	test? (
-		$(add_qt_dep qtcore)
-		$(add_qt_dep linguist-tools)
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" )
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	local myctestargs=(
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
new file mode 100644
index 000000000000..8b14f01dc797
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild
@@ -0,0 +1,61 @@
+# 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} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HTML_DOCS="$(usex doc)"
+		-DBUILD_MAN_DOCS="$(usex doc)"
+		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	local myctestargs=(
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 7c0e8f409999..eb442890bcb3 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.40.0.tar.xz 1752732 BLAKE2B 8c5e10a9a295ec89092fcba9fbc6ecaa715fdb5a681e351ef46ce23e6600b665b3d46047774e325c642cdc7de950a2dc32a06e4bdb1f417c8791ae0dfadf8231 SHA512 2ef108ca6738c4f9f9d164bd79449a4baaf9d343916f9fad98925ea0bb1ac5bed57fbe239f2ae8d1ab8ecf251dc3329e7e96ce0f9c55e607d0bbf5c59c697e28
-DIST frameworkintegration-5.42.0.tar.xz 1752732 BLAKE2B 7258ee2012f54a988c0af752c35420aade3983b6be05472a8a5d6500e352a3ab17b087ee93df9ba638d7180bd82be980d265f9c35c5f3befb904d5200b2595e7 SHA512 15e3b69910bc57ecad4d7287ffeb3108b421e7e931fad0fe02d4250ff55c6a4aead886f42fa5f03bf9c314900cad37dd61cf5cef65e1a90dbd0fe3be6330b936
+DIST frameworkintegration-5.43.0.tar.xz 1753176 BLAKE2B bb25f629cf5f7c27f452a958dff06b3cb099c84e5e45188cc99dd1cea125814a995db7b8f0356a3c4712d56038e7c319c453db116add146d4894617db7ee2b72 SHA512 f313fc3c0e16f877312f0c8e64e28c9368ef93fdafde1d6d3fa4f972290643139cdeb6a7376b57596042e4aaae0a87c9c9dad68ae895cb227d709a58ecbe7960
 EBUILD frameworkintegration-5.40.0.ebuild 1140 BLAKE2B e0f9e9e7ebc73cfdfecb098fe22d76b60a59102cf1b217d694b4af91d0f6a69bbb092b2be1fccc88ad575236df8234820899eccb8a1bfe606d6353294f7822a0 SHA512 fb8a890782dce345ea7ea6d4346daa795c336069eed1d39425285521d2f847dc79ebdda94da4fb115e91c9c58b1f9bf53a883101f639d8d89f170f4da548fd31
-EBUILD frameworkintegration-5.42.0.ebuild 1142 BLAKE2B d528803f92a758bf3cd512ad02471faf883616675e29874fa60b03da085657f2b788043d97fa786cd64a9c775e90ded45ee880ac2dc1edb77b71e518c669ff9c SHA512 1d19ead18ddc1907524740ce2c7f685b2ed8dbf8c12a25c5a1b5df426c93df013702a44e0d36f09d998fb28d35e8e417ab54ffc9407e385548a8a32082a94cfb
+EBUILD frameworkintegration-5.43.0.ebuild 1142 BLAKE2B d528803f92a758bf3cd512ad02471faf883616675e29874fa60b03da085657f2b788043d97fa786cd64a9c775e90ded45ee880ac2dc1edb77b71e518c669ff9c SHA512 1d19ead18ddc1907524740ce2c7f685b2ed8dbf8c12a25c5a1b5df426c93df013702a44e0d36f09d998fb28d35e8e417ab54ffc9407e385548a8a32082a94cfb
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.42.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild
index b6c0da034de8..b6c0da034de8 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.42.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.43.0.ebuild
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index c7ffd66af48a..015e84fdda6e 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.40.0.tar.xz 60896 BLAKE2B 41c94737d80e5c84bd75813573ec6b150e63e3e7f811f01e8651f14fdca3547398641496eff393fc77326a2f8b867b1a27d7a956723fef073800535c287da39b SHA512 1c5285038247dd778579daef2b4bc4663b67a18364670ef953c52311931e0f1c5147bba2f699a316be52a41d641ee7b9db4fd78c6f96db47883c95a442ecd907
-DIST kactivities-stats-5.42.0.tar.xz 60896 BLAKE2B 1f5bd345b63cf3f8546fc3615bfc3f35292c94cffbb4316cba9b9d7bc072703fb8eed2bb9399b8ed149ce126095fe2fc3a9976ed86b4c0b2f02e9615460d2051 SHA512 29e3a0ff72663620b8bdbeb5c84aaaa3d0987bb990c7907b95c391e2658c63b3b910384ccf46c368dfc6980a9ed8f7ee9b6bfe87842015cf726c34ba6294a115
+DIST kactivities-stats-5.43.0.tar.xz 60896 BLAKE2B da72c4f274bf54f1e8619f1a2c0a4b18cf15b3785f8899a6300c317d142dd2f5b15dcc7898a87b2e19aee9bb9761d1e521762772c26274199a63553905992561 SHA512 777b94ff72504904d36e5e9a9a3c85bb3088379aa860c8e6ada4db20c44aa57c9c123ce2638b7126a3c57958f170272494ef99f3d8fedf0e4cb4b23e2a113546
 EBUILD kactivities-stats-5.40.0.ebuild 441 BLAKE2B aeddaf2dc0e14861e892e5d1d2eade2c52bd3f86464fa97b8ef95b41e7d92da5f306640a9dba87e16d1239aa1c548df80d1b42f5601972c7f1f3730febd5916e SHA512 7734197d1f2c6ecb9add6a805738b561ff8732136a27160b10fb72ea9bc574b7e27d72c769aa542b957efd559b0a6a95f2c83535b681741a28f9f5f09baa7619
-EBUILD kactivities-stats-5.42.0.ebuild 443 BLAKE2B f6e568d599bce73a28377cdaa3533d351e6c4de0cbb7ff7dc4b7a1b8a82c2f958f83126212d2ac50c67c5c10bd62f7be42b1fde66b8bdb31b20b81546bf69852 SHA512 cd3aa20166e5103153928d9450ed70aea8ef05f061d453a7a32af8f33b1a8f77f8b39f748df5059615942e209c5c92615362a7553a02a4f20e0847ac14de26ec
+EBUILD kactivities-stats-5.43.0.ebuild 443 BLAKE2B f6e568d599bce73a28377cdaa3533d351e6c4de0cbb7ff7dc4b7a1b8a82c2f958f83126212d2ac50c67c5c10bd62f7be42b1fde66b8bdb31b20b81546bf69852 SHA512 cd3aa20166e5103153928d9450ed70aea8ef05f061d453a7a32af8f33b1a8f77f8b39f748df5059615942e209c5c92615362a7553a02a4f20e0847ac14de26ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.42.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild
index 2c93cf434f2f..2c93cf434f2f 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.42.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.43.0.ebuild
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index b4fe1b63b2a8..3e7101ac7c73 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.40.0.tar.xz 61272 BLAKE2B a21e9858572be9ec8e6d09bb46213cd42ed33925ed0f527290a0ac232d3594ab5d0f8d66ed3764cb2e4440e06f57f002ef7ec7939d1fe98c2846c1516e7766f5 SHA512 030c3678c2971c9d499c9cdb863363ae82e35295d88aec141149988aa1596996cf0a32863db6024ac2ed15879d8edc5feef4b72ee89d2efe5641b33690ecfbce
-DIST kactivities-5.42.0.tar.xz 61304 BLAKE2B 2c0336bf5cce55cc43616f3d80f263f542aab7668eb7f651dbd58e8589292b40001be89335d33091ec151fff1d45de3ee8aa8e4c04f1c0a2973bb7769746bddd SHA512 9ca8fb9aca5eb62eb1f3ea7c0d930289657ea3c9f035ef6dba3c8d528de1e966e4ecbce4393c93d8e980c50a0538e024cbd00964a88d77841f19e77bb40fbbaf
+DIST kactivities-5.43.0.tar.xz 61328 BLAKE2B f5be8fd23dae3de0b675dec2fec72120805452df36fbbd1f530c26eea29823d14dee347e4f3ef4daa588fe3d2ced0d0e89bb609efd0fe29323183cdb613dec91 SHA512 121a3704558bdc8fc4e71519face18593800a549b2cffff1919ccb0255a29d24075523e96ca3bdf7c999b0dca1dd8b30609b3db7e7538c94f550bb7d69f17c19
 EBUILD kactivities-5.40.0.ebuild 561 BLAKE2B 8c26d1e3a674a78ca2df663a3fd275261654c5227138802440551d0e1c22fd6e698dac0c115b07d04bd9c8539b7bba8e06987aafbae78f8846b9c5db7d72225a SHA512 2da42eb3ca20c8e217e1c1fce85d26a1ecdb121ed25eaad477e8c98551f1f9852dfa84b668fdb4492a118289a0fb5570659eab3cb0cab0734048e8eca46070bc
-EBUILD kactivities-5.42.0.ebuild 563 BLAKE2B 742199041c61534fb38071daff0cd54f104c0304dd2b2b98b82a906645b31f18111bc50a910fa1182636c4abb8921878e482c60b7187864c2adb92b0f2638455 SHA512 73c7961e252f51ff244387fd59b0d4923ea6059cf380ba1f9ea663acd95e9d40696dfaa3f4840f29d81b9b7925deabad8c6d55fdd90e14677ed4337da78a88af
+EBUILD kactivities-5.43.0.ebuild 563 BLAKE2B 742199041c61534fb38071daff0cd54f104c0304dd2b2b98b82a906645b31f18111bc50a910fa1182636c4abb8921878e482c60b7187864c2adb92b0f2638455 SHA512 73c7961e252f51ff244387fd59b0d4923ea6059cf380ba1f9ea663acd95e9d40696dfaa3f4840f29d81b9b7925deabad8c6d55fdd90e14677ed4337da78a88af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.42.0.ebuild b/kde-frameworks/kactivities/kactivities-5.43.0.ebuild
index 9bc7ca2a1803..9bc7ca2a1803 100644
--- a/kde-frameworks/kactivities/kactivities-5.42.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.43.0.ebuild
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index f9ec9243a897..4c638feec4ac 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.40.0.tar.xz 395756 BLAKE2B 89adbf55ce32a0a1960ffbfa7e4055ac57826beeb8a8a370f3e283892efb54ed53171c119907bfcae7976605b198ab66d523c5c039ea601ab77bd374d2359220 SHA512 267d96b874f51da99f10a220601128112c7907da2be317d0acbaed5be0530414762e8aeeff9560696e22b357cb3c95c3427d83b951217fcb34088f0b473926be
-DIST kapidox-5.42.0.tar.xz 395576 BLAKE2B 7218d24593bb8c94593c3712ed0f804d8f62dddfb1b4718f2562e0d4b8f8c48e34d21d445d396f9b4d4e75985a237432b1999800e02810a1517ea1239887ffc6 SHA512 ff53ac2c4389146abe9c0e4e0bb421fe59d1f01542a4fb42179bcb3bdcf0ae96e283c26bc609214c3f6102c058a5ae78edb17c050b90952d445fc5a14ee48517
+DIST kapidox-5.43.0.tar.xz 395592 BLAKE2B 32fff6c9b714c7d3f8f62d8e165fc4ba307ffcb22144886c1cf5d2b0385ab00c7b4feac3bbdccd3b6e7c37dd527406c88ef160775457923af51ee94f54b9f7d6 SHA512 08dc74e70d3d8c36411590ecbb2ae1a014f2029e0bb4cb4bb066e18e7a33f9acdfeccd6d9def2127dbcdcd40af8c3c676f4deb050c845ab8ca4789d8ea35abf8
 EBUILD kapidox-5.40.0.ebuild 612 BLAKE2B cfb8751fbc1b5616aeb23764b5bbc36c2d4036d5e2f212a3309a00780a6714b195eac0a56aca21498e82ae98516f38ed0ce2e546cf6a3adcf9807a8ba2a3c862 SHA512 c4d49dd0e0bd0e87e1d365db08580889f9c30006e3eec33660b3abc4d72481a2578449efec8ec6a3e4352ed79c24669f902ba899269cadb0310069434062d2cd
-EBUILD kapidox-5.42.0.ebuild 614 BLAKE2B e702f3dfb2f341ae8d628e9a81efa2759644adeb3532aaac4858b7eb049d006d333168170a072e3957ae122878ac99ecabe1d819d6d576280098a334a089775c SHA512 cfef53e48797b9f09c990a7b83a0486562fc4f61e136409bdb45deef19229f81d89c3793638fe051a81e017ff3966da9e9be249938271368eb8a2d88f7e99771
+EBUILD kapidox-5.43.0.ebuild 614 BLAKE2B e702f3dfb2f341ae8d628e9a81efa2759644adeb3532aaac4858b7eb049d006d333168170a072e3957ae122878ac99ecabe1d819d6d576280098a334a089775c SHA512 cfef53e48797b9f09c990a7b83a0486562fc4f61e136409bdb45deef19229f81d89c3793638fe051a81e017ff3966da9e9be249938271368eb8a2d88f7e99771
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.42.0.ebuild b/kde-frameworks/kapidox/kapidox-5.43.0.ebuild
index c0551adddf60..c0551adddf60 100644
--- a/kde-frameworks/kapidox/kapidox-5.42.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.43.0.ebuild
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 69414fdc87bc..de42f4187d4e 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.40.0.tar.xz 113576 BLAKE2B 92d90369c8ccaa819e1e78efabf7b7bf634de15281f5c0b78be084dea967bacf4a8102de3eb40673681860938c8cace0b96749f5f8f65f4b570b7cc93f250a7e SHA512 edffe71f985b0d7c6cc84d6549447734c717de9f8be4685badee47d94464cf29373cfbfc3662d81c9e0071321c50c4459840c316c08144972e1fab1c295d8a22
-DIST karchive-5.42.0.tar.xz 113488 BLAKE2B cb519d894d1fea369a82876532f709a54da1162a0d6f51f06c25c92b32a71bc2049b12c6d59ab19c45a7276d3b38ea222fb0740db3a9763bc694ed8ed654363d SHA512 4599c6e5018f51b84062fa84bb312f5461d6b7209b3e5f10e701ee7b7e9fe54b5bd2820de188e779dd70eebc73219ca47e7e14c994b9a49b3ca1f900fabe6e57
+DIST karchive-5.43.0.tar.xz 113496 BLAKE2B 1147dceb139720b3b5954d36f6cfbc971cbde8e52056f2f1d39f83e254695164c4205a8c38b1bf34f7432413201b28946ac5fbfbc8393c0400e84957e439a34c SHA512 228516471fc9e961f68b77d06b55d640606f5adaaa1dcba67d12086d57a3184c87a5d9636085b00bc56007cee1af9863e213bc82317b3c917737de4a3d84c74e
 EBUILD karchive-5.40.0.ebuild 562 BLAKE2B 3a8ceab91d91fa2dc1c11e22462082e96a5d574266d17220b1ba4bcf3542c3fd501c1cbc59f9a520eb0c9943bbdd935d18952cda9580e0c652da7b5feaf2530a SHA512 5937a65170ef8ad79b489e746e181c4dd0457ee5904be7ec438c365385569c67bfe631b4a795b08995ea607edfd3db7f96fb321544016b709436ec9b0b10250d
-EBUILD karchive-5.42.0.ebuild 564 BLAKE2B c69b255b92618918991a020ebba7e3edf1cf83661481c69f5e2e35bba27ddb14ab167c3f05bf601c21164554ef9173b88df823388d8d22f17cd1d1efbcad6298 SHA512 8e5254bac367ffdf036da94e4a445847a3a5cfc7d171bd09356513d4502d97ed4338b9d5d35cc1ed1a4109e5a9e512707b4a7acac4983f68a4693c1d63c8186b
+EBUILD karchive-5.43.0.ebuild 564 BLAKE2B c69b255b92618918991a020ebba7e3edf1cf83661481c69f5e2e35bba27ddb14ab167c3f05bf601c21164554ef9173b88df823388d8d22f17cd1d1efbcad6298 SHA512 8e5254bac367ffdf036da94e4a445847a3a5cfc7d171bd09356513d4502d97ed4338b9d5d35cc1ed1a4109e5a9e512707b4a7acac4983f68a4693c1d63c8186b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.42.0.ebuild b/kde-frameworks/karchive/karchive-5.43.0.ebuild
index 2a172249f306..2a172249f306 100644
--- a/kde-frameworks/karchive/karchive-5.42.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.43.0.ebuild
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 11bfd09490d4..d84eaa1d4f08 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.40.0.tar.xz 84900 BLAKE2B f0445740ec66abdde52839f84f7eb709f926ff1e678de8a0f0a5ee7e0c88f8c724255fe46a5281d1c9b3f4591eef6d210881147e3b81b5f64fe82ccd958b427f SHA512 912e45a18f98086a35caf7b65316e4fe0defbbcc80f334bcdfd146a398cfb40abe2aa6b358d2057d457a51ba9fb61b05b1319ca3ff00edea82014919f632116a
-DIST kauth-5.42.0.tar.xz 84892 BLAKE2B b39a6e3942633f481785b4893269348a0e1933b56592fe357fc11bb37b96d1933d9fb4ace64a1bdbbd9c0254810e0eb479f238401c55ec9f9d19b064bcefd42a SHA512 68d9f5ccc14e368ebff6e7081eaeb6d1511fe2cf99146b87876fb94d9c4151764204b023c3c0d2915bee11e02a99d2d1a2ef332589bb027d9b0dd8bb5bbc0be5
+DIST kauth-5.43.0.tar.xz 84844 BLAKE2B 774e2c32e71ea63908a854e6fa8c4f630ebc36b4b6eb0ce8fdbde5004b3f8926f3a60c889461e89dbfc8c00350d2556add8f5e54b8f07f09e7719a13fe7ffd6a SHA512 e20f2f911084f48e81f85f4bc0e4559ce87c476a9dcaacba1e1f4db47ac0b0b3cbd01b185fba0817037838b6fae0e80abea1bc0ab72ced23a2c58fb95f9eb681
 EBUILD kauth-5.40.0.ebuild 705 BLAKE2B 4103e98faf55bb587735fdd4cae05b1c1d6b4ccf0557dee96791979f562ebcaf7b8073653238be0202318ef7420f9cd25aa3053563822d33074a3f3f0bf12be9 SHA512 f679ef29e4e28f193f24a2cda2ef7894ef6f510f5f3cc1ff315badc1324090abef9c41d93875dc66af71e90cdb25f21426ec1217386daae31670881341ec202b
-EBUILD kauth-5.42.0.ebuild 707 BLAKE2B ca4e23e1948d087e5c6212679d7b0943a046fa44eefbc1d27e8413f8eca98de0d2002e677cde891f3a724ca3dbd19fe080c7890db65d9526cdddd449516dec47 SHA512 6035e9705c662791c1370b9d5f36a23f0e32ca5f38263d36977841ccb58eccca66226ca68ec40596a438cf4e13a69a73146e47ba19eab999d5dec05bc66db2e1
+EBUILD kauth-5.43.0.ebuild 707 BLAKE2B ca4e23e1948d087e5c6212679d7b0943a046fa44eefbc1d27e8413f8eca98de0d2002e677cde891f3a724ca3dbd19fe080c7890db65d9526cdddd449516dec47 SHA512 6035e9705c662791c1370b9d5f36a23f0e32ca5f38263d36977841ccb58eccca66226ca68ec40596a438cf4e13a69a73146e47ba19eab999d5dec05bc66db2e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.42.0.ebuild b/kde-frameworks/kauth/kauth-5.43.0.ebuild
index ee6570cb1d6b..ee6570cb1d6b 100644
--- a/kde-frameworks/kauth/kauth-5.42.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.43.0.ebuild
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 8c3b232d7ca0..bfd64f03c129 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.40.0.tar.xz 117596 BLAKE2B 0ab2956369d9b76a02ae1824c064a5e3cc7c0e92b35376dd6205b3af09a1ac958e366a82d5ad41d9afc932c4ecd81fd9d29c386285988bbb64676b8129db3549 SHA512 b9adaab77f3104ffb0f470ccae25db75b1e73f54bbf49a5b8bdb7bf1271911c8a296cf68d1dc17a0b3e44e9fccc11e44ef2c90d2f03bd504488e2b6a832c097d
-DIST kbookmarks-5.42.0.tar.xz 117964 BLAKE2B 66f6399e8f4c88d50d26719d0f93d7eea6d990041e63d6acb7d0d8af3f2bf2969901120c2e59aa83a7490b55151d9cff8239dd09c7fe42db960ad49d8412107a SHA512 88dc1b3e949a3907156140bd5c736750752d3a7ea5d582ad4423498ce14c190969d0ce39fa32b4f3701fd047b6178e4daf791fcb8ba51d518b41f3f3554c27bf
+DIST kbookmarks-5.43.0.tar.xz 118672 BLAKE2B 513fc8964913bd4cf3e0587c8afc3ba1ce017c2c93ad4c53048995cdc3cfc9d443faff5c7e5a4efc48215134955cfcc4d20d838ce1ac33f641109329d6858952 SHA512 5cfd55d94efa69267dd1e61e857fa541cd0c7ae55a02d83e91a9a0a02dfa020cfeb16b0a8cc10228f838c17de5bca95f683f445749263fc0e28bc55e2ac6f2bf
 EBUILD kbookmarks-5.40.0.ebuild 687 BLAKE2B 34a68d654c3201b3035972a7036f00c837dda3490ef111736d9e89fa0936d3b729ddb6159d41311a80065af3de8b9523eba3fb2f23d5688975ddd9b23d5ab940 SHA512 c872d2b2c485aba45cf6abc982dc656eaec83d4685444060b3f99fee97dc8c7cd6055da2bfde5def38dea5e187c08e2fab1c6b16eb81b61ab28f3db95a41e14f
-EBUILD kbookmarks-5.42.0.ebuild 689 BLAKE2B c11840739a9d33d45eb49ad1c21ed133bd7c6a57b303fef43e4a6c4198013bfa819f262eebd2345b7d3509b0d44667cb83a1a0b99895ea766d365102aa69c5b4 SHA512 df48f821747ba8ede0bc91fd79ecd91d4a49a20e269f9b2cc1fe5a889d7d596e3218333d62fbe432bc50092dcb515c5938c435ab4e43fcb86c250f74fcc4ae00
+EBUILD kbookmarks-5.43.0.ebuild 689 BLAKE2B c11840739a9d33d45eb49ad1c21ed133bd7c6a57b303fef43e4a6c4198013bfa819f262eebd2345b7d3509b0d44667cb83a1a0b99895ea766d365102aa69c5b4 SHA512 df48f821747ba8ede0bc91fd79ecd91d4a49a20e269f9b2cc1fe5a889d7d596e3218333d62fbe432bc50092dcb515c5938c435ab4e43fcb86c250f74fcc4ae00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.42.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild
index 763576f16e6e..763576f16e6e 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.42.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.43.0.ebuild
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 06b70a03811a..a28f97479090 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.40.0.tar.xz 235428 BLAKE2B b466237ffd804f77a00c2f25af2f901dbd01b783c19408a3d42ee3272c6548e3769d7f42647efb1957a20e6f2c50733bcb524c1575594393414eedc111aadbf4 SHA512 d59e225438d8c43d3c62ed15a3cb38fc08e05a2af4cdf6c1d0100347dd29a1e34906447eb96f9ef4c50bcb81c76e62d951df7d42e30a6214e9db5b3690880324
-DIST kcmutils-5.42.0.tar.xz 236096 BLAKE2B 1fc02cb4d0c4dcb08160ebfe4b9d146c3551ccecd327b4640af8339059f173715851aa9a0a8cfc88bf60d1bb97db33b53d192979a5797d07bf5d5a4d2bc1df5c SHA512 4afdb39d17393d16de3dee72a990c1a3419cab6197cbdf3d545fd10fd079018d1cecb19254a8554a2fce09695d17983953647cdb0c1db343c227a05a683eadb5
+DIST kcmutils-5.43.0.tar.xz 236960 BLAKE2B d72115eb335530d2b92b49316adefad9e8f66c2eb5e872c021462f7ee4785707e23c0f6c7ec46771135a55b0c6c4aad009189f13ae89c9b28f121bf05f0949aa SHA512 07c668fc50e2890809bac3287a37591abbfb26ff8f4fdb70ae4ebcd141cc54be78f7b3b86f20b68e582b16d6af85b507bae49fb4b7083f1ae61c340dae48115e
 EBUILD kcmutils-5.40.0.ebuild 784 BLAKE2B 1910abdd4f3a8354176df78e0d73cca2c83fa06676b77a3dd0680637a6a0d8b077b16f56cfbdc9e1c43b085770411530c9e331b2b470ac02f17cbd6114b1e7ca SHA512 4f26d023f0a461e1b26b9fb0766aed16fe3f6f0c4007ff01d3868844d76704a756fddbe1161f234898803b488ff6e4ee6967541ad721456a91ce136a86a76f46
-EBUILD kcmutils-5.42.0.ebuild 786 BLAKE2B 7bb7cc7c96a7432a1145dfb4cb3891e8c11fdc05f6bf2f27c6c16c6df546c3e5bca7420b3a5b1f6905732f7cc44fba0700271635bc0152707c7f46232a290a13 SHA512 f493a4d18a82e702964c5e6f6a49dfd2e8f4a042ae05133b02d61a9f0ef9172411a07b054b30b4c46d194971aaefe04a4940ec6f7e0cd70540cc86044869a0e7
+EBUILD kcmutils-5.43.0.ebuild 786 BLAKE2B 7bb7cc7c96a7432a1145dfb4cb3891e8c11fdc05f6bf2f27c6c16c6df546c3e5bca7420b3a5b1f6905732f7cc44fba0700271635bc0152707c7f46232a290a13 SHA512 f493a4d18a82e702964c5e6f6a49dfd2e8f4a042ae05133b02d61a9f0ef9172411a07b054b30b4c46d194971aaefe04a4940ec6f7e0cd70540cc86044869a0e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.42.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild
index e6daae33a2d8..e6daae33a2d8 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.42.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.43.0.ebuild
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index d96b41d31d4b..153089de92d2 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.40.0.tar.xz 218852 BLAKE2B 9fc8fd30ac8844e13fb89e8e4cac316b2e4467bbcf08996c95c23c6c5875193a1fc3b1398ed06fdc6058d0b018cc192e07d36a3f1d326b90bf336d11c5dade84 SHA512 575872407dcc0da771a7c43e9a751793bee8ac7b36bf262251c00ab7f8af1bcebba3010c3b0a62eddd678b0cea4c4bc58fbcbc7f9382264a06c6186004d96aa6
-DIST kcodecs-5.42.0.tar.xz 219116 BLAKE2B 06576d95143f6fe00ad52407441d669d7def2d41927dbb6f4c5c0f991286dc4ca939d2205a9859b37fecc63ffd3371bba89a6626cc6e503e7633a68ddd1e328b SHA512 235c6b7b3a447b3bb87db5900048ed7bdb35b900c6ca486461ff01f8f2b020ae9757788d772bd886709b545be7d463730e143fa5fa91d08b8ec564428aaa3e58
+DIST kcodecs-5.43.0.tar.xz 219764 BLAKE2B 4f6300ba9249055b611da8582ae25997a8329443c4e79a81e3a49e2481dbef87095f329e79d5c179361f3f495fc3b78834c2614fa0015f0856147e4867669fab SHA512 a6d81395a8b495fa2dded4d7a8331c8b987cf3e8d3b254cc9339863f0ff02c3b972b58f033075dfcc56d1fff21710b000f834de9bf9ce1d3ae1bab1a6bb90d64
 EBUILD kcodecs-5.40.0.ebuild 320 BLAKE2B 55c81622ef98d5981bba41416b08d9656c6ecb31bc19cbe2cb3be646f585f26749b4270dac5e6be3e99f9795bf743e2d7ad3558e958325219eae7c9c47502470 SHA512 12a6a85f861d51e6cf6174a2267eaca25067746441345aabb52adea5677b70e932d5d0400aed32587ce4f4732577c82d6508df819845274232e272f7f8e710bf
-EBUILD kcodecs-5.42.0.ebuild 322 BLAKE2B 20b8d5d6dc57f77cbce0dea110769052685c76a298937ad677aed56ca6c73be00f5c03b987f16b116afdf1529e5ed48ffbad16484f3e8c2cae5ffc0e4abc2af6 SHA512 64c4a38d03fce05a49c35905016858a78ed98c5e614e3e0a1d51adc2e7f61ee2e256c44ca8c3ad900a61d423dc3c9abd99b980c8db6bbb3b563028a7db770b6f
+EBUILD kcodecs-5.43.0.ebuild 322 BLAKE2B 20b8d5d6dc57f77cbce0dea110769052685c76a298937ad677aed56ca6c73be00f5c03b987f16b116afdf1529e5ed48ffbad16484f3e8c2cae5ffc0e4abc2af6 SHA512 64c4a38d03fce05a49c35905016858a78ed98c5e614e3e0a1d51adc2e7f61ee2e256c44ca8c3ad900a61d423dc3c9abd99b980c8db6bbb3b563028a7db770b6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.42.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild
index 007c0d0de0b7..007c0d0de0b7 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.42.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.43.0.ebuild
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index c87b0693db7c..651e8cfa4902 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.40.0.tar.xz 118516 BLAKE2B e4cd2965f69d5d48b846af10cc6c3a1ba6041f5df5c6db4ea2885e14764f2b31811f3ca0b12e0c74253e9afd7942fd144ff6e6c2dd355e4fec07e73073ad6d60 SHA512 ffd59f3a9803856f43e2c9e7c125f789fe4ef5d261daf05e02c4f95df121b5854a1ac57d1249e734180ee205b49a742a717aee9572f5a69eb104a11aaa839b64
-DIST kcompletion-5.42.0.tar.xz 118988 BLAKE2B 10d84cb3728f3bb9edcb26c2f2304522fe89dd1af68cd9491e84c893113614bb8ac404dbe0e1c6da8928517d3f913be47cec8abab4043d2d14027aac20b4bc99 SHA512 b40a4e00b9c49747e7b530d2d56d66d50c723608d4705936ffb7d846450fc943069ae3ae89316883e1ad6c64c66af6cffb7bcf5e6b65fab0466629174547aae5
+DIST kcompletion-5.43.0.tar.xz 119212 BLAKE2B ddb17268ab9c19f7e72ac5d05c62f50cd770e9ee4536cb293af181d510856784098962e19395bbed376db062807f7d386c4dbb340ef6f485238b382e63ff0845 SHA512 a9ff9f512a46df6d70580150f702339b408390353b0c665eb60d28f34ec4484d558896d510f82300b8178a402f7b6c8e5d9f587a33c4bb242860855bfce8e158
 EBUILD kcompletion-5.40.0.ebuild 474 BLAKE2B c0ad60ca1d0228b70a95bce882de7253a1228715c3d276176bca9facc9bbbb4c564866c0a209391cd59eb83692e322e44b9267687dbb4fb59ab3b1371a922c86 SHA512 8f9d60ba0b9ee172547b6fb4607b4d9ac28b55630a0fae3837b6e8817ae1eeb97d6382163f6f5a7b0312fdc299364e9be0bfccacac29396fb4547b6427b93e90
-EBUILD kcompletion-5.42.0.ebuild 476 BLAKE2B 94c0be2d8e1306f28e3b8467b20075ae88a23da3f0467ed9324ebec6446495e7fb15e6132f04b3acdf6ac4ca2ba211933a141819fdc19c42687ce0648d31840d SHA512 7304e20bb9bf338ba133d25525348b791d9d7f388543a932dd7c16726f57c5cfb53b74ca4d77e699309522f989085b8048065c04065aa365b8026f9d678ac311
+EBUILD kcompletion-5.43.0.ebuild 476 BLAKE2B 94c0be2d8e1306f28e3b8467b20075ae88a23da3f0467ed9324ebec6446495e7fb15e6132f04b3acdf6ac4ca2ba211933a141819fdc19c42687ce0648d31840d SHA512 7304e20bb9bf338ba133d25525348b791d9d7f388543a932dd7c16726f57c5cfb53b74ca4d77e699309522f989085b8048065c04065aa365b8026f9d678ac311
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcompletion/kcompletion-5.42.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild
index 89c636704e5b..89c636704e5b 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.42.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.43.0.ebuild
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index a2ebf02b336a..be05458f260e 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.40.0.tar.xz 234752 BLAKE2B e71f1e29d5edf5b5d0948814abd4735a1287cd5ddd164a563fecae18a976265c656a003f313bb9ed800e993eadbf343c94056cb3056f90538c65f3b9655665ef SHA512 c61f86144af8aba52341be2f2bd80dfa4a3a68fbf7daf65f49441c9ad00385080e161965bfbdd190e52cad023e8b7774bfb9e13546a9e909cc09de15c55fdfac
-DIST kconfig-5.42.0.tar.xz 235412 BLAKE2B fb7d1ab853f430e843a3a2422b0cb00fde76c7f1966c8fe6f3c69ddaaa88ffb50b4b2eccf119b66b0d8c7c4f835f40f30221d63db90d00ceffb03fdbebe07eea SHA512 632b1acd159353ddcd6a7715068997240690ec6352fa1f5164f1c2cb4e34ff0b8e4a0e8e677987b651ba12b9cb7b46f3768fecc1c7714a3dac9167bf689791e5
+DIST kconfig-5.43.0.tar.xz 235524 BLAKE2B 5dc70308e7d820233e13331a74bb2318bcb904dd882e3f5f499a10145869266bf4fbbd75a1fb6e9d170a96f8cf20ef0e0f7397956370f7e299b5998de405f7a9 SHA512 446d0b5b1aadc32a73e44cae77959d212a83cc036c288591c82b46734e616ce1124d3df09d4fa031f91c8bb08e452348588831435c44fe64247b341d62eb3279
 EBUILD kconfig-5.40.0.ebuild 517 BLAKE2B 8a81dea47dbf3969ea65d736900ccaf07f5bdeeb39a018c17cf1ccc900af4356ff26cf9124f66cd8019e80d7302cf472f64518d0ae31b53a6307f2661425c0d1 SHA512 4ca432b092994c6ee01c2de4991f0a76fc3db959b7f6fcea15c64e79cd50447dce0c27cc880a2d463b11ff602ea70a005829a574a1c8dc72aa5f3248d1147422
-EBUILD kconfig-5.42.0.ebuild 519 BLAKE2B 75c292f0deb2722661203e0e6ed992a00efdf2f06dd7067d34373318306cd48a306650dbcc0c01a3751625b773795a48c2ffd4cd490354525ba273022e803b7a SHA512 1cd9142d8005378bb724a927db5f70bcfc0d79e73bbabc34f1eba8133e16fec859647483f8d32f4b5f92ae40f0026a19188359b41c30cd9bbe99f402a8e0c873
+EBUILD kconfig-5.43.0.ebuild 519 BLAKE2B 75c292f0deb2722661203e0e6ed992a00efdf2f06dd7067d34373318306cd48a306650dbcc0c01a3751625b773795a48c2ffd4cd490354525ba273022e803b7a SHA512 1cd9142d8005378bb724a927db5f70bcfc0d79e73bbabc34f1eba8133e16fec859647483f8d32f4b5f92ae40f0026a19188359b41c30cd9bbe99f402a8e0c873
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.42.0.ebuild b/kde-frameworks/kconfig/kconfig-5.43.0.ebuild
index 9701c9a50636..9701c9a50636 100644
--- a/kde-frameworks/kconfig/kconfig-5.42.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.43.0.ebuild
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 418d2bfd0fa5..f9bec14a8f90 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.40.0.tar.xz 375048 BLAKE2B 597608e9bde4d2552d1580b2fc9821846744af3cc3536c4f393daeb9707645e4ecc87db8950f80e6375887119d1e64c0de651b0901063161504f02016184acf5 SHA512 af8cb1aaddb69e21e6b0dcaff0caeb5f0e81d3b6db9b34216011f82872fe129cc5029b84fa90a54194d2c4270e35f868b24326e86a2a776e9e73b985fcdb09c3
-DIST kconfigwidgets-5.42.0.tar.xz 375376 BLAKE2B f7ef04f50eb80bd3e01d6777eaf666d18fb8ae2a81dbd7a5cdf21f6b0929b5036b3b23984f7491aa57dad27db47a01dfe41f4cf912b4f00d34b6f60df5683eab SHA512 92a8b68be081cf40a54b7993cd9f0ba9f5d9a9170b3b13f8fb211f8770c0e2b5131be922f79d5e14157f1e655435a4f4d786426dae35c37dd69b52d58cecb62b
+DIST kconfigwidgets-5.43.0.tar.xz 375456 BLAKE2B 2918c7cf1c74dde6bcf4189a30c945e28e958d95019dfcfa639fe85ded665d80395b60a12aefba63de2aac62f3ecb3edec8db8bb9c3d6641734b9300c23766b6 SHA512 57b5b8a76a7973bb04dec739b7ac3da0a8146623849fa8cbfee9eddc7224a5bf0ee933ee95787617217ecf38841355abef24c6d70da378b743401270ca25083d
 EBUILD kconfigwidgets-5.40.0.ebuild 786 BLAKE2B 862a55ef8a1b0d0c8ff6caa925afac316aa878410d8506cc127896082aaa59fd1a6e2ab978227d669f7d00cefb0cf58973b6c7c7f657c0150975a437f2d1d984 SHA512 50387a362e040aa927a8ba71bcc412be63bdab0e3436ccacd7e4d96210b8ff023b7be991519caec88263f0ceaeceb43e66d862691fdf404dffca31cb26ef8fc0
-EBUILD kconfigwidgets-5.42.0.ebuild 788 BLAKE2B d57e6bf1c8677c3ae022a7fdb965e8653c844cae7770b18667474b3569ec0d05b47eefa7936b4f188bd8c7d42b0564cbb2ae744aa94bb81342c31b6a4a074a4c SHA512 1be37951043db369624882c37ce67bc89f0f6d85dc6381bad17538d762c234d96775093af834cb53b8ae5926c0a354acd1627e10f8f7c71eb716899d568507a4
+EBUILD kconfigwidgets-5.43.0.ebuild 788 BLAKE2B d57e6bf1c8677c3ae022a7fdb965e8653c844cae7770b18667474b3569ec0d05b47eefa7936b4f188bd8c7d42b0564cbb2ae744aa94bb81342c31b6a4a074a4c SHA512 1be37951043db369624882c37ce67bc89f0f6d85dc6381bad17538d762c234d96775093af834cb53b8ae5926c0a354acd1627e10f8f7c71eb716899d568507a4
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.42.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild
index 1c61d3a252eb..1c61d3a252eb 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.42.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.43.0.ebuild
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 3a887e6a21f6..f74c4028da52 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.40.0.tar.xz 351348 BLAKE2B a999b49f5a184a4d1ed012fd7f21bae73c40614f9ea90d5fc19454b2134f2a79cbfe10c8e6d4a91f2951d055c150df3a8e1636c0de4d8329f41775684b9b1436 SHA512 e003cd743db0b7843f0cd293e73f1868123549d8872149e46d8d8a9733370642da0f0ec89c3794b1bf372d52e103612893875accfc954e28400088d4f3400572
-DIST kcoreaddons-5.42.0.tar.xz 353800 BLAKE2B 6f3bd8a216683cc99908588c5d1de90903cd5b5b187f34e1bf2cfc9955b08ffb95fbf8508dacf0e8a69924cd3fc142a2c75d2f93e9614ace7e24ef43ff95e004 SHA512 b92fcf79bbe4c2549c22d3eda457733a22f7df33838c63f444091168de6325efd6273139cee4ab372f7d51a2e9a24112f1ae899489b52c5fedfbd095292c3205
+DIST kcoreaddons-5.43.0.tar.xz 355784 BLAKE2B dd76abee04ba0e3772b1e1c8b03192ad3ae2768e1ef54059cffdf0fbac5e1d75d31495951ebf37470823121b4dfef9dca19246c44ba31b2751589820361e1607 SHA512 895a6b3547f78f5222a16be71c8fe8865b922e2d9b2a8fedf322c7df607ccdb6b4fd3928470dc5cef385eaf13c37a5d1dcbd959afc326afb48b8636cb4a4b77b
 EBUILD kcoreaddons-5.40.0.ebuild 654 BLAKE2B 504c7efe326a062f1385b2130376207cfcddcc141230387a25a5a94966a2e82564a02a4b6efe739f619a3374cdee2ae5b27dbcccd92f2e12331647814b98af83 SHA512 7b5df2f5912922d9c903a336d8867e322f38753127d1ecb180293899c9f3ce98855297e5b9366fd4f7e3c5c6be5f13242e52eaa3bc8f50c40b0eea06afe40787
-EBUILD kcoreaddons-5.42.0.ebuild 656 BLAKE2B a26a468dd1987defb8f253907d85a1b3bc89978b03b03b56cc8fd116d35d27685c018d3d85f2a05c540cf3d34f6d824b0c6c7fddd7e1954986d32c720dac648c SHA512 d7fb25de5b2b4e057b24e3f97e1e5f0be3f53aa128724c982fa96aed94d83998e06c6e8834a69b1ac409019ffc3072e017e8b09c8ee78e961d1c390a45d2675a
+EBUILD kcoreaddons-5.43.0.ebuild 656 BLAKE2B a26a468dd1987defb8f253907d85a1b3bc89978b03b03b56cc8fd116d35d27685c018d3d85f2a05c540cf3d34f6d824b0c6c7fddd7e1954986d32c720dac648c SHA512 d7fb25de5b2b4e057b24e3f97e1e5f0be3f53aa128724c982fa96aed94d83998e06c6e8834a69b1ac409019ffc3072e017e8b09c8ee78e961d1c390a45d2675a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.42.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild
index 3d7d47b799a9..3d7d47b799a9 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.42.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.43.0.ebuild
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 702f836d12e2..ce3b103103c4 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.40.0.tar.xz 21700 BLAKE2B 818e5f0fbf13a084cf42ef278775e04e8ed6b9d625f8dbd0e64dc18c4a9cf74c5d2bbe92731b18e4bcbdc5395877ada20783af9013396e06eba10979b791e815 SHA512 2440b64e5ec6dd38682a9d7fa92e112faa41c6190faae42cb291df4fe8c77ef4013d06a333a997fa25fe15ca2f8dc1bed36973f7ef44d7bc2b59c3bb9427403a
-DIST kcrash-5.42.0.tar.xz 21768 BLAKE2B baa49a533baca10866a96985ff928e415710c23c55b59631f75f53d4d205b7c9b5a852295bfe213d34d4194bcf3ffce49f94ee27df3426d41b40cb65d17a39d7 SHA512 f7cc51aa370f5bee09d8e005cca11b097a7091a21bf946ca7879de81557298b019d99c27ece12539727674fa200f315c08382fa01bfc6861f87a558ac475c95c
+DIST kcrash-5.43.0.tar.xz 21772 BLAKE2B 48b61db7208be9a00c5159f66b3558d186e79840e28b2f0e167c27f1d30643a6500f50363db1b063786322d59eaeb40cb3dba72ee7160ec28e7769c7a64a3ac2 SHA512 1733807f55d5914b67d7b009ef8b34d0c54e3e1fb40a373df7651d65dc3180033ec8872c105d243134e7e38ea6fa9992f2d4803d9b2915721a3c0d8c43c7464c
 EBUILD kcrash-5.40.0.ebuild 608 BLAKE2B 127632b4ff23ebc1681df8c921467e9883a86bdabdaee25c6d72a84a4853c6a38fa6ff1f6d6033d9a9baa8423bdf216f83e33c384e65502d56bfda84f027fd92 SHA512 2c9e40ddc9a54eb720bbb61ef0d580d100d4e34d810316f7427947925892fb792632550445867c0f8efcdb100a8d2770db490675663d4aa4ee2927b7778571fb
-EBUILD kcrash-5.42.0.ebuild 610 BLAKE2B 25897f27b4553d1a2c8be4bb69f3fc80e7bed3fbb3c6b02ba9b7930d93d32cf628f0438a955fedea07c4edd8cd410654395f010485a677dc8dcc0274adde28b1 SHA512 06c1bb6644b31a09d4de449cb7e012c182546c8d2accc65675f77e0579a475faef24f17bde8531a39af058566f3e4ab2f8db746ee96665a6e00ce6e1f06ff990
+EBUILD kcrash-5.43.0.ebuild 610 BLAKE2B 25897f27b4553d1a2c8be4bb69f3fc80e7bed3fbb3c6b02ba9b7930d93d32cf628f0438a955fedea07c4edd8cd410654395f010485a677dc8dcc0274adde28b1 SHA512 06c1bb6644b31a09d4de449cb7e012c182546c8d2accc65675f77e0579a475faef24f17bde8531a39af058566f3e4ab2f8db746ee96665a6e00ce6e1f06ff990
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.42.0.ebuild b/kde-frameworks/kcrash/kcrash-5.43.0.ebuild
index 48dfa9269f8b..48dfa9269f8b 100644
--- a/kde-frameworks/kcrash/kcrash-5.42.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.43.0.ebuild
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 8a777c0c59d3..ad0ac860b38c 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.40.0.tar.xz 36160 BLAKE2B 6814bbc026e3abc06fbf70e5f71529231b373c5fefcb15eca9c61fe7000662daa6756201d8620ddba6fd4df38e46f6b2335161ae075f1c2444304240cf9c2a87 SHA512 439c0baa9531ae93606e24dcdbc1fbda4a04032ccdcb2c218c0e12f97c34a0b9522bde377f0763d800f8b17ca41b6893f3854d7e8c494ad2809f493023368a7a
-DIST kdbusaddons-5.42.0.tar.xz 36844 BLAKE2B de651c701158a17f0173006a3e301a29799b8db386087d4f952faa1ee1e08498d69ee700c5abf5c992848e0079c8807bf0375abdb74d53b4e199b593e8276b41 SHA512 41b9ba48d85a21e204184c78cd5a006c002592448051e0d23398aa3ffc3d9c0f646d21e4c1e541c2fa04177956e69eedc41ed62a26ba9802b2957ce9426ed23c
+DIST kdbusaddons-5.43.0.tar.xz 36960 BLAKE2B 3ed05ef60534fd7d658116daf2faa76950cb2edc3a943a7917e4ec6c4fb53e283603713f251348473cab02e2bcf857459742067661d6c53262228d4457ca4009 SHA512 395fdb0e2387c6eb2dfafc1f84eb86e24d4bc79dc4f3b914fe956f0614ffb40d2cbd66a550b88e8fc19d676de20fccd786737f03291c11624bdb5704da7a8e1b
 EBUILD kdbusaddons-5.40.0.ebuild 554 BLAKE2B ca49acd0836bf2af5b7bf803db5afda0e5c80370c041b5a7b67ddbec8be902bb83edde9697d2ff89d1fb11c53948ab764d66f4ac8e41d7f9699c2fc8a0590a16 SHA512 ba286a42f176904f7c4610e9d5fbd949a65e5371eb9197fb77e05f8b58df62473eb9e88bb56bb19002c1b29ec1e5132cceab3bb631bdce0e008658872ad38082
-EBUILD kdbusaddons-5.42.0.ebuild 556 BLAKE2B db32605b1f65dd47933ec1d56992b083a747e0266a8b141cebea4d329a9810fef15049b1b92c821506143086c1a7bcd6cd5fe54153ff2f311f8c75b926f518f5 SHA512 3f0dc6246596332bf35ce927473d218ba0b633bcb4d593dcf3bc170631000a59c639f5566e3742a58d6195a95ac27707ff82e981f5de1173e0c9b518f43e60dc
+EBUILD kdbusaddons-5.43.0.ebuild 556 BLAKE2B db32605b1f65dd47933ec1d56992b083a747e0266a8b141cebea4d329a9810fef15049b1b92c821506143086c1a7bcd6cd5fe54153ff2f311f8c75b926f518f5 SHA512 3f0dc6246596332bf35ce927473d218ba0b633bcb4d593dcf3bc170631000a59c639f5566e3742a58d6195a95ac27707ff82e981f5de1173e0c9b518f43e60dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.42.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild
index 0bc5ed5c0fef..0bc5ed5c0fef 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.42.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.43.0.ebuild
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 24d96c6ad946..4175bd1bbcb8 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.40.0.tar.xz 167988 BLAKE2B 1d5582c1df506401ba09c60f3e41b2628e09c028dfea7b967cf021cb6a4926766332ec78f59edb703b5d77e9827c69f97b49c7f5e2cf19248aace8df4e3433ab SHA512 b934a4404717d2c47a28282937ef04e724e0b492e6838974765ccb3cd1ba62ac2d598c5e55e4e6cdd7831f521ae95c67dfeaab04353b89fb46393d9610d65e66
-DIST kdeclarative-5.42.0.tar.xz 170928 BLAKE2B edc99a7594952c5d69d8dec05cc41f0422a25fd1811343e13d61c2a953e5f03659ed4a11666523f0c83b4b593b3810927bc2d94199bf4bbf31232425938e5ce8 SHA512 da7feedb87131bbee2e526610dcd97ca557f5e4d0143e4664da2b210c727e85d300a768392f27cd115e9db750d34d7c524720ad39e84ec12953db653f832efea
+DIST kdeclarative-5.43.0.tar.xz 171136 BLAKE2B 8739a7a64b743b8232885d446a1692e774d13d35a2df031cdf44b3f8582875eff279c2c6d35e495ac661a1aea9fbc0b851108f6d9edce942a6a658f03be6e5c1 SHA512 5e9494adee19b40ffefbf006e318ba34302e073e9a22a94db255ebba2cec2e066df380063c7c617af81d0fc3f719753e2c050e6daf792f2f3a9d6c08163b616d
 EBUILD kdeclarative-5.40.0.ebuild 838 BLAKE2B fc7ef1b732dbfd16c3b33cd00e3656a18e4507fd4c468be2439d9548869f435bf10f573ecf27d721b27fc5c458c0acd818f559b24e172dbd146e5e44b76d7987 SHA512 adc429ba03e96a2431dc01b76f20370945fd2867b10ebcc4a4755f1831081bfa5eec53e30ea095568ff0f20f112aa06dced6629184b6efb2a211ef3b3fb57ff0
-EBUILD kdeclarative-5.42.0.ebuild 840 BLAKE2B 16f715a30731c95e086b8696ae24878e937269cff42708695179ce5a1da301b8a9ea4700297cdb770c7f81d42a615386342bf77fc59eb1b6d3502718e2969343 SHA512 8c6273f399059726636c5bc960ef7aab80770b7f33afc8d04ed7f6915268fb0a060ea6c8dca35a76813fc0e138d7273ed06e2fb2670f9e450185d74e48a39d27
+EBUILD kdeclarative-5.43.0.ebuild 840 BLAKE2B 16f715a30731c95e086b8696ae24878e937269cff42708695179ce5a1da301b8a9ea4700297cdb770c7f81d42a615386342bf77fc59eb1b6d3502718e2969343 SHA512 8c6273f399059726636c5bc960ef7aab80770b7f33afc8d04ed7f6915268fb0a060ea6c8dca35a76813fc0e138d7273ed06e2fb2670f9e450185d74e48a39d27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.42.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild
index 4076d6e93916..4076d6e93916 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.42.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.43.0.ebuild
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 6ade87435e95..a552b21f60f7 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,6 +1,6 @@
 AUX kded-5.40.0-obsolete-dbus-calls.patch 2320 BLAKE2B b117043acb993095e9519c651b51dea2f33d326fd72793c6429062fad6b18f83bbf2f02c3347a75a6fb9fca2f19a844fc9e48e7478259dd01aaf07cc57f9cc5a SHA512 23cc995c40ace5f1a9d6156d229c68ad3fd590cbb7f6ca58cd2a1a503acf8852b786d4d604ca2e9b8a5e4722e2a7f9179b4c27e765339ac5d1d3e61e966420ba
 DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8
-DIST kded-5.42.0.tar.xz 37744 BLAKE2B 59b9aa905d379f45c3b5c80522af158cb701b65cc3955fc87842d6bb680b90afae98ed01c93970df878919d98eb842fc6cff37fd704fced58a65163d7b1931bc SHA512 4be85b01fedb05f864d2711ebc5fb85d769a10cf7ca5e902eaf633d6fc9e574a771bd727ad4c94d25d2b18f8d3fed7d6f004ecc793fab612bc714e775983d073
+DIST kded-5.43.0.tar.xz 37736 BLAKE2B 9990d2eef361232971bd82fdb3956538d5eb4fd47df9d5863f64443fd90bc87eddab142f37ec64ee98303c033b8f060061600ce7c45c0279dc0e20956228babc SHA512 cb62ad4b0be13b103810a0396614da3a6137076041102a6aca5b30c477b5bab472298bdedd869e3476725dd21368075273193afd7027b9dcf1ad84594f6bbb32
 EBUILD kded-5.40.0-r1.ebuild 786 BLAKE2B 9d2ac90bc4c0ded693829c5eba8e7b89666d435140783eb0fbed84dfd6934476a748acbb5f0cedb0e5866b6358c92fee00502c5893e1d70e257422ecc91c5609 SHA512 c4f6d7ab6758c88918463919edfc4d5160977c157201af5cfd8dd27885b06bb331a207bfbb3c28e918d951de330754feb31d7d26f0ffea5815c0e2041c3fd6f0
-EBUILD kded-5.42.0.ebuild 730 BLAKE2B d59c107719ae86761236ff045fda245eed71eaa0593b28e27318f022bc1e2187248d6962a1180977be3bff1a8f7682015fc927070d950818c0f0d5424f2ff8d7 SHA512 a046039d2414126ff57beca58b0bd45f5e2da9c81641aab9b04137114f144c4c337d2a6c0b276ffc6cf20c3a0a125e85ee8ad831905cc5de78f1d8b4f5e84ff8
+EBUILD kded-5.43.0.ebuild 730 BLAKE2B d59c107719ae86761236ff045fda245eed71eaa0593b28e27318f022bc1e2187248d6962a1180977be3bff1a8f7682015fc927070d950818c0f0d5424f2ff8d7 SHA512 a046039d2414126ff57beca58b0bd45f5e2da9c81641aab9b04137114f144c4c337d2a6c0b276ffc6cf20c3a0a125e85ee8ad831905cc5de78f1d8b4f5e84ff8
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.42.0.ebuild b/kde-frameworks/kded/kded-5.43.0.ebuild
index 56820aeda550..56820aeda550 100644
--- a/kde-frameworks/kded/kded-5.42.0.ebuild
+++ b/kde-frameworks/kded/kded-5.43.0.ebuild
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index c44566a374dd..49fda97d6ce9 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,6 +1,6 @@
 AUX kdelibs4support-5.40.0-libressl.patch 8790 BLAKE2B 31d9bb613f355716990b0d332b1bc601a4f29047fadd867e94b430552ae2d6654830b7383d81d34ca5ec8618028a611655f20eb32fcaf1adbc796ad10121dda5 SHA512 a6c47354094326a0c665473a563bd0c24ee74ca5206bb6fecb661723cdddbf65c2d39860efb91f401fbb4d723638dfa89cfc20fe461ef8d4beb0c233e5b4d200
 DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1
-DIST kdelibs4support-5.42.0.tar.xz 3342008 BLAKE2B 629517452e829eed3ec90d2ad7d6bc20f4bf615fb8570d3ec15a5d7121da4cfd1b22509b52ad344a257fdc55a93866028bb27bf842733eaed8a5bfdd6af5a991 SHA512 eb4ea8ab7828197615ee35ebff259c30e52142cc8cbd964e8cc7fbd9745174f199e3c53b2bd3d31a216f16ad3eba06806c669b3d4d6aeebd2b89c8a124737994
+DIST kdelibs4support-5.43.0.tar.xz 3343312 BLAKE2B 96a73c18df4110c4a51d78114ef8e10311429c280582bdd9e95a73c4c809157706e565ea33e14cb8f3ce595b1d13d7c8348e3212e1293896ae556bf829f2a641 SHA512 bd73459e5334a1158f68d2af2032fa9236bae303c2c45ac9c3b46ffcf46654f9175fae68222a7cfb3398642634aa21fd023f19f0318af633574f448bfab8e467
 EBUILD kdelibs4support-5.40.0.ebuild 2149 BLAKE2B a73f8b8ef0a28e9dcd65229756329ff1c49a4e3c5aa74f2b1a0b8f597a6cdb43c2abb23cb9d4b708344bcef883c76fce4f8f1b3af8ffa8c5eabe374f524c195b SHA512 ab8b693e5f1311eb78f615176b0b36d64efe6b65f1b66e59cbfe7f4bc3ebf8352bccd39c08b2f15e8a94861e2620f1f70bb92597c682b7b98b771221d776e47e
-EBUILD kdelibs4support-5.42.0.ebuild 2074 BLAKE2B 9ad6f9bfe8d8a63f0eff7bd2416b08f8fa5749e2f823f4c5a7e1b4fc74be9f31e594c130b54e9fc1af7bb1a343e4ee005c8b267bfb57f29a29440cf3453fefca SHA512 e7f612bbb97d69eb0201e4bd25c116e7455f3486e2d12591e56e50cf6fd0268c76e6a1d8432a17a020a72407d71ee73af84ac909da20d2106d771e664a33c7c6
+EBUILD kdelibs4support-5.43.0.ebuild 2074 BLAKE2B 9ad6f9bfe8d8a63f0eff7bd2416b08f8fa5749e2f823f4c5a7e1b4fc74be9f31e594c130b54e9fc1af7bb1a343e4ee005c8b267bfb57f29a29440cf3453fefca SHA512 e7f612bbb97d69eb0201e4bd25c116e7455f3486e2d12591e56e50cf6fd0268c76e6a1d8432a17a020a72407d71ee73af84ac909da20d2106d771e664a33c7c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.42.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
index 111c1d3718c3..111c1d3718c3 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.42.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.43.0.ebuild
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 4d1dba787094..54ef24892bea 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
 DIST kdesignerplugin-5.40.0.tar.xz 90812 BLAKE2B 2b1a0cf79ab47f228aa3234f11e613e91e1b3543bce471cc61f06193cbb4d41b817fae78fa4f01625d87a5eefdf13edcd170a216e3c90954fb0c39a1111bf3d7 SHA512 e9874339ac1d694f249a20fe86504b776959b4e225b5377ba27df8cea14ffd35a42516308cb2daef0a9595c0f57ecb1328c35778d00fa05add19f7e5cce4dd99
-DIST kdesignerplugin-5.42.0.tar.xz 90736 BLAKE2B 5b36f5962a1af0b8419e3fe5481bd98332cb1264d8ac38e41a67ee6f180fca6729b45ab58be361848f1865cca82a8c0b255fcda6c3a72489c0f21402a92b9f00 SHA512 060678e1d670df0acbebbba1c313ca970c21d7ba237d1460379999e13563d164b5a1ac52fd1cd9991dcc11f3463cd58fb80c60458388d10b2c8cd415e10cb390
+DIST kdesignerplugin-5.43.0.tar.xz 90752 BLAKE2B 411abd7413ee1217196a48d9cb757a1bc9cc260c6e3cad94bcdfea37d5c8d8a7013c61063331dbd1181ef2b172b00c4d73b71fcd495410b999c7d4f6803c458b SHA512 38422393c7a061fada3054fd511bafa3c2d529fe819c86854cbf48db1ea92ec2496fa3df947a985f029d5d3110fae33c89d60b853d59a601f6f172f5b15c0684
 EBUILD kdesignerplugin-5.40.0.ebuild 1440 BLAKE2B 43856c7ae1d5bc3b6492cea23348b67cda7fc696a6f54771d905b445e3620727d2d18ff331c1fe0206eff41cb9d646779d9a0d121682a50f83f54edc0169f7bd SHA512 76733eae5aeb0bae9869dc4cf7d1e270de6b03d155fb59765b6ca7557af543a02b6638f7b83bf6a7fb43a28874ab6d610f992bab1743a65dcfbb82aaa1e94307
-EBUILD kdesignerplugin-5.42.0.ebuild 1442 BLAKE2B 2375faf6f71b49436b9466cae0333afd2adac41f422a10570a09eb8171597ec67d4a0cc911b54607df9e70078bc371ee67389b940c5dd9328f3ee0304e6b52b5 SHA512 9c54c99c262a0692b4c83633cf44e1fc683808f4e91c3ef6134ef7a3206b5df1f9322733a31f33403da83b0eead99ea47d33c876a35b2ef61018a6fdff386e1c
+EBUILD kdesignerplugin-5.43.0.ebuild 1433 BLAKE2B 82037eeede19140a8281b2e3c57cd40cd56ebc32813dfc65772cf388339ca0aff4865ed7deb944165069549889ef5a6428d7800d75aeb0e7b3011a83ed43c16c SHA512 7df8f368a94f1298d213435be879d71e41e4fc5e9b8c74e6cc3626684c42f1023833d92007405b598a999f8e96eea4c51db0a2ee229359d4a7e2df199e586b2b
 MISC metadata.xml 402 BLAKE2B c6bd347d2ec708beeff1a5e62dd8b6915a884afb3810841adf5bda651d5fa2caca0f3375e63d01e4af4b87fc955b6df0483d569746ece2d8b79948fd3b009b1f SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild
deleted file mode 100644
index 1f32a3140029..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		$(add_qt_dep designer)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		$(add_qt_dep designer)
-		$(add_qt_dep qtgui)
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild
new file mode 100644
index 000000000000..6690b0297aba
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.43.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		$(add_qt_dep designer)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		$(add_qt_dep designer)
+		$(add_qt_dep qtgui)
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 5a77c8fda39f..49af586a6cdd 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.40.0.tar.xz 45172 BLAKE2B ad77dda07ce78fa1042835f43846e992bfc3291570ddc91cd05331fd167b4be2f62515d7e65b498a62e57759761bb8be0ab98440cb63199954d4ec2f6a571034 SHA512 53ecfc0388a8246ec6b29de63ddb580071eaca33f7b1806e77b1200d79bbccb2bef38e4b482f0dd53e4767c873dc64d8cceb03d9ae75be41e8fe5a56ec90ebf1
-DIST kdesu-5.42.0.tar.xz 45080 BLAKE2B 21c95951400d33fc58f3bfd85c6c0442d6003cb559833affa7d3c8167eafb898c1e5c77bbd8511ed8a88044f2db1464b69963193eb8cbc2945c2bfa5f680a2f1 SHA512 f0321834692439e62e35204a7e301f4aa8c20d9798522dc1c2ea969a493505a71e8fd5b1b41ab7586b277606f57cec41495bb683130f78d73f556e48fa012156
+DIST kdesu-5.43.0.tar.xz 45016 BLAKE2B e17add21fe42bfc60d5f6407033225bec901be8a3a4b7ae5c5f05012146f4cfd791770e8a829776636d7c4dfd8fbb3d963fdf56d6f00134d95f6de1fd7e600ab SHA512 efed4e7583b2f862115a5a016c647bbe0a6043027a0466d4237f7c3e0c0b2afc8995ea75ae371e0c73a7d550628d3713adf430173ba411d958d807fed35cbd38
 EBUILD kdesu-5.40.0.ebuild 603 BLAKE2B f8ff986c695b577e5894a766567b286bc7fb51fc61e14c57183d3dffbb9e841d2b5b13a4dfdee2fe036b5469a97acaff6bb68a3c347b17a71f1cc73a89921a43 SHA512 75720b6ab8f88d7b73cd43225c5f8bf164f1ee890ec8fb8899dece6ee152f69c6313c524bd6cfa99f729998554ce54691e9000157df0625ba0cbbeb61b1cb22e
-EBUILD kdesu-5.42.0.ebuild 605 BLAKE2B 8496a0d9fa809057d5a0ac2cd76a266519bfc45b433780ddce6d11a9b6b44ae490e9ece9de0fa7d8e885663ee5706f4e6a0c8fcb8d3abf7ec037a3d6c6d9ff8d SHA512 675ad4d87a86179039f888f2e1a9ffa8ca3d27fe5f822193c35286001e07af8509b1188da1c668ad161a17b31e64fbe99430ad16ef4c0ce731d00ccb8c8bea57
+EBUILD kdesu-5.43.0.ebuild 605 BLAKE2B 8496a0d9fa809057d5a0ac2cd76a266519bfc45b433780ddce6d11a9b6b44ae490e9ece9de0fa7d8e885663ee5706f4e6a0c8fcb8d3abf7ec037a3d6c6d9ff8d SHA512 675ad4d87a86179039f888f2e1a9ffa8ca3d27fe5f822193c35286001e07af8509b1188da1c668ad161a17b31e64fbe99430ad16ef4c0ce731d00ccb8c8bea57
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.42.0.ebuild b/kde-frameworks/kdesu/kdesu-5.43.0.ebuild
index 77596093feb2..77596093feb2 100644
--- a/kde-frameworks/kdesu/kdesu-5.42.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.43.0.ebuild
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index dd11fd2ffaa8..a2b8a45f350b 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
 DIST kdewebkit-5.40.0.tar.xz 29392 BLAKE2B cc67ebaa82c35c673d0f502c3b1267b52ced914bf6b7ab1d676fffaf34cfa41255333b81f55443474f9db77c5a477e4429c8d3790f5f2ab8f5479f1b50d0b262 SHA512 4074dbfab85ca4421b447eb1ad5f262bb54d79d98c934ad57a9cb35f7c624e93af8ad22ee4979404c6d743750b8fca85f4c7533f4cb577356e0d011ff75c06a1
-DIST kdewebkit-5.42.0.tar.xz 29284 BLAKE2B 8d32ad876aa2076d7ce4b92be4092d790f3b99f2efc59abaa4922f0fd07d9e51706d1ce3ed1f3cf2349b55d0dd87585903450f8eacf0562dfa2f52e7d7b51806 SHA512 1c53af251ee2d96cda6244c148c2595a3e28c50e3481a75d08c056ff18a5b001982ba677e31d4e2fdb41c3adb668f45b8582c80844d8a438eb3ee8aec686d744
+DIST kdewebkit-5.43.0.tar.xz 29296 BLAKE2B 06d36541bf444055b773fe9ff022416204aa1518c4336a6334d8f6b9a61b14391b23b26870d145c135573338e759142e4ae97051502bc522124b2193d22ae5cb SHA512 eda64ac826d2c4abd3b4d5ba9d73064d7c0ec38b91f1ccb68e69d14066f453b2ef43e68e89dfd4f694efe66fccb94a4589891af6a521b93657c98db6ae94de9f
 EBUILD kdewebkit-5.40.0.ebuild 662 BLAKE2B a6a84e0bbab98f12c20737905b18e4c1e276376f3286ac8aa88331d4a87d5ec0952c92e15ed64f36445f6a49614436ba17e79fc5fb830d4c59b92fdf9b022dfb SHA512 5cff01874a04cfae65074cd8e61e1ec7bccb9572c594d9be8c63bdc74eff8bc96047caa6a8088e3ca6c9cef726ab94e5fefee660ea7f850fda93029311cefdc0
-EBUILD kdewebkit-5.42.0.ebuild 664 BLAKE2B b9dc7852e095918c65ebbf038521af47c6790d53a1f74bcf8a6034187c5544e7a40fe17eb4440572de2248cb119d7fd724f9907d0fc2f3d937574f069243fe3b SHA512 869bccd6cc304c2c5a07320f4f98049042a95ab39002078b05480e7898ee30f08b959d0d6de68d8309cd5276bf6f60c74af12837a9e25adf91c7cc1f2522e460
+EBUILD kdewebkit-5.43.0.ebuild 664 BLAKE2B b9dc7852e095918c65ebbf038521af47c6790d53a1f74bcf8a6034187c5544e7a40fe17eb4440572de2248cb119d7fd724f9907d0fc2f3d937574f069243fe3b SHA512 869bccd6cc304c2c5a07320f4f98049042a95ab39002078b05480e7898ee30f08b959d0d6de68d8309cd5276bf6f60c74af12837a9e25adf91c7cc1f2522e460
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.42.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild
index 1fb4c4ccfb80..1fb4c4ccfb80 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.42.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.43.0.ebuild
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 105f63166390..bfef213e5fd4 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.40.0.tar.xz 56676 BLAKE2B db806d3a416eccd33cec8282c08a2443dec1f5e10e392e244c407597cfdc2ffb1ea52633b1414f71d9e80c285ea88f19363b56768e5550f8c406682f17646e75 SHA512 409860a7ffc753780c26d62c89dcade8674393edfcbf817403386f437f23e9495455e6c29c179901820bd9eec5fe3d7622d12fa2d0b06f79ce8f0a4664a36726
-DIST kdnssd-5.42.0.tar.xz 56652 BLAKE2B d702ef866c51d31820905cae53b1f5cdac13c71682460d56d9403b70fe1b1822319aa8c5a1e3f3f6387bceeaebc5d280ad7f0f04f91e47f358d4e14337c92496 SHA512 40e48758642c68b83d3c94e3b0a1c747a2c40510dd7b30c0f65f37bde0bb2fdce74331123719eb008f6f6702cecd6454b405eb6c1d5417e1861b25167ad78b85
+DIST kdnssd-5.43.0.tar.xz 56648 BLAKE2B 941821bd824934a3ae573e32b67d2cf081538e1cf071aee486ac6daf74d947535d4dd70876d64458b533b03d021e7ede49c0f502e95737900d579d97513b9ad3 SHA512 d84714e0d9b247f719b4c8d82c8927a132c98d8261d858fc6cbc2d1be619daa4d64f513d0c71d626e63ed887639689436cc593c8024b07d583103cb2537402b3
 EBUILD kdnssd-5.40.0.ebuild 600 BLAKE2B 17e11c218aa81069dea4385ef6409950b7e83010da29a34f710df8d9cf19f059921c8c66e51efff3dacd61e7b9e114182882d06f920d09ab3e6ea4e401aa8ec8 SHA512 a77faa85612c6b5d96956452dee7eb7fbeff5fb5d78955dbc968a555636532dd3a752b2f75cd02a1a17a585cf22ee6399af9c27d25de52168eb39bb7b3a60c54
-EBUILD kdnssd-5.42.0.ebuild 602 BLAKE2B 9b947562cbfc330f5b1d8c1226f6ab6e0e24e95ee2b23d3c2f1e95534caf7d391c381bd9d3a222340267bf1c92426386df07e0bf5cd30ac439e09685c0451d65 SHA512 0f1fd8a29d7fd707e52a39d46e154ec04c1531a4f0ab7c47f7384bffc0bbd8f656156d72fcdadbca9856f36dbb9b35a80de4896a8b4f34bdc624773526256793
+EBUILD kdnssd-5.43.0.ebuild 602 BLAKE2B 9b947562cbfc330f5b1d8c1226f6ab6e0e24e95ee2b23d3c2f1e95534caf7d391c381bd9d3a222340267bf1c92426386df07e0bf5cd30ac439e09685c0451d65 SHA512 0f1fd8a29d7fd707e52a39d46e154ec04c1531a4f0ab7c47f7384bffc0bbd8f656156d72fcdadbca9856f36dbb9b35a80de4896a8b4f34bdc624773526256793
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.42.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild
index 4abdda53e524..4abdda53e524 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.42.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.43.0.ebuild
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 4a45c7e1d482..ddc77e1e8886 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.40.0-pt_BR-fix.patch 1233 BLAKE2B 7be5ab8eb1288a41062176ea9fd6b492faedab084bb4fca8439651deae8fe54f59e3611b78dd3b49930abe3e5af3e7b60842fdd98ebd672d18ddbb1afffa815b SHA512 985a418fb078dc697c20ef31f5b9f4c1c84e09d81703035bb2b142ea7086d2cca97e1426df6c8172502e877fc17d8377a1ada7abdf88f49d76a3b6e05a594695
 DIST kdoctools-5.40.0.tar.xz 421668 BLAKE2B d3dc3dd85b8883042064ca68f9de9d575210adc0055113bb9cd71a5086edb732897039b29ef47df0861b9bb73ed5493e2ee146420e53db9237ae7f6592e40f9e SHA512 7279a2bbb01c9b6e31e4c7c1b9b5b1a14d9ba8ec78e63d4bf635838fbf01bc90e88ea9eb0788886548cd6c031b6c7d270c667c13f2c14d4fda6a786bc94d641b
-DIST kdoctools-5.42.0.tar.xz 421980 BLAKE2B 3624af67abd95d6bfa2fde810efc566fbeb4a6b338c265f9fec1d80ff1e854b8d01e65ec0b9e546afd2ab78b6f6f68b16d4e028b705aa9f77b5fec1e64962029 SHA512 347fb09e2e13bdffb1d1daff145eb1f19f563efd121dcb946576bbcb27a761b4ae8575a12e1a378a1fc0151e02b825dac144a2e19c6214ede6954a8c8ef7850e
+DIST kdoctools-5.43.0.tar.xz 422032 BLAKE2B 6eb0261193b0ce3c8cc0835ae15d0d16d4009f98b1ba02e562b43f9147abe33695d63d37a772bab9558ad6c8cc63efb7bf35b263399e54b771c64ecb22112b36 SHA512 af93b4ab7966246b38933eccd02ce2dd02c288e3f582c9b3e14e05aa03293c32ae78c0b3cda6710012faf368de4efab5d06ad3df8e279d1dda967d2860d5e62c
 EBUILD kdoctools-5.40.0-r1.ebuild 605 BLAKE2B 355bae4c78774343c0ca564f540e4d8c42be6671e4bf53b19948ca2a9c19804cd5553d855ba17c631387dc15d2a7142f2d1fe5a8aff4336a450a3bd714ba4ce5 SHA512 4cf0287b8f761b34c79945852279fb3e8584d68aaee135988c8fa2a8917d4b3b5c4bbed18ec7715bb4f8170ac2e774923b42a57ff72cd3a7653fc5e4dde26647
-EBUILD kdoctools-5.42.0.ebuild 509 BLAKE2B ada2440d5d4d13f53ba7cd3bc33fe4c2d4e129eac496d640383b6509492be6c2f0709ca8639fc8a9961e5f16412900f14fd973582872ee9ecd142b7119d675ea SHA512 defea11e426d4388db65acf493fc67b0aae8cf870edf31f9a8bda8f64b7c31d597079cd0990d5d74fd0e4cf78bdd130831895d2858cdee7cc9173a5159491e41
+EBUILD kdoctools-5.43.0.ebuild 509 BLAKE2B ada2440d5d4d13f53ba7cd3bc33fe4c2d4e129eac496d640383b6509492be6c2f0709ca8639fc8a9961e5f16412900f14fd973582872ee9ecd142b7119d675ea SHA512 defea11e426d4388db65acf493fc67b0aae8cf870edf31f9a8bda8f64b7c31d597079cd0990d5d74fd0e4cf78bdd130831895d2858cdee7cc9173a5159491e41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.42.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild
index 02032df43e84..02032df43e84 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.42.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.43.0.ebuild
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 9856a808a169..ab8574a0ea89 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.40.0.tar.xz 1695752 BLAKE2B 18622f98044f1930822ed5d40fb0331b8ea15ad5bbf68b0d42c98e8f6ede97348de22d4e6f9cadd2c14ec06c2b82b20ef975bc6191a484f999b10ce5b99df817 SHA512 47dc8f65f29d297a3229fba0a63d5f0eb959fe072e44dfc831f33b4a778cfae1f267abe6cbf264a69d3ea677a8cd2d94898ba9f7e0852bfcb7573b368cb1c289
-DIST kemoticons-5.42.0.tar.xz 1696168 BLAKE2B b3583e87eb3a152f18deea161dcb2ae7fcd416ea1af8713e84f5456768e34c933c069625e1d184799437ae243079c46d7c2bfb9a33592a8d26d1dfe3f5e67a5f SHA512 72015859b74201a3e6f6cb38863fa53ad5fa753f0866147c6c6a76edd8b637d1903ed2e0ef0d581ae191dfc642acf626ab010e6f72594f13f294e7c71da8bcd9
+DIST kemoticons-5.43.0.tar.xz 1696184 BLAKE2B ef8322ffd50430630d46790f9dc2130b8081b822d5aa79225ea2790ad3ee4bcb916d124ba9d283d0dc5df7003dd6b6b3131be56f3654c71826b0dee8f88642b8 SHA512 130011a2158f5d84ba664354900e23eaf8867623eeab0fe018c6b8c60b3fd413d3f5e1ad43a3fe51dbc0153bec3e8c14d88b7f06f82d873c2d7f2237441eb8d8
 EBUILD kemoticons-5.40.0.ebuild 580 BLAKE2B 03e302f6ad5226852ce0710d9d4fd276718ab26ec384526683da29be0524fb6cf2ccea31e00e8c2ae73d5b4f10150d47b56ea9ddd12b078c755ed2c561949782 SHA512 e673b08ae402da0f5f7eef32a0d652ca897556c3d1c4cefa412e7276152ed25bfaf3748e20780eb7054599f23a14de865b0a7fd5538d015d7b44d29017dd3d6e
-EBUILD kemoticons-5.42.0.ebuild 582 BLAKE2B f7f557358069e8601480b79b5e61ed0427479e3d3e3b6180171042c7ff435e33edb7697652624b6874e1d21537c0eff78921a2e694489bf8797aeb4c2bb3c849 SHA512 bf636755a1b881c8f399f91dbc232577d7427aa5bc108d6d01a4beb1d9e3808e1b95da62484600f76b12c3c384d330026cb02e060801cb6cc86ac85552f1a93d
+EBUILD kemoticons-5.43.0.ebuild 582 BLAKE2B f7f557358069e8601480b79b5e61ed0427479e3d3e3b6180171042c7ff435e33edb7697652624b6874e1d21537c0eff78921a2e694489bf8797aeb4c2bb3c849 SHA512 bf636755a1b881c8f399f91dbc232577d7427aa5bc108d6d01a4beb1d9e3808e1b95da62484600f76b12c3c384d330026cb02e060801cb6cc86ac85552f1a93d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.42.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild
index a3ab980b96f9..a3ab980b96f9 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.42.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.43.0.ebuild
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index a241aeb91bc6..ccd58540f00d 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,6 +1,5 @@
-AUX kfilemetadata-5.42.0-xattr-header.patch 1287 BLAKE2B fbd50deb4236630eddaaed84c3ea89c8b4a41efb1ef5c960f7668a03a5bb6f152239cc88e6e4d3957986f21ec4958ba202cee5c43fe97191f3f169f5443d89bd SHA512 f18b3b336b913abcb4fb6428aad9a4b32f094f1760454d9fd366d659889fda3bcc549f0ce81bdde084cc40d95db013e9fd869927c1d579d386d1e040f7bd7621
 DIST kfilemetadata-5.40.0.tar.xz 219196 BLAKE2B abeda591043350e1b11de352f897f76110b1ea472ccfc210739c68d50715fb8687fae4d9c6281c48592f563a82ad8f454660349dee020a80bab2b967e598367f SHA512 b3f632af0847dd3bed8bf0214e3786fe72ffbdc90454d7a2117e8b30023c43b594a27c5811a6e77d1e46a68261e950a5dc016b9ae6f80f3db539c29eaa53297d
-DIST kfilemetadata-5.42.0.tar.xz 218916 BLAKE2B 03d5ac621d4cd032ff58756069861a045c5a2236ad3c1dc75f82cef9b6dc3eb7c263cf98865899a4d69c31582afd221373a07ca8538c718ff6ef91c2b7267547 SHA512 496876dde432e0884b883e112daaa11c2fe85d2a97bde2124b04571e4f9d1516cc81ef1d80eb3043a5d43f2febe79481f1a2c299ee9e96883342f8563002c62f
+DIST kfilemetadata-5.43.0.tar.xz 219608 BLAKE2B 5b344ac9990e399cf3b4c8b28b6667e902691541672e811295a7e3ba16f652b4e8dc10728040d2ac60dbc7778e5bd27e64b38ed8f2116589a9899b9b5b86f5ff SHA512 0e669ae832aeef2a54e6a26df5541d607301e13798082e716f6caf682d4e28d87d7eb0a4487c7f2c8bfee0311a5a3342238dfa806413fccb20d3cfbf6b8733be
 EBUILD kfilemetadata-5.40.0.ebuild 1613 BLAKE2B 174f3bb47d94cb4af9c302d0523e21436f1f1d0c9f177ad2b157346b1ff8633db8c429b795c5c0ae539870d9d893487d34b499ccdbdd2bece9f96006cf561e58 SHA512 65aa9bbfa840db315245a0cfbe9ad51ac4d791fec92d1d7e29a9fa91189703a962a9aa530220828efaf0e4a3e3af09b617ba22280440e89ce46481a851b6760f
-EBUILD kfilemetadata-5.42.0.ebuild 1536 BLAKE2B 6e77df2ddde0969548b5fc84475b1b507c87d58f246c3ccd9307b83bf955080098560915704f1eb74a942ce4bd0e17adfce48b8f5d54748d6a8b7e7485f8b888 SHA512 0404bedf61583d6f844f8f037e140676d8b7a4c303eebceca9db7de09fe65bce6c4f218beaf5934af78a2a2b121cfbe9f5124b7a21329fd543cc890b4f1f5d9b
+EBUILD kfilemetadata-5.43.0.ebuild 1629 BLAKE2B ac85f92e0de0a01162b6acc7b6eda254d0c1f0b2357b140ee4a30d9bc7bad12d44124d0e95b847ae2444147eb3ef05e489b596c67dc37ef163aea5303bfff181 SHA512 05bd952011ce8ca0fe029fb7a5fa09a5a503d3ff689316776f77244af29da79f53fcda3222e201bf984f6996dbacc67bcbf636958b78c0b142c24f06823223ca
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
deleted file mode 100644
index 4d86297b19ca..000000000000
--- a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6de64a4e3f2713c0096eb7ee1ba52e5fbbbc401f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 14 Jan 2018 22:29:25 +0100
-Subject: [PATCH] Fix build with >=attr-2.4.48
-
-It was looking for long deprecated attr/xattr.h header.
----
- cmake/FindXattr.cmake | 2 +-
- src/xattr_p.h         | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/FindXattr.cmake b/cmake/FindXattr.cmake
-index 3004061..a33f316 100644
---- a/cmake/FindXattr.cmake
-+++ b/cmake/FindXattr.cmake
-@@ -13,7 +13,7 @@ if (XATTR_INCLUDE_DIRS AND XATTR_LIBRARIES)
-     set(XATTR_FOUND TRUE)
- else ()
- 
--    find_path(XATTR_INCLUDE attr/xattr.h
-+    find_path(XATTR_INCLUDE sys/xattr.h
-         /usr/include
-         /usr/local/include
-         ${CMAKE_INCLUDE_PATH}
-diff --git a/src/xattr_p.h b/src/xattr_p.h
-index 4663347..542c021 100644
---- a/src/xattr_p.h
-+++ b/src/xattr_p.h
-@@ -32,13 +32,11 @@
- #include <sys/types.h>
- #include <sys/xattr.h>
- 
--#if defined(Q_OS_ANDROID)
-+#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX)
- // attr/xattr.h is not available in the Android NDK so we are defining ENOATTR ourself
- #ifndef ENOATTR
- # define ENOATTR ENODATA        /* No such attribute */
- #endif
--#else
--#include <attr/xattr.h>
- #endif
- 
- #include <errno.h>
--- 
-2.15.1
-
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
deleted file mode 100644
index 5b26202d02f7..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 eutils kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="epub exif ffmpeg libav office pdf taglib"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtxml)
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	office? ( $(add_frameworks_dep karchive) )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package office KF5Archive)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
-		elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
-		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild
new file mode 100644
index 000000000000..eed8f6443f9c
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.43.0.ebuild
@@ -0,0 +1,63 @@
+# 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 eutils kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg libav office pdf taglib"
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtxml)
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	office? ( $(add_frameworks_dep karchive) )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package office KF5Archive)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# FIXME: bug 644650, fails on tmpfs (but not for everyone)
+	local myctestargs=( -E "(usermetadatawritertest)" )
+	kde5_src_test
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
+		elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
+		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
+	fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 3f0adf308737..9ca79dc0e6a1 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
 DIST kglobalaccel-5.40.0.tar.xz 83628 BLAKE2B 774596c4b6c29cc208053b54227093120e1cc7efbb794f29d260626cc5337587f62537ffd3ec9269338fdeb417af0f538ad845888cd8345b08410ac5b181c2fb SHA512 5b4a5d557338eb149257448cbabd7df9d7969ce2d977e13a4d104fe4c21d262b952f820614aad9012f6d4c2d28898f4d77daa4dadece39275383e35b6a84e9bb
-DIST kglobalaccel-5.42.0.tar.xz 83824 BLAKE2B e799b78b11aedaa42295df445a1a5951cfc5c30c781468a2cd6dc0a7592204e530d3c6927bb0c7bc58a0db67c0dea2026c35535a80c3e72732bdf7c32fd02a86 SHA512 31e9528e8823d69a0a80ee504225bd07860f91becc3aff4192a82f81dfe5b63beb895390eaf386a9e589bb7b7bb29787a57621574aced39b9d1d58f5f6ff649e
+DIST kglobalaccel-5.43.0.tar.xz 83816 BLAKE2B c1fa3aed1e2a0ae9b426b8e53f3b6cb903e329e19eb2efe3add7b337d8383901d2d578114861f0aff00b511d327f9fdb806795879cb2945fd4e389267ab89ee4 SHA512 1b10d9e5c454b1a4c9fb2553fb1847e30ada2b36050a4fd13637c9a1ba2cff642b19c2934414fc5e104958856c0d0dae4d20b8fdb6f51454125b0e2941fd1d22
 EBUILD kglobalaccel-5.40.0.ebuild 650 BLAKE2B 2e13426cb410f90a2d45f3b287c62b8bd24e0a3acdb3b7e2b8f8fa2f5ca5d44eaa34a8c89866ce927bbbe9b68011c51d3d0beff149c9ff32c0dd7edc380ac3fb SHA512 cb0481f8e14891849d4f654fd06f8e9de71136b5b8e593a1cb1f67a132a2f7091b1dcac02539079a6612f6146ea993af3fae75ce5f1e97aa214d6acd97f041ab
-EBUILD kglobalaccel-5.42.0.ebuild 652 BLAKE2B e76866ad28a82d05aa8aba479c578bbdc637cbd886d40d9b2c431a23a0c3a3ba515cdfeafc77fc18f360f0a66f27eefb50550b922f5b5a087671fc4c55bab12b SHA512 6bf39b923fa8e7acfe2187f4aa79d37eb6760daefb95faec21c92e8fbfdd37957d89bdf5c7d643dda0b2437746c3497042e433b8fbe44a85f3c8e2a2862fac42
+EBUILD kglobalaccel-5.43.0.ebuild 652 BLAKE2B e76866ad28a82d05aa8aba479c578bbdc637cbd886d40d9b2c431a23a0c3a3ba515cdfeafc77fc18f360f0a66f27eefb50550b922f5b5a087671fc4c55bab12b SHA512 6bf39b923fa8e7acfe2187f4aa79d37eb6760daefb95faec21c92e8fbfdd37957d89bdf5c7d643dda0b2437746c3497042e433b8fbe44a85f3c8e2a2862fac42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.42.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild
index 5e6065dfe91d..5e6065dfe91d 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.42.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.43.0.ebuild
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 87f440266f3f..230c2112cde6 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.40.0.tar.xz 40180 BLAKE2B bf8133a926379096e625326a5bf2bb2ba6b347ce8f0205d4bda3378e433e1a1cab838f35da34561fd7781de3941ec21cbca427168a3e1d46c874ff99b98515a1 SHA512 42543c4b29355d5998abd4bee14530a9e96b7d3f4378ea11952af67a157be23acf45b5c801e80909546e7903c73df3a650a05fa6ee8594a2cbe9e8ce66146976
-DIST kguiaddons-5.42.0.tar.xz 40104 BLAKE2B cbb1ed7e3f0c25b9d680cd8997e721020369e1f8cdc28b2be8f9ea74c88d78a97dc442efb25b7b7bd6d9a6adf8038d210bc739c1345b9b0133d208083c853218 SHA512 b67f88b897bd385541b3f481af899ac27fcbccde92e3f4699955e179fec290340b7f196b3753619cfac284d203f9e6c13d3cb8ffa6990ae02f87c044c7a056f9
+DIST kguiaddons-5.43.0.tar.xz 40100 BLAKE2B 8730eac13e790ab3baf80e7c6c98c152ade022401651851f4cec3bfcd96db99323937d03e30b546cbe37bc6241c2ccd1ac9109ee10d8c70e6c0671ed30ff04ee SHA512 ea560ba016914037ddad6d07da849a1f9b20d241a7d5e21353237e00e960d5ca5005de3bc95db67e0ff1d432b0a52b99e8d7f85a0930ec40ff1fddf932a15e41
 EBUILD kguiaddons-5.40.0.ebuild 428 BLAKE2B c8dcb3a4098222f57b7e3b7f49ad11811c0b679180ca73b03fad9776fc3ac432125d1f8533c8bc5b726d15231752bbd68303393a15776b543aa04f82161c7ac3 SHA512 66a0bddc26607413242606d340e7b4ab80a28e64f103d450fdd9fcea18c665d119c75e4fb896da4863ac1fdef1305a380365b33dd98ea1b9cfcca6f9967ba288
-EBUILD kguiaddons-5.42.0.ebuild 430 BLAKE2B 0512562c5497975d8d6d48e8f812f8e8848d3dcc26f8b2aef100169eba046f0c98b0242403c45f315968962c5383f1e03e9fd6aff0b1ee550c95fd143062934e SHA512 09e88fb5f5f44121a7ec8fd6de3892e4e331471e91b8a7b732264d8461c631bb8adcab3f038fb73ea82aacb9d80c2ad2432e6ba101c7fb2a668e2288cb76ee42
+EBUILD kguiaddons-5.43.0.ebuild 430 BLAKE2B 0512562c5497975d8d6d48e8f812f8e8848d3dcc26f8b2aef100169eba046f0c98b0242403c45f315968962c5383f1e03e9fd6aff0b1ee550c95fd143062934e SHA512 09e88fb5f5f44121a7ec8fd6de3892e4e331471e91b8a7b732264d8461c631bb8adcab3f038fb73ea82aacb9d80c2ad2432e6ba101c7fb2a668e2288cb76ee42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.42.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild
index 68c87545da44..68c87545da44 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.42.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.43.0.ebuild
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
new file mode 100644
index 000000000000..1e6f0a0b7a8a
--- /dev/null
+++ b/kde-frameworks/kholidays/Manifest
@@ -0,0 +1,3 @@
+DIST kholidays-5.43.0.tar.xz 197168 BLAKE2B dd6657f133ba2dfccae686ddfabd2da88193d27312c739a5c6ecdf440957e38d0490bb9d4eca910362e8d7b595fce815a634bb9484f48a858066c6ce81c1c18e SHA512 57e82a4ed8d7de87b48b3dda3db915c0944ce2eba87cba6143aa509ffa8fe7f877b796c064d6fccf42d5d6e9dc624cfcd3a34e429c705a6dbf9bf626c09f9b1b
+EBUILD kholidays-5.43.0.ebuild 670 BLAKE2B aa850acd6bce28b47d064561f1a3e0344baa720921879a38d107de29e62180968f010924c0f8becf8ad41de42c5e6d7437adfffc2014a8ed19cf9c42c206fb6c SHA512 1faa2d177e7748b81fa92464a6b2150aee7ac79feb86dd65a2775d14acaf65b0524b0d3a5eb094be435aa23dd90b1dfac5a6456386ed83ede4dcae8183938ecb
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.43.0.ebuild b/kde-frameworks/kholidays/kholidays-5.43.0.ebuild
new file mode 100644
index 000000000000..1fbb3b26dce1
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.43.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kholidays:5
+"
+
+src_test() {
+	# bug 624214
+	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
+	cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die
+	kde5_src_test
+}
diff --git a/net-dns/cagibi/metadata.xml b/kde-frameworks/kholidays/metadata.xml
index 2fdbf33d963d..2fdbf33d963d 100644
--- a/net-dns/cagibi/metadata.xml
+++ b/kde-frameworks/kholidays/metadata.xml
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 2c6914173718..fcbca2b305b5 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.40.0.tar.xz 2081588 BLAKE2B 14fa9c0bb27263bdd4be9663575569a7ceac8f7699cdc7ac67e6a9df7464549155d7348b51490cabd87e1e0b8028cae361f7d88bdf6e90bdae015c05739c9cb2 SHA512 e64cc9c32944c6cd1f45c745f4e653ca1b6023061ede3ed87886e3ed95e9d2d7a7753b396631d256b7f1a4c34b788e9a9b80253f151f73b3fdec3f862f8adcef
-DIST khtml-5.42.0.tar.xz 2082316 BLAKE2B d629b04d72864f0ff277394af74cf5a948e0857554e6b926b73c87ad588ab88f934a76095d4cd93b5d44193a73790b27ccfc330dff4f4b8aba804f9309129f6e SHA512 f3bb46d7b44101a55df6ac54254c1e00c2e8d719de6f99870879f752c037b11cb5b466cb9ef387a2316323324061d5e9c3dc5fafb1e047c8de14a52a8bdcbc71
+DIST khtml-5.43.0.tar.xz 2082356 BLAKE2B 2bacb4b466c6071a0fbad52293db80e1d002cdb275abba2279326460ca583284b8fd568b6fa3ffcb32f0dcefbc3383aadfa2a0eabf2e0d2d7d2230b0f6022e6f SHA512 55d2806c28d5da5999bb3ba03d33ef026c1c3fefcd1a76c6e74ecd2f659a015f55b2fd1fec34efcddf25fb2e921b4c76358d37498fc3429b6bcf6e5e790f7cd8
 EBUILD khtml-5.40.0.ebuild 1584 BLAKE2B 7f5188bbfd3fe48e566202978c450a4fa5fc12caa7b3e304a1efcf3bc69ce1ab0d91bf5a883ed843d6341549d54f2b8dda4340412f509a4666ba3a90e8f72ca2 SHA512 7fbf2ffae2b11249c27280f098bf7523adf4c338aba36389313bbe26ab9dd608b05a427130f8c8b6a87305b8325cf188dc9af869f94466af89659dfc3bd15a35
-EBUILD khtml-5.42.0.ebuild 1586 BLAKE2B 90377bc8e703523500a9a0e1393f46f05d5ca0cecfcd3a340120dcd02678abab6cf7650033f3a982704ed57419a317b3ced4532879dd0ef8f730ca9d5500e19a SHA512 8a91af60d354ba14a6030edf1d124a637a8e8d7d3becd83f14d0a82288648d73481129733d12bc09f04eb7237c7b6563ce458565c461716795907f22f94dcc6f
+EBUILD khtml-5.43.0.ebuild 1586 BLAKE2B 90377bc8e703523500a9a0e1393f46f05d5ca0cecfcd3a340120dcd02678abab6cf7650033f3a982704ed57419a317b3ced4532879dd0ef8f730ca9d5500e19a SHA512 8a91af60d354ba14a6030edf1d124a637a8e8d7d3becd83f14d0a82288648d73481129733d12bc09f04eb7237c7b6563ce458565c461716795907f22f94dcc6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.42.0.ebuild b/kde-frameworks/khtml/khtml-5.43.0.ebuild
index 0252c7e3ccc8..0252c7e3ccc8 100644
--- a/kde-frameworks/khtml/khtml-5.42.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.43.0.ebuild
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 307632a1f3cc..6ffbdba97762 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,5 +1,5 @@
 DIST ki18n-5.40.0.tar.xz 586876 BLAKE2B 22878b121d8894b5e90db831fa13c41d1ff13d6065281c2d2169c973e6f94aae94faafc714f67f49f873f02b10b54a3080b89e3f6be22a1e0f6760106f7e09e5 SHA512 cfdabb1c22d0ae275c274b4e0d40af94305364bf69a8152c6d9064dcc4d5b8d208eace8b2679c4eb97f095ce5af5582350fec1564ace049d2f63e852b4249bd3
-DIST ki18n-5.42.0.tar.xz 587480 BLAKE2B 9e8b875348cd290a3bdff176d7aacf8569c04786cf05b8e6e21def536b6b2844e37b78c54ed5bbbbac8d24248ce7744716bbf34ea4a083fcdcbd4a4d58c07b98 SHA512 31d6a548e6d6b0643a063030823d399c956f95a7403939ae63f1d9b03c70b38804bdba9332a473d7619f22fe6c5f65a33ff64f3ac5e12557ed9e1540431f6b87
+DIST ki18n-5.43.0.tar.xz 587360 BLAKE2B b8a91fc909f7385648f1c658599d63dcabceefd2270efa78b71acad56b917008810a69fa9c3ce2996828bbe0ec2d3456e7127f6480b4aa2cbce719d301c66bba SHA512 14b7f632feed5c71a44259b4f0d9cc11ab72d7f132a59fba597e048efee7a4ff360eb01b95c5b4957ca28ba8ab0e2cf9ed752cd146f6dc19855c6c78c05a7e6e
 EBUILD ki18n-5.40.0.ebuild 727 BLAKE2B 2b151eb140beaf3571decc3f6bf8ef1b145a77209df0f9401cc6dba62f13bc075f275f2af8e8d7209a717693155c40f9351cb66d02d77d7107acbdbe75cc798f SHA512 b3e4de4e74d1466f2661f3d288661a6cd5765a4412af91d696b8f9dc98fd592781c582d99d457b6342969306e7e643a0b2fc0d1907a91f6dd1a4b3cfb1dd1c78
-EBUILD ki18n-5.42.0.ebuild 613 BLAKE2B f4979242fdcc0e4134a4b538a06f6f3a04297e7a477b49d560f011602c940524444829625e4428c3ccfe5199bbc4fc0569b714b803d52f67acdab38c43ee9fec SHA512 c9c80f98e5da1622ad094582da394ee61fbc474812612d00d0ddb4764b7b5f700a144a2ca29b079f1827b877a2138953f7c40ba5b3148902aec03e7d6728d5cb
+EBUILD ki18n-5.43.0.ebuild 613 BLAKE2B f4979242fdcc0e4134a4b538a06f6f3a04297e7a477b49d560f011602c940524444829625e4428c3ccfe5199bbc4fc0569b714b803d52f67acdab38c43ee9fec SHA512 c9c80f98e5da1622ad094582da394ee61fbc474812612d00d0ddb4764b7b5f700a144a2ca29b079f1827b877a2138953f7c40ba5b3148902aec03e7d6728d5cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.42.0.ebuild b/kde-frameworks/ki18n/ki18n-5.43.0.ebuild
index 8f03e6fd4a5f..8f03e6fd4a5f 100644
--- a/kde-frameworks/ki18n/ki18n-5.42.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.43.0.ebuild
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 3acb5d4d7857..19648f09ea84 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.40.0.tar.xz 205516 BLAKE2B 53d952fa3311bd251ec46d6a1f81987c2f3ba457f846108ebe1921dad4564cace85549c6b4277142eee828c8e501bedf598bd4ea513b1200d1868b3b5b078d4a SHA512 bed22e1e1173e5838a43cce8305b0df3b6c7f5f90d958feaf14a8a9612de2d81bdc57a2e6807ac9375cdd8a96a433672484a931ec30c6816ba58f752b2b8c2cb
-DIST kiconthemes-5.42.0.tar.xz 205316 BLAKE2B e5e4548225c12a39d9fc4ca77c4a4f22b36da723abf564c39331e345d16e02e89ebef8ee90d6611e496f4c1d100bc461a6054af5f5bfda7e2a860050df5f7f32 SHA512 7a4eebecc5d7af9498bab9729a4998b0c7032422ca0d7dee7b9fa9e217d287f0745a1e26f030ae758b903b91ac061f175db4ffb3097d9ba5906404a227617c08
+DIST kiconthemes-5.43.0.tar.xz 205472 BLAKE2B 861618940ffff5d4779254d198f347d52a83b0bb1b60c5c537d13c0283802c033611334ac6a80bf994f47d64d542196126586603ff7d3646c31040e30effc916 SHA512 742a2c79b37830e319e4d807359e9bd16950889753a46f85ee5b8d5e0b1dc6868aaafc625c3df7717371440a1cf4e6168981ec34dae328aa3eb1aecc7962d759
 EBUILD kiconthemes-5.40.0.ebuild 664 BLAKE2B e65dc5c8dd6b96ce79cf5de4c16a4bcd1cc0711a4728c9e388e55bb3b99fceee208706532228762bdd09d3c7952ca3429ef9d2479a2fe1cc098da7619a4b136e SHA512 4180c9c0ec2d88c892e8bcdca9fd0be1de4448d694d486c956f62a7518551739942ed09002dcbed5e027cf1b41f81478b93e663512c13dc982733ee327ff4cbf
-EBUILD kiconthemes-5.42.0.ebuild 666 BLAKE2B b81137fc0da34c533d40972777bec6c5bfe5960b0a6b1be72b73e0c4c8cdcd65e388f0e2ca148d6639cc5dc4a1f214a665f321b6c7cf9830a6127241365f2874 SHA512 70ff3a80b3ee5afc0efd42c15c6a4a862c5ed191323eb1b075a4ca1794b6bfdf129de4b4485a580aef52e582fb24c31f615bfbbe24e9a9beb301802ccee0db43
+EBUILD kiconthemes-5.43.0.ebuild 666 BLAKE2B b81137fc0da34c533d40972777bec6c5bfe5960b0a6b1be72b73e0c4c8cdcd65e388f0e2ca148d6639cc5dc4a1f214a665f321b6c7cf9830a6127241365f2874 SHA512 70ff3a80b3ee5afc0efd42c15c6a4a862c5ed191323eb1b075a4ca1794b6bfdf129de4b4485a580aef52e582fb24c31f615bfbbe24e9a9beb301802ccee0db43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.42.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild
index 56a0ecb3948b..56a0ecb3948b 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.42.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.43.0.ebuild
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 6d275468b9f8..abfe31bad684 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.40.0.tar.xz 26616 BLAKE2B 17c3e7d87156ad732f38ed0e4d0bdc4e4eb816d10686fd084a553216ba8ac4e5d0fc35590d5bcccb9deb100619539e79ec417643c31105e26b13ba392ff702b0 SHA512 b8c8c1de1c2261ad52ba80a11388a90ffa18c80153b58b0063184e14fe1c744465c150ef4e9be6692ca81330c52230029b406e8ae240e6738300f8977411a6ba
-DIST kidletime-5.42.0.tar.xz 26496 BLAKE2B c9815a7b09c526c67b43b33630573ba05193215d468ac7ed7fc91aff802bcf4d766490fff8a777c9c18fa3c78b3a6d5c0d76faa1c56eb568e76346569d7efb93 SHA512 78c89d83f7f46ef2c0a5c5adeb32b2f46129af1ae06ed29009cc6677876bcdf4441179bc3e760b4fef82a5a19b194017b4e12eb122403dd661e65d59f303663e
+DIST kidletime-5.43.0.tar.xz 26484 BLAKE2B 5c7aca43bdaa77b87fa739c128a103ad1ffb1462d459cfb0bdef17d96540c7c9b4c29cdb68156bee61d7421355c6ea1513e592d3e0451c6007b6750e0b1e318c SHA512 aab85a3143fce87751cd3e9c2b55306f5c4aad1f396dbdea7678605dab4ce47b53b95a42d42667fea937dbd6b20b84c349d00076216753dcb31beab52d05df3d
 EBUILD kidletime-5.40.0.ebuild 854 BLAKE2B f3ca435bdb9bd4165f9508f27dad19f15c8401f5c25c40a9985538ba295ee15be293420c45ab97cb3c17559905b144b4c7384ffb884cfa1de029228c6811be6d SHA512 f6f111cd2156340f0c1f1eb241cd8d2fc1e5046b9bd41155b948a2315f2f25beb9152956e34f1638c832374ec275ae9f7ba28561b3fad43856c245a1fad170a8
-EBUILD kidletime-5.42.0.ebuild 856 BLAKE2B 076ebc288a1213b71be7e0cc9e51affd2b625ab9b8bb652cf1be7c75b152b6196af8adeda80dd63ca0f62a9e58d7b1aadc835612dff96c9d2a291a4836b770db SHA512 3b0eb427def2739b46eac981d09d498e719bf237c7bf78dd5ce42d3112014011c909b80848dafb17c1d2cec9a8350e02359f66207cca0020caf2900a5efe5d85
+EBUILD kidletime-5.43.0.ebuild 856 BLAKE2B 076ebc288a1213b71be7e0cc9e51affd2b625ab9b8bb652cf1be7c75b152b6196af8adeda80dd63ca0f62a9e58d7b1aadc835612dff96c9d2a291a4836b770db SHA512 3b0eb427def2739b46eac981d09d498e719bf237c7bf78dd5ce42d3112014011c909b80848dafb17c1d2cec9a8350e02359f66207cca0020caf2900a5efe5d85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.42.0.ebuild b/kde-frameworks/kidletime/kidletime-5.43.0.ebuild
index 10865cb9fe0d..10865cb9fe0d 100644
--- a/kde-frameworks/kidletime/kidletime-5.42.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.43.0.ebuild
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 9b4e99de7001..48effe5f7359 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.40.0.tar.xz 204748 BLAKE2B ff8d45dea9694d0b20f3320c12b295dfa5846db85a19f6c28b37f530c8d2b97026533d33fd15d88f78c7d148fa4310649d7cf71a9ae94e53cd2f1b0c07f17b53 SHA512 e971d02b34c1a63d9ccefb10e5c12b21e6a68330230ca06fd7e55b390fec6ef7937b5e404b446b9ec65e5b1f962a601c1ec03a7783d1e06f004ac5f6ff428ea4
-DIST kimageformats-5.42.0.tar.xz 204920 BLAKE2B 2d939ce02aa10693528e5a8b59ba1beb1c016afd620df88851893d76922d37f6ff2a7097e3ed262e06f04fd693851b83d76c3f444181ec7cae9d60492ae8608e SHA512 3c83e0bc7b45019cd7de9282b7f3eaefad912009c073a6b35b6d518639de4b591e2f5a93ee3e4d76285e9c5778b34905dd40965af0853bcfa76ee526c29750a5
+DIST kimageformats-5.43.0.tar.xz 204688 BLAKE2B 24f5cec1d55c2f4def2dfd50f62e414e0943e042c947302946b0687784a2f6c5fac35a13e7efd279732f1af83b2f7b916435de0cac01082698e5aca2f6ee07b2 SHA512 1b968ebbfb08e1f22f1e15e6dcc66753799b125f568eb011bab1071b3cde780bbbb9ee94861e1e7d6fddf76a7ba6e1e9a54fd1c6bed6898840a3b2a0c1a62fe5
 EBUILD kimageformats-5.40.0.ebuild 714 BLAKE2B 33867e7e063da02d76374ebd9912d62e0b5f25158d97ac613b269616247e97091a46d97fcd9fb91d0f46522ec02c2c9de2bd14e60557aba78bdeef40e22fb38c SHA512 8f7a0d45787faf57dfcd816d6362cfb96ba7ebccf8a73332149ad12abeef6549a9d7fc4ac2b46f3c6630999e85da1e934a04dfc4d9fedf60133af1b64e911202
-EBUILD kimageformats-5.42.0.ebuild 716 BLAKE2B b8534906d0b6d30afd19f770084128ca25fd96d0525543f31515d91c670eb3ba1f10ccca68ea6f47ea0e05bf263d8294dce39abd098df934fcb1504a48718644 SHA512 5bac523df223f3d0a564625a8858fe83d6b80f8276e061c7ef4c8958ca3e43f6c842d80701b0433eb705d45424541eaac482736b707030170ec9c14ad6613dc0
+EBUILD kimageformats-5.43.0.ebuild 816 BLAKE2B 5176e2a3ad24819fccec7ece0c842a7fd3a2e2dc8aad3b37ba43abba5656c0a52e0f2cedfd0f8a2bae5cb6468ca8624edd3d97c649382c4427e99cf1ddb4198a SHA512 463f854f959aa2b7e872b0a661561f7f98a99b1d431426ae46c2aa9a4d16598497e4efc52ecdb6f34b6a9c179b807d567cebd9bf72e2d7aa6a6661ce9e54ea57
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild
deleted file mode 100644
index a75c094c8015..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-	eps? ( $(add_qt_dep qtprintsupport) )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild
new file mode 100644
index 000000000000..21e44999c4b8
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.43.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+	eps? ( $(add_qt_dep qtprintsupport) )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 634426
+	local myctestargs=( -E "(kimageformats-read-xcf)" )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index bfcc727d0daf..efbff78183c0 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.40.0.tar.xz 120920 BLAKE2B 0bf69e2440a21a1c803859080825e9e25b3657c8f7114701fb62f448982da9bbd830faea8b2654e60c7a1602bc55c56dd4d25a10179408a01a46694c09198e46 SHA512 1bfa884726e4379d9e0246e283dd7867bb404416eb90226f644b46e06c4bc17c898470bddafaf9f6ba9fc6be5ea4d975cacb0e5fc5ea4d1038616e91e7ddcb07
-DIST kinit-5.42.0.tar.xz 120732 BLAKE2B 889e8cf57e76c1e839a5aee20757055ca1d1d55197c09d4bbc017786b07754035779200944e72b490e8272d9c0d5f5e952ab787bbd4cbb1d680391a2b9cabe96 SHA512 73bcd8094c8dc39f6779b076fd3cbb9bb24a17094d0ed7ff4f3c4eaad2d728114606120e28764fea042c5b204acf95a3a9673ac10fb88652d6d9ed9ab61b8368
+DIST kinit-5.43.0.tar.xz 120776 BLAKE2B 72430d23c4ff0efb02b7f2e49388ab7e79b99c9c181435dc026424e83da7d6436ea554c6d4a7d88abdbe357c09437f457b6949c1bac332b535eaa76fdcd74a95 SHA512 1326c6a3d67d5ff9e483f05506c4c21486377c793fb6e6e8f6657d60f28b69bc03bd45619783a76464971b81997b1f546f18043f133f048c4836c023f2ba54f7
 EBUILD kinit-5.40.0.ebuild 998 BLAKE2B 3a97c96b58e0e61f045852f8d47c66962eae08378649ff298f7c3d2c471eae51462c5956f570239afe8cb2325b55f3bb0b1df989bc71d9348e9a9b2292efe9df SHA512 cd50651556f58d2d9da8f02a4e7b4cff13d182e3615b403c738971a6434e3d760b152a665c61011628edc0fe42ede13f0d9fa19c0858295ec38b675d5bc0ce35
-EBUILD kinit-5.42.0.ebuild 1000 BLAKE2B 47f8b4bfa6f5a2889902821923e461b9dd48e8cae6b524d80883c61e401356645d3382e40b87a13c53fdd3448fa128f75ab67a01e07b92f67c3812410353c43d SHA512 1861916711f7b19aa24cd2e9e01f399883622d60a79ac824f28d8dbc6c66fe32c86e258e63067b0aebbba063670eea3b235102501b9bd68d51b3cff98fb2f498
+EBUILD kinit-5.43.0.ebuild 1000 BLAKE2B 47f8b4bfa6f5a2889902821923e461b9dd48e8cae6b524d80883c61e401356645d3382e40b87a13c53fdd3448fa128f75ab67a01e07b92f67c3812410353c43d SHA512 1861916711f7b19aa24cd2e9e01f399883622d60a79ac824f28d8dbc6c66fe32c86e258e63067b0aebbba063670eea3b235102501b9bd68d51b3cff98fb2f498
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.42.0.ebuild b/kde-frameworks/kinit/kinit-5.43.0.ebuild
index f547e317952a..f547e317952a 100644
--- a/kde-frameworks/kinit/kinit-5.42.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.43.0.ebuild
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 7ea5726cb5da..5b8a66e0268f 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -2,7 +2,7 @@ AUX kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 2506 BLAKE2B 404ce0e81484a20d1
 AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2481 BLAKE2B 7c98a58dfaa7f86cf83179f2615d54fa0c1ef81a226a6533a2c6d0a7c3247ca9414ee7a9863664411f51f4433152f1df6e076402463010f27e9cd656bea036fa SHA512 c8207d96555ddeddc6e8d387fb59d33d2a7a34fc068f6ad9ee30f92b16007d5f53696fcc83e8a3686af6314e127f6556088f418b16759f9a1eea812adce0cd46
 AUX kio-5.40.0-testtrash-qt-5.9.3.patch 1311 BLAKE2B 98bf9667d64e1f408adcde47e05d26c8774459679cd3ad67948dd4a245225ce9cef4c1030aaaa01cb3303d7589bd97565860df7bbe329578bb298282c771c184 SHA512 4761fbb0f7d5034dc66717c2578b095fdb6b85241c5e05fc0ab166c75aae9ddd1d9b3aaa0b9628a44c13cc6f4cfcdb0aa348f3e1c97b7780e53567a1392c11ef
 DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
-DIST kio-5.42.0.tar.xz 3119252 BLAKE2B ea5ba09229c3b8a055460d629aa222fee91f9ee9f50ae75c64fd0e6a582fb722a15739bac7c00c169b0f218e3e69dd53213fa13f8fb08fb34457e54a252cc59a SHA512 bff5b0dd393586a4da8f077298b51002c7accf4f72646557b5e1f68fe496003932e133c977980d5816dca73aa2e35fa8629cba87886518c319d4450edae323cb
+DIST kio-5.43.0.tar.xz 3139276 BLAKE2B 1fbaf93e7bd3565ff5c85a8a3e33b3dbe2e7a4314cb866711a3be72bb8f1eb320fb3a6c9af421914b440787cdee393ca3762ffd8ac881e2427f8f3e5c47e739e SHA512 23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6
 EBUILD kio-5.40.0-r3.ebuild 2049 BLAKE2B 1ada218376a92f1c844609293957423ca0bf1965fe3bf597d9809882795fc743e8acfc9132a3821a64e11d7ad6341f33078c4466a420337ecfbd3a13a44faf98 SHA512 91eb82ca9b5c9b2f82991a22b667957ee16101082c40a699338a47f0a28dbd54d0fdfffaafc606ac5d7b051072f9db8316b0c42ce2c103fd6660ce5f53982d23
-EBUILD kio-5.42.0.ebuild 1896 BLAKE2B 3d8f01d59c5c0e13d7af7b7a54fecac750a484b3a8fcbed19494d8dbd278cdfe80596ab3e1d3c81d6cee4749067e94000ec23485b564d9adae66979420b8831c SHA512 8d3a1e6bd814b2c412a4734e969ef1d4686bcd24827c06052c2a305ef7d970676f58226a77430b983f775aadc4b872573fbdebb23691628ef3e1084407be1755
+EBUILD kio-5.43.0.ebuild 1896 BLAKE2B 3d8f01d59c5c0e13d7af7b7a54fecac750a484b3a8fcbed19494d8dbd278cdfe80596ab3e1d3c81d6cee4749067e94000ec23485b564d9adae66979420b8831c SHA512 8d3a1e6bd814b2c412a4734e969ef1d4686bcd24827c06052c2a305ef7d970676f58226a77430b983f775aadc4b872573fbdebb23691628ef3e1084407be1755
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/kio-5.42.0.ebuild b/kde-frameworks/kio/kio-5.43.0.ebuild
index c1924a16a4fb..c1924a16a4fb 100644
--- a/kde-frameworks/kio/kio-5.42.0.ebuild
+++ b/kde-frameworks/kio/kio-5.43.0.ebuild
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index a8cd23c579b1..2b81b190c3f3 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.40.0.tar.xz 291456 BLAKE2B d00d9df6880c45b1c74430fdeb9e09d2e7292e6b9512213969e5ff8c5668df1cc85b3c0116a86f546ec11f8e96a2a66fa599c29d46efafa3e2bd7db2a9329071 SHA512 689d91f23a1300afd9204173a40e2a100e83b0eb38d02962236ab1ff91fd4659dcc60d84c815766a38cacf38294488d82c5d0b9d540c1a0972489aa29e300974
-DIST kirigami2-5.42.0.tar.xz 297292 BLAKE2B 9d6fe061a55401f66ba7a83df92b0b7cb6d2c453b4e4cd6b20512aa8eee44c664098497d2468fb654bbd3bd3dcaf7bde10c6ca283d411fe8c118c1089ef14d17 SHA512 0d848b7e30f902df1d0454f056308a20b92a9437d113107b2ea342cf460c0d718f1e8f6f89e72b3e4d97ec617b324611921e01c5cc73422a0a91d750b559e23f
+DIST kirigami2-5.43.0.tar.xz 299820 BLAKE2B d005686ad99cce4e99d963cf3ee23c27aaabd8d7e0123407a1ef73fc8115a8498e9ff085975066f250f479bfb90e3924a4046c6897096cf124b68db4fc868a5c SHA512 a41a139170853853fd7520912eac273e0cff8b5b798e41fd44cff528d210703b650e86ef9c8e67d8b8f14b89ed63b419e71cebe0e499ed32e9374e9346013c3b
 EBUILD kirigami-5.40.0.ebuild 916 BLAKE2B ec5163018354ad62c8486ffb12b002f38bb80dae17a8b5f0c23750a23316ea2ce05204bd1da03ea4827d718aa94dff52ad043e48d05007160a80aec9fc731a1f SHA512 e492963b7c5e94f0118a1a151edea0f58c49f4616dbf64a3fc995d4d82e5e45e57cc6f1ec77dc3aa40b821a9e8a239254d88f8e89785fb0a4442a25a9a76e10f
-EBUILD kirigami-5.42.0.ebuild 836 BLAKE2B 53cee3f7bf15fff9ca890a463988a5a92bd737053a8df59b53ccbeda0979289a42f5779c13e1fe65b01af965f10ef6aaf6836ad7697e56056ed11c9991fffdc5 SHA512 64989b2f4519c5e06268938319b8464414ee28124811e159e8ad6d894028da4e148f74c49ec48fcfb6b895fb331537786fe3d6e6545e990453609f3ef2c15c65
+EBUILD kirigami-5.43.0.ebuild 831 BLAKE2B a5370d31996a1ee3aa697fcbf31a9ab8084babe8f6cf59755c452edc42505ffdb226bc9340a850a0aef31cb58650c566a8b542e60198711480894ae4834dc9ee SHA512 6e78209550e0cb9cc8083557b57b66754e270c78f49056e00ad9466688bb90af5c06e7f5bab57ad544ebe12d9851bd8f5a746b47bfc64d71c048f66c95f5ed60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.42.0.ebuild b/kde-frameworks/kirigami/kirigami-5.42.0.ebuild
deleted file mode 100644
index c337380d8365..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.42.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_QTHELP="false"
-KDE_TEST="forceoptional"
-KMNAME="${PN}2"
-inherit kde5
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtsvg)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.43.0.ebuild b/kde-frameworks/kirigami/kirigami-5.43.0.ebuild
new file mode 100644
index 000000000000..03e1007860ae
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.43.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="false"
+KDE_TEST="optional"
+KMNAME="${PN}2"
+inherit kde5
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtsvg)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 4ad54b009f7c..2989b653da56 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.40.0.tar.xz 389628 BLAKE2B 42ec268ca734db5dea7a380de739036028683e421a79987dec94c6f8243f9f6beae3d35c78c6be63d927328b69c171c8792b3dd1c078bfc3555faf871e0ea562 SHA512 17f78419b5860b6423a555d5ab529f68e7589e76b1f0c32f5ff0f581991a480cd9424d86d1384a85c221bb3037491a8fa4a0bf1e20ee7ed046d9be8c76e74446
-DIST kitemmodels-5.42.0.tar.xz 389656 BLAKE2B 5a51dff4fd699c039fc914c81f3b0744039212a8810f2c48bb60c39c6fd5d4d78ab3f92fc274dfb989e556b7bc5254ad0e5337d4b63e2b995cae3d249be10fd3 SHA512 63b15e64eff849d13a13d300544e03ee24900f6f6cce8ab867fbf8120f81db744f961e86aecc3884e808eb37c4b9eb2aa61f45c7c2e9568b2bcec6c41a4cfaf2
+DIST kitemmodels-5.43.0.tar.xz 389768 BLAKE2B da182b244676db2e26828f6c66a3b5616d98377204f9479af506a172994d50982845eab345b85cbfd3a91d0684e13d2a324d165f15056601e511c2fc7efccec3 SHA512 8bc5d6d43abede2478d1e67516cd89e16c0033ea762c057047e898a4d31542ca4e1d7c2bd6e2d4e5cf1cf2c22113f5d69f7a25d022fcc47fabf51364a26cef8d
 EBUILD kitemmodels-5.40.0.ebuild 353 BLAKE2B 8a2413743e526d44a9575a9cef011cd3c70822dc17c327140855e42b83dd8530923a42bab27641e6b4225cf6529b90bdb15a3776feaca863aa111bc5bfeba845 SHA512 704035766cff8bce455a4e72b29ee132acc6c8ef4a1e04f6cdcb9553a87356495ccd02d449fa2056b385561140e632cfe001b8d9efe0f22e3ec7d7021401a442
-EBUILD kitemmodels-5.42.0.ebuild 355 BLAKE2B 223b251231dfbfd263a5c841288b1ca009c56d0e33dd8ebc3d58d750bcd0e1caf1c7ad75bd300bb0aed47caf4647e0f9f1cdb8cb2ac51a8fcb6f199cdfa38181 SHA512 d492e9cb63eace2d8618e65df7871a787c66725e982d06160bd466fc20dc2a4011e0b697a86792560f08792f923d712e6b741c7a6c3ee3efeb938aab50d79ba9
+EBUILD kitemmodels-5.43.0.ebuild 355 BLAKE2B 223b251231dfbfd263a5c841288b1ca009c56d0e33dd8ebc3d58d750bcd0e1caf1c7ad75bd300bb0aed47caf4647e0f9f1cdb8cb2ac51a8fcb6f199cdfa38181 SHA512 d492e9cb63eace2d8618e65df7871a787c66725e982d06160bd466fc20dc2a4011e0b697a86792560f08792f923d712e6b741c7a6c3ee3efeb938aab50d79ba9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.42.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild
index 90d5d027232c..90d5d027232c 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.42.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.43.0.ebuild
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 75c5f10e7415..3f458dcd812f 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.40.0.tar.xz 74968 BLAKE2B d7a72f6902d6af9105e5a122caf76e4b703775757cecf9c03c0d1349a498f59811f5112c6785c07810cd7e137122fc26bd6dd90708839938e3359d762f53548b SHA512 54e7f7fe422c0750a20b9cbf4a44c8865513574ae79afea8a2bac70637d293514b0f3a386567fcb6ad559da18ff9a6589d5b55bdf8411606ad24592c857a110c
-DIST kitemviews-5.42.0.tar.xz 74916 BLAKE2B 497b59bc18f02879c75f1644f5dac73cdb335e61f17ccc60e9cad2bd6d6a4e406a800a7e5da2378414ca356fab2bf8d81a4540ce3d5b7b14f11509438a9fa89c SHA512 d53f969dbcace3bec89331c1be04a22cbdade34983c89deb25490e45474a4d53f32783d3885783c45f3597fa7d08e9b60899d62802383b26e39990dc0d82d903
+DIST kitemviews-5.43.0.tar.xz 74880 BLAKE2B 789e8974697ea6550490cec36d2fcd927dfa1b6852fe3399187b1f60a3cae28a791275b76f21540801b0f00da1826878e3515070243bc1aa317d29f2391d8371 SHA512 e54af77d29d1aad0a1e0d842d82a23397f98bc2c146d74c6f1609af66099b0b7413b7d33ae1749036e90db54b1f2217d534d598ddead00be31934a6973a77a05
 EBUILD kitemviews-5.40.0.ebuild 405 BLAKE2B f749ec6148e43aadbe4b41caf28d3b87be0058e548cd5386f8976acf4bb0474b95ff58903ecb6452dcc6014fbe9b7a05c7c8c32622f1245e8c959e15d76d8720 SHA512 79dd367165031c500518814a0568b4be99d71e47f43ce37bec2661a4bb6700847979d15563d83969a84075b722eeb698277dfd7354dfd4032c044207570f0781
-EBUILD kitemviews-5.42.0.ebuild 407 BLAKE2B 271b01263fd70e1169e8121a6a90dbde0168290157e2a8767b01587e329293c1efe77ba0d3abeaced58a05390cb56d02ebf8855a1c731a9a0d83e3fe531791e6 SHA512 aee015e8588d94ba13b9782217c95b05d95c416537034ff3b2957b4faceced6206a32e7dba3bf21116782dc4d00e13e6a6b3967dc9fddf8083ac1f3742cb7d80
+EBUILD kitemviews-5.43.0.ebuild 407 BLAKE2B 271b01263fd70e1169e8121a6a90dbde0168290157e2a8767b01587e329293c1efe77ba0d3abeaced58a05390cb56d02ebf8855a1c731a9a0d83e3fe531791e6 SHA512 aee015e8588d94ba13b9782217c95b05d95c416537034ff3b2957b4faceced6206a32e7dba3bf21116782dc4d00e13e6a6b3967dc9fddf8083ac1f3742cb7d80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemviews/kitemviews-5.42.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild
index 029a533f9ea9..029a533f9ea9 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.42.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.43.0.ebuild
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 9d0f6791c16c..1554f4d57d13 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.40.0.tar.xz 90004 BLAKE2B 2b30c58bf3b4e918190bb54e2a8a33de6d4428aa7d5d6b200b3b61474e9a948941b9926383a1aa2da6611f7b607f6da99b350803c94ae42570850a98acfff57d SHA512 ee0fe25fe1c8faedfa834f7a381e8e15dbde3adfb9c6aacef362c39b251a2a3ec84c966c9cfde7ef906a5bfa7bff71d3c5cf374e0d949fb4d18224afebd09c33
-DIST kjobwidgets-5.42.0.tar.xz 89764 BLAKE2B 7ebb0e8e615b921f93cdd9696763b35049f9b16720817f24e99edf5c28bc5a9e64445ab01337fea156f41a13049632be8fa8cfa182a6c71d35141124b54e1d54 SHA512 26e3a0842d7ce439a557fee2c3d8efed196a6c9ef3494f476043cf2113e5280ffb7ca1765e4210ab42b543e30accee6cc650844d17767faa9656e8ec953455ce
+DIST kjobwidgets-5.43.0.tar.xz 87696 BLAKE2B ee87fbd21365c79a8514c048feba4542a361c870767e1ed7aa2aaa6d6d7a47eeca62370107e42a1b7f36c368f5949fadbba5737995e022e781d17311fbdf7673 SHA512 41a8a7c9c81f66eb90c196dc05e6159948c30bc1957fc99c477aa56e25f714665d6b5a1af381ebdd1194e4f2a7a68f8975e48d09d98771d67e899ae542d5f6af
 EBUILD kjobwidgets-5.40.0.ebuild 678 BLAKE2B 1bdee4da6683965301320e8d7ca27cc0ebd9902690285c975c9ec94cfaddb5987f364d6b8fdf6bd196ece5c09302b4cdee373eac242327ba077b7958be2d87ad SHA512 73443f67e43df69b89d234e12ca7d9b8d340e8c6bec88dd87dabc54aeaa3565db9aa265594837c64cf030102ef802774e3d44807aee5f7220697fb7d2526c632
-EBUILD kjobwidgets-5.42.0.ebuild 680 BLAKE2B ae8f397e2f35cc185b159bda2ca70a1affe50400e65d9d6d6c826c7a4918db229cec153af831ad5400bed7009454986a07d89e90bc8baffb59465ace2b9f5b79 SHA512 abb25c310a9c8f466da20e2d1fd269ba7ea505736d8b18ce0e02a2af4adccf21e126244c0437a3ff9b9d0017d2d425dfdb717951a8bc15e2a11c0e3d82475763
+EBUILD kjobwidgets-5.43.0.ebuild 680 BLAKE2B ae8f397e2f35cc185b159bda2ca70a1affe50400e65d9d6d6c826c7a4918db229cec153af831ad5400bed7009454986a07d89e90bc8baffb59465ace2b9f5b79 SHA512 abb25c310a9c8f466da20e2d1fd269ba7ea505736d8b18ce0e02a2af4adccf21e126244c0437a3ff9b9d0017d2d425dfdb717951a8bc15e2a11c0e3d82475763
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.42.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild
index dead1c175035..dead1c175035 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.42.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.43.0.ebuild
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index bd0fdca41a25..1faa5f0318ff 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.40.0.tar.xz 294940 BLAKE2B f2b3219dd32669e0fa4e46112339f4b87dd4d1f9a417700a1ff28870ff9f11d3eae56d76ab48ba6277b13c93cdb15f4e43a6018c1db69b007295c42e1c35488f SHA512 a9db958cb99f47d8fbc428ace36f050e191f47058ae1fc7f9f4f7bdb8d763e65870a79a1fac504706d26d1d5bbb1988543235519a1cefa46ca4e6e14323208b5
-DIST kjs-5.42.0.tar.xz 294780 BLAKE2B 61867f5d3aff5ef6eb5b164a336d84649310690c09ee58eeb0b7258b5632c9ccf752eb79797561c860abce3b17cd58c5aa9beb6ef780993c6aceedb13be2dba3 SHA512 af981d96ebd391ad802f9452a5aa1ea6bd0770af8f18901357d815504bb09f005099e6cb521d9e8a872d542222ca96cce74335afbec2cb087df3a51075dbcafa
+DIST kjs-5.43.0.tar.xz 294820 BLAKE2B 552dcdbd40454690df207e29675af687ea0f06e06f8165dd59a46524611ed42806d761cc86479ad55aa8baf5597aa447517abacb56139ea125c48fc891a5ce5e SHA512 44b52dbeed8d23972eefa9f2a68a6a0f15352c54fe5a8a1563d750899740044dd4539c8b5f6f42a196bd8d3216862437b36c6fd9aa65c653691c1f7ce9428772
 EBUILD kjs-5.40.0.ebuild 388 BLAKE2B 30e290264f5452106fed14cdc5d88b963c01ea15b0fe7035ea2fbe7ba0b9e0b1415abd2198cf3dab09d8fee3146c4b526579b30dfcc26e871a051c80bb086f7a SHA512 388cd6c3b6bbc37d9d146de2903e8fbc0a6601b09373615d4e27b2bd5e34809019900bdbe5c178487f0aa1af1ef257c5a2a281f376a34754ddfa45feae873566
-EBUILD kjs-5.42.0.ebuild 390 BLAKE2B 29f9ada109e42b941807ae9f7b9bb3d3d67e0a173ce67c4f949693e595800569f2bc09ba226d47978b283a941aabda85aaed6bc5f4284cda76fae8f720a1e454 SHA512 a18b1a5b56d8cf10b5b54187ee4ce04ebeff9e49cf40b19be82a3bca14a84b7c787f21c5019e4701804e11e575a62f4b5e923c54842aceddb3868992f64ad155
+EBUILD kjs-5.43.0.ebuild 381 BLAKE2B ed1c941645ba81ce5bf7c6e6791d3bc151161f80837095ccde5ba2f7789eb6e3ddcf92507bc308d9a0ce02e14fafbc348e5103caac8d670116a1994bdef768a9 SHA512 e3a2d57593ec664b137e20a28c0d67fc9c12b510a1cc5b42b692c035be1b3cd3056f7c2983fd1e5ef95638d31e170be2ce76d7048702aa4f308975608681d39c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.42.0.ebuild b/kde-frameworks/kjs/kjs-5.42.0.ebuild
deleted file mode 100644
index 0dd6a9ecd3eb..000000000000
--- a/kde-frameworks/kjs/kjs-5.42.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.43.0.ebuild b/kde-frameworks/kjs/kjs-5.43.0.ebuild
new file mode 100644
index 000000000000..2de6494c7ae5
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.43.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 78100c89a023..0dccae6b3d56 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
 DIST kjsembed-5.40.0.tar.xz 169680 BLAKE2B 37175390368c9a2e28e02d699b7bc70c583b4bd32852c0ad963b9249dd26d359e3c0aaaf8fe665bbe30523ea2f0505664c5fde598f694a5f76a4db2ee432b7a8 SHA512 4b14d85bf5d67f61eea08eba31e4c3891c418f9bd7af931c6c643672b765ad0714b39da23f8ec57e2d752cabcd04db5647cf1a088f8bdc06be5f606d93297078
-DIST kjsembed-5.42.0.tar.xz 169460 BLAKE2B 9890220d6bd2eaed125492a9d1e5febd2226360794d487fce92d79c4762f6b8572ac35045d3c6e25fd82727b2032a89301731b20bff8692dccff923e6c871492 SHA512 6ff1212dd5e14528b52bd509a6c362e8e3db4b5e6033a9179c5b97a3751c2c6c9209e9a3111307a7d04eb9c5d4b7987d61fc619b17208397a01ad9e03d7bd8fa
+DIST kjsembed-5.43.0.tar.xz 169476 BLAKE2B 9025a034f99b43889ebe0e83e44e380b280a5a6a1a990b3fa52a0349e4288ebfb75520457eadc920152f5c185df31aa242a728368158726959e238ebdaf05d90 SHA512 54c005f1cdd60a3cedbe636d8abddfe92967ff27ac91086d9e7c0cf9983ef643547c04bde85a5e0558f51c0e68f85900db26ddb627c084396f750da22d30d549
 EBUILD kjsembed-5.40.0.ebuild 523 BLAKE2B a1fd71e853414739f8825daf2195c1061e648bf336f869498551f6cfc5ccf2bf809ead3d2f87c1745d1157c5c50955b2bceeb478f185b0e98c8857ed2e8c9bc9 SHA512 dcbc129d1902c38a599b43d4f75c9b9c1021694993f79e65d65f9360b139e5229d73edf65440a49bef3839078f3d42a4a5388595372e3f77970525db84e082fd
-EBUILD kjsembed-5.42.0.ebuild 525 BLAKE2B c2b8dbe4f91731b8ef1f9df4c90e08a24cdbf03e2bf803b41b6ec5d138094e25d555569129bef7c69f43449223c3f1c8256c2e37fe5a6e24564c1622e0a5da68 SHA512 2ac1f393f7da76d24da423494e5acd80ae5f507405ab29ce6f45cb7ee9d69d800175c1d4ae356360cd748f761eb853ba2bcc2a30b2fa3161f8e8935a81843f31
+EBUILD kjsembed-5.43.0.ebuild 516 BLAKE2B c12bfffe3d0068d52cb085027d78db1958631c1a053735b5b48b1a261e82e23bbf0e623e4d1a413df8995dd522293dbad325b536bd85b723a9171be2bd710d98 SHA512 deb6f72e46eb7ababa8422778f286ad448beafbea1e318d3c61999f7d4c403511226f472f262611ebe49153c6a631114c63ffacb83f4e4763b1fda98031650d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild
deleted file mode 100644
index 1463fe8a59cf..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild
new file mode 100644
index 000000000000..d92227a6ecb1
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.43.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 0b8cca072275..12e7af5d73e3 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
 DIST kmediaplayer-5.40.0.tar.xz 9616 BLAKE2B 21832541f6b4cc8b1b79c6d3db0a197b55631b202fb380c20982b0ba2623742a3de381dec49a9de6de548c248335cd381fd6afbfc1824dbb2d4e402e84c23015 SHA512 69e782b366a957d7849c5d995844d6e4ed52dbb7a1ab835d7dcf04c9a50f9337805b0139db81b5e2a787263dda32a223aeadefc45194c2fab7c2de657039df1f
-DIST kmediaplayer-5.42.0.tar.xz 9500 BLAKE2B 3c510040b5e422ff8a28a882fea65e68e105540d1c21652585270c6ffca0f88ba018b1b988f4da40e50edb63acba00c3999dcef194651be5c5989e12fa1abcd0 SHA512 f2821597cadaae7e9686282a0b58f6a9417a3bdc229ca6076003551c2d3fc5c061e55dfb690892756c308c5ebae81ad0370931db433acb00ff5eab73056a3a0a
+DIST kmediaplayer-5.43.0.tar.xz 9504 BLAKE2B 337c2d7235a193337550cb2b65d25ace897cfe1d64e14a108866bc12253fc7d55d508d0018d11a0a8a12c260bc88ef9e8e0cdd7d12b29ee73c2e3223925cb6f4 SHA512 2e4a0ad713da37521e236a4e1e6ad8bb1cec63546dcbb9c114a40b3165228ac447d54b0d774c576bd59ece219af5898fa033464c13b14ac82da7ab7e99fb49e2
 EBUILD kmediaplayer-5.40.0.ebuild 453 BLAKE2B ac5f1d170bfdca8b3674e4e59af98893c11a84b84dee560f6610bd1eb596dcdbd280e233a8e9edd03f77b2422b4be377fcad454a967010c6fb7bef417e7c5d90 SHA512 3ad57e3872c18da901fa27104eb04e5a00db786c2c8004fba99daf13532068ab5f9750ee7fe0b4a93862ab3a580388f56fc36b796e40fc5718380dd36f99cf5e
-EBUILD kmediaplayer-5.42.0.ebuild 455 BLAKE2B a3aea55a9edef4b08330c8477e5ca73bc8ad92254455392241ca7e993c7d94da212f4b4e75a0c75dcd69f99e7a78da6e8d6e21ba39f537b49218ef062d5b711e SHA512 502f5e9197896ba494ce444e75311500f5681fedf607115ff7d1f144ac080836db8ee2a1e7c4ba076c997cc909d64ef5a4d575ecb2318e712c10328f2709a1ec
+EBUILD kmediaplayer-5.43.0.ebuild 455 BLAKE2B a3aea55a9edef4b08330c8477e5ca73bc8ad92254455392241ca7e993c7d94da212f4b4e75a0c75dcd69f99e7a78da6e8d6e21ba39f537b49218ef062d5b711e SHA512 502f5e9197896ba494ce444e75311500f5681fedf607115ff7d1f144ac080836db8ee2a1e7c4ba076c997cc909d64ef5a4d575ecb2318e712c10328f2709a1ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.42.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild
index 9bb5a33e13f1..9bb5a33e13f1 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.42.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.43.0.ebuild
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index be196ce33f7c..1e06f3ec9745 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.40.0.tar.xz 909280 BLAKE2B 38966edfa402e92e994081afa93b2f410922fd561953bab650bc71a9ecc79ff5fa70a879fa971247d8c6917a6762378c625d79629c9993679806fcbf002f5796 SHA512 496feafb526ee7ae835e5e590f691c86b22bffb2c446de151a6d582662c856f0df755bbbe91fec06c2e06bc5577181972bb95a3f1afcf9aabca1f055e56c42ff
-DIST knewstuff-5.42.0.tar.xz 914456 BLAKE2B f384d4ab4108760350e394ea2f452e2984b3b752afb0477dd964e2bb728dd78db13ff27bb4227fe4f101f694647fc018977aed5c372a91e2bb5187f444d3e867 SHA512 6371e70d6cce9f28554b254b6273351ced2305d977af23b35aa82fe965194e7771b0bfc4af1266035ae385904f9c04369b0dcad9202fbb218a17b1e9a808643f
+DIST knewstuff-5.43.0.tar.xz 915856 BLAKE2B 4c3e693a276d2fe6326c50f13ad434b75ca3fd5143455aa503331972ac93d6e07b85bb52ee4e4c7c0c33f34e500f7516c06e7bdee07c8ac888106b5bcfdf7a9c SHA512 27846ef7ff3b1357926ea04df88ecbf9f0810f38077f3ee06dcbb016d4dc76764660fde3f9d40bce1aec381a95700fb5e18844c9895ffefd2237978f282358af
 EBUILD knewstuff-5.40.0.ebuild 897 BLAKE2B 72859cf1fe6fd5d9809dda3bdd21980f4338542f03b16e3db1d79fe06e623003e81c0395e0c83ccd13ae66f5920ef84a283504a4b5092d46b5ddb8b7f19d140c SHA512 40caaca4216abbcb5970930d589e1ad0bc0ec6d6d20f2425f2e2198d1f22a646bf1c15a25f443761c57cfdda2252793656cd6e428b9f6ee739bf58bf8c4905c5
-EBUILD knewstuff-5.42.0.ebuild 899 BLAKE2B 651db21b676cd76ed69d8fa5f910f9af3827500986043edbcbc12bf2af29a83901cc265ed87cd4eab4aaa079b8a20e65e716db052efee8565768cff90ef1c94e SHA512 5ad2ed5f066f6a23a02925cccb4c07420c16bccb7c7501c637bb0623d0dfc82603c2bd4465c60f48528f18d6a42533a1ab02ae722292a14ec2c9c933803a7dd1
+EBUILD knewstuff-5.43.0.ebuild 899 BLAKE2B 651db21b676cd76ed69d8fa5f910f9af3827500986043edbcbc12bf2af29a83901cc265ed87cd4eab4aaa079b8a20e65e716db052efee8565768cff90ef1c94e SHA512 5ad2ed5f066f6a23a02925cccb4c07420c16bccb7c7501c637bb0623d0dfc82603c2bd4465c60f48528f18d6a42533a1ab02ae722292a14ec2c9c933803a7dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.42.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild
index fccd68c14db0..fccd68c14db0 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.42.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.43.0.ebuild
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 71cd750b9eef..54aeef86204c 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.40.0.tar.xz 99964 BLAKE2B 7ab0dfcca611b28f2f008fa7984a6b7b832ed718d54fd0cbf1b7b810d02ec89bc6f95fb2ffee1d877397ed68abeefdce113a879ad565e8af9cd892aa1fdddba6 SHA512 7fbeff7ce781904ae9d3d57ef439c1d41880558f219465d5b593ee3099d3ce091124067494f5ce9da590ce68ab8f12ac2eda96c59be8d0a767b3edafeb251675
-DIST knotifications-5.42.0.tar.xz 100612 BLAKE2B d79562372d7f6e92bc209e3fb5a646d596da2767358e40fa91e02bd4958bd07085808d983497d56192ad4e3f0e46889d84d0a3d2d1b976e746be8afc75a331ac SHA512 7440bb4b4f025a80d5fc2ffdc10189c7223c0b82ec569f640b88e7fba4f84ccc00a4cbf59c3b31b102db2292ab9cd2ed612ca4c5acc5bf0d65860b891ebb3f14
+DIST knotifications-5.43.0.tar.xz 100596 BLAKE2B 6336ef154c418458ef93324978cc0bb7866ef638df872250387f765df0c57bef1b4ede8cefc7b81322318a9d0e03503dc98e3999852b3368f080902302b21396 SHA512 a90296cdcf557bba36185edda0da037e6a8bc069e5d2d7e3c4f7a692d0fcc8345fd28abed374ba25dd97c5e3f6834cd661d102629a1811b9e76285afac105c36
 EBUILD knotifications-5.40.0.ebuild 979 BLAKE2B 0bb0ce1a34ec9ff786c99316b68440914e2fd588a4ee7b8294f4ad6c5e9287b1abf8a5b1cd9fd9ab2ddbe4efcba3e390915068780c082103c5c83733347e20ab SHA512 00169edd275257fd0437151ebd10397957e76a7d2fb01f8434bd3404e975c133b0bf7aa0496774b95b5c6f85778764bedb2fafd41b5da6b22d5ba4e56b3d2247
-EBUILD knotifications-5.42.0.ebuild 981 BLAKE2B 283b73933621e317390bd0c67b16eb184df1f37f46252c9c75e8701cd0b7e30a3dbca158ffc6aa7ebb3cee10f91254658cc6282052b12a321d64bf18ae4b1db1 SHA512 843783f08b257e4fcf4fc90b8b7075cdc228bb694aba842f4f345987c155ab9a9a61267dda67987a620d262c6ece1d5a4597e06c5b7cd7dbadac191584a43ca5
+EBUILD knotifications-5.43.0.ebuild 981 BLAKE2B 283b73933621e317390bd0c67b16eb184df1f37f46252c9c75e8701cd0b7e30a3dbca158ffc6aa7ebb3cee10f91254658cc6282052b12a321d64bf18ae4b1db1 SHA512 843783f08b257e4fcf4fc90b8b7075cdc228bb694aba842f4f345987c155ab9a9a61267dda67987a620d262c6ece1d5a4597e06c5b7cd7dbadac191584a43ca5
 MISC metadata.xml 336 BLAKE2B 653f2a06935329b39c728a0475b92d1f5a0129e2d4f8cc04a045f4ca5408e3dd78199bea9f02668102d94b6ddf576bac13140b76d621acb03e125363745e2416 SHA512 10046ff92549d9bc3a8487d66095435045700bb85032f00e4f73477b0f7e506006601b7b1a61d341ff8af9a925939fb099b4adc55867f9b1faa5834b717283af
diff --git a/kde-frameworks/knotifications/knotifications-5.42.0.ebuild b/kde-frameworks/knotifications/knotifications-5.43.0.ebuild
index 0ec118ecd131..0ec118ecd131 100644
--- a/kde-frameworks/knotifications/knotifications-5.42.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.43.0.ebuild
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index e03580737c6e..49f86aa43b7e 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.40.0.tar.xz 83672 BLAKE2B c98e95d1d329139e94c707a8f058abd13bf28ea982302394757ef9caffc85eb0a2e16faa3cd85fe5d5b4f6c414c511a09b3a8a40a4e34a0e9f5fe67af4d1b6fa SHA512 0a368e63c5a4af2344293300e2acbf29ee3e07a101e318f883ffa97725b5f05d6bd563ed0f832b59d2052faa3f023be25235a473ad92b0b07456c65f2737536c
-DIST knotifyconfig-5.42.0.tar.xz 83620 BLAKE2B 8e167821c5e6a5acb07470d3b6702d470c3fe3d8bf9b87d34d1cb1dd70e2bbb45d69b3de544fee9581eefdf27f7f41691cf441526a877462526b46cd99234511 SHA512 05a594da25c43decd6a4974cda507a6ddb534e2bc64ac53508a153d4c42e2578ad528cae5b5109a62f70b7eb05b2a0dde296696f7e7d8c237ca79f7bf8468e5c
+DIST knotifyconfig-5.43.0.tar.xz 83604 BLAKE2B f91cf900a591c84f7256cac21680fe419290401696fe085debca225ae3a9e9adc2846745c92582ca7ac3bf655c93d01c0e297f307d40f91a0960d0131955f611 SHA512 2939609042d835eb5ea9c8abfbccd732854313e2882b4e0b966b633f43185ac8b4a0c9ab28a2bd4356b3f3a27fe12b1aee3b9a730280acdc952d0bc58bafa243
 EBUILD knotifyconfig-5.40.0.ebuild 536 BLAKE2B 0b8683056443909fec4e79399dc374bf31f07079baaba9e83fe9fc8e3c8a713622ae8ccb0e19c9d0eeda087f8d6350428163096ff902fdb41de7d0ae822f6290 SHA512 8b2ca475073cca3a27bad58dd0602545a7ed5845a9bb78290d36304c0e0d44ec4f41ed70dae2194a3cc17afbf5584d41f3744cf708772c3358f12c7ba5aa36ad
-EBUILD knotifyconfig-5.42.0.ebuild 538 BLAKE2B 1adaca74de90d83dd8820547a993c4121d371c1ea91af683ab942a9fc63c1f8a70ad7e451799aeacda86a9d52abcae23d747b543f663c5d613b81139861c4666 SHA512 b55318ffb048a8e72564f950dd7dc662a0a97f64d3683281495495de384159611af17423698ddfb40ddacfbbcb5d794fd5f3f19de3519659cbfb8eb3f6f326a0
+EBUILD knotifyconfig-5.43.0.ebuild 538 BLAKE2B 1adaca74de90d83dd8820547a993c4121d371c1ea91af683ab942a9fc63c1f8a70ad7e451799aeacda86a9d52abcae23d747b543f663c5d613b81139861c4666 SHA512 b55318ffb048a8e72564f950dd7dc662a0a97f64d3683281495495de384159611af17423698ddfb40ddacfbbcb5d794fd5f3f19de3519659cbfb8eb3f6f326a0
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.42.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild
index b8f9b7f9e844..b8f9b7f9e844 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.42.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.43.0.ebuild
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 8d59229c5568..46218a3a56d3 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.40.0.tar.xz 125604 BLAKE2B f5d8f597eab542813810ff4b87a34f79f682b125e546fd524ea158b21e842d1f98c37f7a9a967de2139cdb8ea373f5c8accf3706554e82993caea0674cc04e67 SHA512 969250d2bfeabbb9e69d940156adde87d3819182bd71a36f4b02a7145023e39442b18785dc3ac58f44bd5dd865cc8dad88b731afb7def38f0c6e333553452870
-DIST kpackage-5.42.0.tar.xz 131232 BLAKE2B 4a33b880ccbea556d36228baaeb89343a58d036081f98a0de134f2e49ee450a289d45dad1823a9a72275c06ac070dc48eb8f5a8a03f7d7ca5352812c27314de5 SHA512 e70bd93df21d5d0cfdd4a39d53f71d4295e3b82c2655755fa36a83f5043816c039227d40cc38441fa0ae34d43686b3b167c98a8787745d4b4cda3b1b823171e6
+DIST kpackage-5.43.0.tar.xz 132080 BLAKE2B c98e3ebd35c28f18f76bb8a9e3f222eadb0372fd9eee64a2696962238ee76a9185830b72174eb71ce6b5a1c2d60a8ee2b29913068819736eceb05d003f0009c5 SHA512 bb40407ac358fe2cfb555bd50a653503763412b9ab131cc42873f0ed0fb93ac122f551269848e8926c37722091ab3c5be1bc868eaded92a708e42c34960a375d
 EBUILD kpackage-5.40.0.ebuild 555 BLAKE2B 38b9d32d14f6116a38a4608b71509a21971cb35f583ce17c0cbaba53bb924d83f9e79694b4933eee40ad13ae93b4faf4473ae897daedc179bfa3f399732fcc18 SHA512 016f191edbee6dca02caf5c59a608916bb5b65561a135598d5ca0ff1808e3ae75559eaab4345aac031006d753cfc7dc18ba4f7f5ef709f6acba962fd5c92e013
-EBUILD kpackage-5.42.0.ebuild 557 BLAKE2B f2b1350d6c56ade23effc1a95de0f0d834781eb6d16b0e9093e646076f43f823862408c688bb7164d5fa06515c5f02dd749ebef4cdc2fc504f8aa817caee6f29 SHA512 d532eaa09f76b1d86d953d7828494c3a1fe7c36412fe10fa99754aeea597707e2fcfdcaf39f752b4fe30025f070539d11f9461dc5c0e93ef54d1d039959db7bd
+EBUILD kpackage-5.43.0.ebuild 557 BLAKE2B f2b1350d6c56ade23effc1a95de0f0d834781eb6d16b0e9093e646076f43f823862408c688bb7164d5fa06515c5f02dd749ebef4cdc2fc504f8aa817caee6f29 SHA512 d532eaa09f76b1d86d953d7828494c3a1fe7c36412fe10fa99754aeea597707e2fcfdcaf39f752b4fe30025f070539d11f9461dc5c0e93ef54d1d039959db7bd
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.42.0.ebuild b/kde-frameworks/kpackage/kpackage-5.43.0.ebuild
index bc804969ffe2..bc804969ffe2 100644
--- a/kde-frameworks/kpackage/kpackage-5.42.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.43.0.ebuild
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 02fec8ea53ee..50d55632dd07 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.40.0.tar.xz 175920 BLAKE2B bdbc34f4a5dcafed935a4bbba89c7d7885d59db85cde1c90c6cc06d6293924365048190477b0a6e36d6be3627b053d1699e8dad42f3bb80029b1b7f1d7ed6d52 SHA512 0ab9883b5583f0d4aae1a27eeadd11b6d3d9902a5672487691275123eec81dcbfbea4f0eebf57eecc01d0a57df828f4b8729165fcc7c74d148acc5fd0a8ed87b
-DIST kparts-5.42.0.tar.xz 175808 BLAKE2B 2c279cada3e54a41645f5651bb2813aa3bb44239c8de00cf6575171f9f0a8b9283ff9113451e7ec92c8faa63ea34867b29becdfc9c8882d07b7b487a9e26b84f SHA512 baab67babf06da1503a789db501d2665991f8930f0fee65ff14ad0c658e959b97d20a758c3f9eba756bdc018ec7a20df1a003c5e2570285e7d5b31114a7c8d31
+DIST kparts-5.43.0.tar.xz 175908 BLAKE2B f450f6dbd0f82ef4a82c9d7238af63a0d5948b06c520e94c167e6e7b91697e73923e344d999689801deea0eebaea435359580ab8fcc9f522c63d1984ef6f9230 SHA512 1ce3acf007f402e675e1c943ee43beaaf9cc54017c9b67cf72eed3c4194ef7499e2e8f5fd93fb8569e33b07ed05d41385f50b9f7c5406ce412ffec977e461d3d
 EBUILD kparts-5.40.0.ebuild 714 BLAKE2B 5f0a87406ecc6c782edf8ffff7a9eac2f67e2014acc19a2923c96ae968447a00da347cafce9b1def0b7d12cdbb486676f7687240c813344ca932bcb9cc35449d SHA512 e993b6be81b7d112540309ed7bcb16fca83518edbe3ae4c1a42ff00914a1942d8c7dd478591359d67d1d7ed6d54b638212b0e38b8f66cd135fff44040fe107d6
-EBUILD kparts-5.42.0.ebuild 716 BLAKE2B f323602c59cd3a56d5c30fb6dc031825562d252e92d5ebe4f63979e1bfa714edee2566f393ceac50f48659b10d69253704dadbca4c7e3a1a43122c6fce49ba26 SHA512 8d56ed0dd59509c7108312d5a207df0b2e37138f916eaea7fc8ebea9a4d689cf1ba0a653969c1c4375b2a72cdbd2764da331ca422c609d09d9d9ec906ee69bbe
+EBUILD kparts-5.43.0.ebuild 716 BLAKE2B f323602c59cd3a56d5c30fb6dc031825562d252e92d5ebe4f63979e1bfa714edee2566f393ceac50f48659b10d69253704dadbca4c7e3a1a43122c6fce49ba26 SHA512 8d56ed0dd59509c7108312d5a207df0b2e37138f916eaea7fc8ebea9a4d689cf1ba0a653969c1c4375b2a72cdbd2764da331ca422c609d09d9d9ec906ee69bbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.42.0.ebuild b/kde-frameworks/kparts/kparts-5.43.0.ebuild
index ecd80b16ac31..ecd80b16ac31 100644
--- a/kde-frameworks/kparts/kparts-5.42.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.43.0.ebuild
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 33944ef531f0..0e788dbdc53b 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.40.0.tar.xz 59692 BLAKE2B 70d8657c55fac82817d57415841dac99b22c3a58050feee2d061a201e8833c1b2eb247d26ee77ebcb080d401d29cc6e9405b80f43a7d8cd866ad069fd8b599ae SHA512 18b57e846bc614371c65c63662238b806c7dfd999be97695eeff1d1b4e4edb92ec3b7363e5876ec1bb9f9ff9335f6d7e8bd0140cf488f180fa660db20baab665
-DIST kpeople-5.42.0.tar.xz 59572 BLAKE2B 3ec2bbb4d9ca41a5dd6595c388de34d82b40aed98612ed21d35ab03348d5c3337a2774c13a63619eaf394a4548f43e9e1a4b196b529aeb00fa92c0655150f269 SHA512 a2dd648c3618f139c9b3f6df4a6ac01caad23297cd37a8b8fe5c0f65314b8c873c87ffd546dd4adf1c8edc78038e3322f968693a2502a8bc0b8b90f07cba29da
+DIST kpeople-5.43.0.tar.xz 59728 BLAKE2B 09a812f893d9d23d2b574d16de92b4ff9a363b16f61b1ec37b6964d14ec37dee24802a283dec4dad8ebc2fa6c133bf9c0ba266f79fe3ccad47e7639ccacc5bd0 SHA512 4eceebcf4a155713ee8b40027552c45d7cbcb8ce155394cb5aa57df28f7064486219f766cedc33a0de1e0969920d76b3252100688f546d71dba94064c1e2ff87
 EBUILD kpeople-5.40.0.ebuild 751 BLAKE2B aec350a4722b024f8ee348d72b6344e4f47e5710f8371c638aaba065e2417ec7f3b3c9c4b5fa0a2703fe297ae2ddf2f12db8aec8e983cb27438d650b28b5dfef SHA512 9b6c79711b65e5fef4c3af2619235abbdbf22b4b3922be303f246828b7f0daf3f1025cbf6865358f265a1a4de8878c56504aa4e7f46d44e051b07da52a9b66bc
-EBUILD kpeople-5.42.0.ebuild 753 BLAKE2B d09d215aabee577e17d722b774e0a8cf3bbef30cafa4696ddd9630a24cc447fbb45d5577dd0ebfca3ce40de04eb0a6c0f27d397082e3cf49e37b1d0dd02be157 SHA512 d394b1a87900f3caf570bb60f62b2631db1defc1a595cebc508080443ad35d2f0628b158e9bd424f6f2a826958ab02b9700043009a39a0f9e8f38a768cf6f649
+EBUILD kpeople-5.43.0.ebuild 753 BLAKE2B d09d215aabee577e17d722b774e0a8cf3bbef30cafa4696ddd9630a24cc447fbb45d5577dd0ebfca3ce40de04eb0a6c0f27d397082e3cf49e37b1d0dd02be157 SHA512 d394b1a87900f3caf570bb60f62b2631db1defc1a595cebc508080443ad35d2f0628b158e9bd424f6f2a826958ab02b9700043009a39a0f9e8f38a768cf6f649
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.42.0.ebuild b/kde-frameworks/kpeople/kpeople-5.43.0.ebuild
index 9752db2519a4..9752db2519a4 100644
--- a/kde-frameworks/kpeople/kpeople-5.42.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.43.0.ebuild
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 62b961177458..7be9586f1539 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.40.0.tar.xz 29728 BLAKE2B faf2b25dfe0efcfa2b9069e7f856d00f4c9cb4774bca3294d9435edd4786f4f6d731f59d9229cb002dd6c4b2d06e6c0c58fd8a960376aef39e917e3711fd621d SHA512 71a9ec3d041c3cc05f221230cb8727873eb354d8b6c55b12aeaf1f8b41de492d37a66d47baf860b1b222265211351245dc47ff5d08f2c5839cbcf24b5fb53b40
-DIST kplotting-5.42.0.tar.xz 29592 BLAKE2B 6f6bb0e9f777092275d10918394ab6fd1f83f3d6de6b1215f77722c1a74e3225822f1896fd2103b0c365df8b72ead06045f50069934aaa3f5822d63608aa57f9 SHA512 0b79f63b0d399b6db77b9dec2c6b55f763c0b207f8e2296039717a8fe8a0513dbf1d04e4caf8d538340307142f840e7e70daf72ab2944949bfc923346426b20c
+DIST kplotting-5.43.0.tar.xz 29596 BLAKE2B de084fa797227b70032978484c8cfa8d71d750cecc0ecd26277b760d22ee3bc2d77a0ebf93f75d6d854764fa58b76b497053c5e5d2e6268c96061ff2c4836479 SHA512 98b06b2f5242e03b4e67bcbb28d3abb695e4fc21ac37de47384fb872045fd64016ebfc276b0bd48e797e5369a747c2da81fd03519e1b6747e48205c53e69c7cb
 EBUILD kplotting-5.40.0.ebuild 356 BLAKE2B b468cae3c2970b6e8fa0c307428a12ac7e2a8dbc96a937b5823ed2033ccf00646d6a7275798c6845e57384eb7922753ca192d77cc0551634b753735a37e0a2c4 SHA512 06a0895d2d6c8fe6df04385bba56dd7f9741bab3c911d6246c24916663ec3446484c3f55a00b9b9c8535226ad7d5f7555fbf88c7aa26aeb40c6f42b2f9292710
-EBUILD kplotting-5.42.0.ebuild 358 BLAKE2B 62d1f3da0f12de746d9f0f7634c8508836ddbb6bce9c07f56185abd4f31cfaea0b672db28ae490eac9da6c2d37aa27eba5eb399393f06959860b48078b2df7a9 SHA512 35135128bde28c7d7c0ba400a0dc0ec7075baaa56e7930fa80307427c2f6dff38531f4d08837303461c2137012542600c443b1be8f15a77d0600243fd4d114b2
+EBUILD kplotting-5.43.0.ebuild 358 BLAKE2B 62d1f3da0f12de746d9f0f7634c8508836ddbb6bce9c07f56185abd4f31cfaea0b672db28ae490eac9da6c2d37aa27eba5eb399393f06959860b48078b2df7a9 SHA512 35135128bde28c7d7c0ba400a0dc0ec7075baaa56e7930fa80307427c2f6dff38531f4d08837303461c2137012542600c443b1be8f15a77d0600243fd4d114b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kplotting/kplotting-5.42.0.ebuild b/kde-frameworks/kplotting/kplotting-5.43.0.ebuild
index af9c36c9cecf..af9c36c9cecf 100644
--- a/kde-frameworks/kplotting/kplotting-5.42.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.43.0.ebuild
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index c23eca6a48f1..2d4aa9e16bcb 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.40.0.tar.xz 58348 BLAKE2B b943ffc92707ad6b1e54dad4f8ab2eb248b78a42bf210c9b41338bb16323d14c0624f7c1d87e5d93814ba6ef524bc6167eb8d44a6b661bf5bae56524a1179575 SHA512 85092a0ef665f7bcb22573c8cb678a4bd0f62a22e02f321caaf3857998396c1fbaeb135a7a40abe519e5421a14932e348223c2a7956befdf7b06cea378f8cea2
-DIST kpty-5.42.0.tar.xz 58236 BLAKE2B 7d748bf0ed4de0aa36e9b75cafd0b3267db1b5841add678809dc2124c020c5341100c38619b171b07dcf1b634823c49d09087dbf2be310492fb1186366ad6644 SHA512 52830cb38c594c0e9841dd708b9ff6341b91bcb863b217810fec13e7b16c3419d285cfc2acb5eccdf3a59aacf3cb48ff484aa1413693eaa897ea24cb3ff7ca4c
+DIST kpty-5.43.0.tar.xz 58232 BLAKE2B 83062be1f33dfb3d1c18bed7372ac259cd06fc3ac5d35d4f7ec29922cb1faff556d0301b9c8ba58a6984f0800dbebb516806cd4fd5d103d238f551a2eb2dbcc7 SHA512 8a09b2c5b864e5c70d181eee387ce1890cdd3b2efd1641a982061a102a677699b4a4376ee9a02e16cd3ddd29185e446b257c54131d8259aa9e2303856907a016
 EBUILD kpty-5.40.0.ebuild 508 BLAKE2B 0e8ea8d5d47c15adb205a17bc949b95ae2babfb7de38d5f7b464779832924543fd41865f72ecb9cba372094df39fbcca51ab38b3bc3eb4fc59246ddde5a8efc3 SHA512 c056216f589f45171ecd7dc250e21cdfc6bbde30df7a9254bdd82458d4b53b8c3ed6e0b58c28a115bb9b8fc6de1bcc73ba817e5000b8c48111fd2fb6f081fc8f
-EBUILD kpty-5.42.0.ebuild 510 BLAKE2B 10d16332edee8fb67f9c2ed59affec1e4e30cff441daaaf196bc47049df311cbe16ca9322c52b694d623c43285d9390f36b5d0dfb5a0049627563184e4ce463c SHA512 84ca0ff36d38e2e71d487370102941591ffbcd23c617c9f4066323837986475fac744f6509e6dfc2b0e6d6e6655e050c4f6aa079371fb3f391f407f890d94c89
+EBUILD kpty-5.43.0.ebuild 510 BLAKE2B 10d16332edee8fb67f9c2ed59affec1e4e30cff441daaaf196bc47049df311cbe16ca9322c52b694d623c43285d9390f36b5d0dfb5a0049627563184e4ce463c SHA512 84ca0ff36d38e2e71d487370102941591ffbcd23c617c9f4066323837986475fac744f6509e6dfc2b0e6d6e6655e050c4f6aa079371fb3f391f407f890d94c89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.42.0.ebuild b/kde-frameworks/kpty/kpty-5.43.0.ebuild
index 052e41e44cf6..052e41e44cf6 100644
--- a/kde-frameworks/kpty/kpty-5.42.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.43.0.ebuild
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index caec30e6a8a5..76829ffff71c 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.40.0.tar.xz 127968 BLAKE2B 0d6bae7a418fb441ca51c131095b9ff4f549395d3169050403f8275ae4b04b40fe04f6db7bfc5879260fb59fe9600039ca8db80030623142cc96d7bf062e9d57 SHA512 03051b30d84b9353e8397e39fec221f5e09899ff2fecadb347511d598099e374202c1c7b5553e323744237c4ed7c632f69ad708c5f6ce18ae9d57ac09fd8d88a
-DIST kross-5.42.0.tar.xz 127828 BLAKE2B 8a2eb1e0ff8ccefdc2b62f5c25b5c3b9ca2b3b4946e1776094a5f1af7211a96215af02e9fd9c1b2ce1772aa30173a873d305cea91bcbca32353e9eff70401a18 SHA512 e9f5bbc984e05bd3bfc5749027c4181d511ce67c77ea32eb6b4aedfc5a261f5142e74d9e2e92e48631f9da11731775f1726274d17c3ddfb10a61516c02f1a2ce
+DIST kross-5.43.0.tar.xz 127824 BLAKE2B 1775ad08a083c22256821b6adbff79219e98ac5b6289c5d292ed7870f94122717ac1cfcb86d6ec4c94e7d8289a398b17d5e39d86c53818afa6290ff76d6af627 SHA512 9ccde9efbb51fb8f90ab7ca5a824850ce3e37b2af1c972ffd2c079f9911a6752ffa1c98df11c6b35372e26fe014cd5966b44143a541972989e0668ec15299952
 EBUILD kross-5.40.0.ebuild 734 BLAKE2B ba7fcaa11b834737f40640a470f308f5139aa6ca0688ab63176e3fc8e40a91a1cc79b4379dd418e381eb8614399790785feb432149a6f5c7727ee620e23b2221 SHA512 812efa7af65c4cc7ca657231924176b50b6edab6a44386fffb3472499e59fdc3fd0c8a1c8cc4e6a8a3b2bba305360dbb430acea7954ae4329c7f79e1b09c9d68
-EBUILD kross-5.42.0.ebuild 736 BLAKE2B b7185f64377781cb9b0a942bb43527f996f6a9aeda6ec7b32e8afe2d6ecf1bcc7a33e75ad2ef36d66955b462a7dac07e4acaec8a96b03db85c7172bf95b39205 SHA512 ceaa8e9a369737462cee4104a241f51a0a4119b63f3c0dc117b8e541e830c9d0c2dc5aa79ec7c96e687bde69def18626f85c9de23ef3f17f11ccc582ec092461
+EBUILD kross-5.43.0.ebuild 736 BLAKE2B b7185f64377781cb9b0a942bb43527f996f6a9aeda6ec7b32e8afe2d6ecf1bcc7a33e75ad2ef36d66955b462a7dac07e4acaec8a96b03db85c7172bf95b39205 SHA512 ceaa8e9a369737462cee4104a241f51a0a4119b63f3c0dc117b8e541e830c9d0c2dc5aa79ec7c96e687bde69def18626f85c9de23ef3f17f11ccc582ec092461
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.42.0.ebuild b/kde-frameworks/kross/kross-5.43.0.ebuild
index 7b2f82f7f14e..7b2f82f7f14e 100644
--- a/kde-frameworks/kross/kross-5.42.0.ebuild
+++ b/kde-frameworks/kross/kross-5.43.0.ebuild
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 58e34651de76..f8995374bbc9 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.40.0.tar.xz 60644 BLAKE2B 3e03cc566dd2326487c9626b4098e241905eb84df4a2d1591ae55d32a51a78233c01fbf8ef4b223f2248b9c2f80b9976a91ddfea6d9eb3378a3a869a728fcae9 SHA512 fc634c01935096500614525f33c60497946b43d82f2656ab601ca49147c3d615288fa25645daf83c9fd6e734178b0abcd6c73f238ad8c5866ad1a47e83e60bb8
-DIST krunner-5.42.0.tar.xz 59976 BLAKE2B 2dd302d5758d4ff51356ae111ac4d9230ce410f765ff52aa471211fb986ede34ba54aea60a0154fe33e0aba8e291b051548495919488dd6c0402cd9165e75c7a SHA512 23e851abc96f21d7e3d7c1c1a43f4abd41c982a1bfe48901febe70f0c926f9e957f3e4ae15bbab6b0ed7d1dbeca2c89da70064d6fbfdb3b5b44f5843c7f639d0
+DIST krunner-5.43.0.tar.xz 60016 BLAKE2B d73fe10b6353dc77809b125bb0efe82e9feecd0fdb59dc32a7bdd5eb9a802d914266647918f1c7e66e02b7f584faf9b2a32a015b45e84c66b1edf247bec6837d SHA512 c6ec92e0dbb8eb2d583af1d763cea6df1231851367148a94d8eae6aa88c130798cb8f3f2fb65946c55a51253c91e25fee539d7720a1f7125f78d2d5aabf4b05c
 EBUILD krunner-5.40.0.ebuild 798 BLAKE2B 50fe4da02b9cf9d5e8508587ac97aa5cac4fb2b91c7a1f889192b8ee06040e88f654c4ff11e5f2dc32af812984d7a76b1a01de13d5abab117ed059323f630c6e SHA512 9aa72f057dc470ac23885dfdb5bc27375af3d677efecfe14af3ade255e1d43ba7f5f921171c89fc2356baad1225dc0ddb8a9e8cb229d9fe147c3e842ee5993b3
-EBUILD krunner-5.42.0.ebuild 783 BLAKE2B c90937a5a69bd1b85a66c013a17e37b7d085e3bab36d4d791b5d007dc647b7ad5a779ddc7ebe3e48622247523edaff951d693f86eb7538e4a55e865ea9ebed39 SHA512 df8ca3067d3862724299ea74986d978101b33fe04423d3d25cabd0621ff30d25fc5b893f9e1f77f0f16c48960b0d0afda2cf642a6aacc33ec7a84ef0f533e087
+EBUILD krunner-5.43.0.ebuild 783 BLAKE2B c90937a5a69bd1b85a66c013a17e37b7d085e3bab36d4d791b5d007dc647b7ad5a779ddc7ebe3e48622247523edaff951d693f86eb7538e4a55e865ea9ebed39 SHA512 df8ca3067d3862724299ea74986d978101b33fe04423d3d25cabd0621ff30d25fc5b893f9e1f77f0f16c48960b0d0afda2cf642a6aacc33ec7a84ef0f533e087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.42.0.ebuild b/kde-frameworks/krunner/krunner-5.43.0.ebuild
index d15b1eb63faf..d15b1eb63faf 100644
--- a/kde-frameworks/krunner/krunner-5.42.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.43.0.ebuild
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index fe872107c945..11ae084deaff 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.40.0.tar.xz 250072 BLAKE2B 9f7e55d0a21f13b1b1eb651b10b8d7800fe93521760a23d40326227541a9b1b29b92783bbfa4159e84cf7db8ac3353ef55f963bdc7e43b365efd77e230486f7b SHA512 362a81aedb24f0fb2c598329e8b4fb174435b756f9a13617935d96eed1e5d40be38a8f27c7aedb0bd0cf07e73b5e1d464d53266e34b426958876aff2540fe89c
-DIST kservice-5.42.0.tar.xz 249852 BLAKE2B 00a282e8ef5816a36908ed072012e315acc3e9e0a72d74e11fe6d01b259575d9919eefdd3dffc3c835b48ee7672fa2bf0025f9fd3c4d149ca27575480ab5c68f SHA512 dccc59a5638fcce3c73e358baef0632cf089280f85551e712901a281410146b2127d1dde7a8d9ffac44ad8458cad3b2eb89e667ed73d351d27cac9e2e4ca4be7
+DIST kservice-5.43.0.tar.xz 249920 BLAKE2B 81cdbb26ae2f58cc1b4767ea7f62b63f525a9c2887b5426d8ec63d2eaf675516199c9a315a9b9fff5b760de8d41c6f8796ff5ebc91bcba40cf680fd12b4c6f6b SHA512 bb912b7bfdd1473bd1b324dfd4ce93c7b9de69f2036aa7fc849735a797e76617b2d736a8e464d38e4b09fd3f9191336e323325c365c99e987be3df60268651c0
 EBUILD kservice-5.40.0.ebuild 941 BLAKE2B 97fc609bc8fd107860af30cf6b82cdc81d2917c8a3d2e1aeb73692b496edcd1d67dce7ef163c9d96a7a34ebddaee5dfe1747c2d381349080c3349bb207bda2d0 SHA512 8aa5365b784caa3960dcca985839dc5da7055e3d569e8404be9430502070483bd66d30114f6d835afac3db479bc898897e73cc7c64afbf3a664cba0c36d9ec81
-EBUILD kservice-5.42.0.ebuild 943 BLAKE2B d0108d280d361e446986bf451be95d1006724b7383d3f319f6336dc72a42cfaaec553863eda36fdd48153b33481edfe25240cf399a7a4f9858ed492b564b4732 SHA512 0ded01c1f8728ba4f9c90d3771fa82f76b6dea74a6a2cfacd6e41a77f6eb9def5db3d4ca52e7fec3f1e1c69bd0dd0cc2489fb4eaece2f329ae98868f0b443487
+EBUILD kservice-5.43.0.ebuild 943 BLAKE2B d0108d280d361e446986bf451be95d1006724b7383d3f319f6336dc72a42cfaaec553863eda36fdd48153b33481edfe25240cf399a7a4f9858ed492b564b4732 SHA512 0ded01c1f8728ba4f9c90d3771fa82f76b6dea74a6a2cfacd6e41a77f6eb9def5db3d4ca52e7fec3f1e1c69bd0dd0cc2489fb4eaece2f329ae98868f0b443487
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.42.0.ebuild b/kde-frameworks/kservice/kservice-5.43.0.ebuild
index ed1da52d31c6..ed1da52d31c6 100644
--- a/kde-frameworks/kservice/kservice-5.42.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.43.0.ebuild
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 6bd5c1773a20..e89c26af0fca 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.40.0.tar.xz 2296760 BLAKE2B ab4e458144dd0d7ba7460d9a0b9e3fbfa3c554a180c070976fef5372f447ad595e2c1ca9ac1dcabd19567c408efd46693b47894a9fbf8e6dc1ec681eb2f9d9fa SHA512 933b1a65e3d4bcc5347f35b7ed5d67c07a4060dd8fb755275e2aeeb40b3107b09b361faf7d95fb33991a9c36ed49f4c5e08ea9887b98a6096dd8ae0dbf48b208
-DIST ktexteditor-5.42.0.tar.xz 2301012 BLAKE2B 029a793515e2c52b8fdd7f51b73f306c3e3dec8f43a9911626ad7b232b730402017d924e2fc14e72bdf4ce90a62d341acf2c92ce214595ceb72ad4dcc5c97a61 SHA512 a0a301a1409c3f3f792fa63db35b30eceb47da334910576b68a42b2ed3e3a17d7f8b50696b5a27b4278c81706e856b183637d5c104e378ae1020f1d80255291a
+DIST ktexteditor-5.43.0.tar.xz 2302580 BLAKE2B 458e60148b02f59dd2da11a865bb11386b38a483493b3e7cd95b2f9edef4d8b90c03e453a37411f64e70ea66a81f486bba934111ae9e8d1361c1b38e6e7ed69b SHA512 fc2b3b69224e62d1bf240410fa5c3dab04e020f210230474e5e924c7125f626cd2dd30dee449948cb9197adc8f0d6e1886ed85e03312a51d116d86fc13fbf08d
 EBUILD ktexteditor-5.40.0.ebuild 1425 BLAKE2B 8ca61b342d2940b881dde30fd7f62e62aae85bef4bbedbc700ff35b1ef5107a2b8484db7ccaecdce0895c26fbc6af6ca56924254daab42ffef9a463e5ce83c07 SHA512 fac45bf208abdd79228f1c2b808cbda325cc7dd1f0190a654c23273ff1c437f1012eff249fa2b5ac2c2f8189d12aff54a4e9fe1814c2bd1a460771fc26febb05
-EBUILD ktexteditor-5.42.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
+EBUILD ktexteditor-5.43.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.42.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild
index 7683d63307d2..7683d63307d2 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.42.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.43.0.ebuild
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index f7653be2be6c..f545f03f6b7e 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.40.0.tar.xz 308804 BLAKE2B e50c441fe7765a07b0241d98f2ec31f4a45a8dd1445c7b836b5df6458592374e3ececd6557b4a97b2bebf76e396516e893b7d7931c245b5c7970dda4bee2d3e2 SHA512 b24af586ff3832432d89106ce45d5b549958998a6be230f5ecce06e47a1ac55aa61c30f1d0a1f3ac1e51cb17bf4fea18990a9f33ed8ebb8f988d49bbc55023f3
-DIST ktextwidgets-5.42.0.tar.xz 308704 BLAKE2B b9bea9837ffc9ddb79ccf9271a5b5f982c7fd145011dbf8aa853b650efd355b683379b4272030b3066cb001eab842b18a0874050bf15ac20b2a8b0b07479401c SHA512 089b7cc2ba0e74908b9a8662e0feb7921c9f18aad2b484144da74e2539c381fc2b00ede2aa8b3b5e3c1d357ec0826cd3b26e0ce21cbc07c623de7d8632e456cf
+DIST ktextwidgets-5.43.0.tar.xz 308768 BLAKE2B c4e4831cfdab088b27adc9c65b91aff13cae3282c3999ca8004913caa7a46d89e1c1c0b1a04033b5919c339f909fe65cea57cdb582c45639b0e4b632e8d6dd8c SHA512 650272ba85a1d0177296fd278fa4183ecc6c513b00838745b5e1fefe015b621f1edfad25094ede3de8cf81dec4f66653b3c25ed2bb5a55e4a2ee54b2ef35da6a
 EBUILD ktextwidgets-5.40.0.ebuild 899 BLAKE2B a3eebdc052b423e1fb4872c42d009dadfac1d131389634dad3f8fceb7553a115aa0632c6cdc4d3c6ba5718ce1d3a5bced9fadecf92b2fc56c8c281716da633aa SHA512 7ed4f0c66b3b589f6b645f1c0af9aa5cc42d02bad9f3704f5b48c514a0489aaa7ef185759889bb6b693c079bfbe47ebe3483806e1ad23422a346031dba4875e7
-EBUILD ktextwidgets-5.42.0.ebuild 901 BLAKE2B 3a0aac93faa3492308066c10f35abc66f42ed56bd3f1dd1c0bf82e9686167b8f0e12651e3bd2c20c46e25ad1e1e1a87adc3bbebb72007572c7d858af2d29d0be SHA512 90fcc78eab913ca66886bbc4294264ccd32be9a76d25b6e383089d04562802857dfd120f85090a9138af2a37f8c93b2350174ea3cd08a46165366a4a619ba556
+EBUILD ktextwidgets-5.43.0.ebuild 901 BLAKE2B 3a0aac93faa3492308066c10f35abc66f42ed56bd3f1dd1c0bf82e9686167b8f0e12651e3bd2c20c46e25ad1e1e1a87adc3bbebb72007572c7d858af2d29d0be SHA512 90fcc78eab913ca66886bbc4294264ccd32be9a76d25b6e383089d04562802857dfd120f85090a9138af2a37f8c93b2350174ea3cd08a46165366a4a619ba556
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.42.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild
index 2bbfa4f065eb..2bbfa4f065eb 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.42.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.43.0.ebuild
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 9b4b0c1b7e41..92155fe8e9d5 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.40.0.tar.xz 772184 BLAKE2B 19e677d07aa5550636e8882d22371c06d67d5032b8ad12490aca0b5004b074834253da0525fbb04f1f31dd69a504f291d1ee26c0cbd761802cdf9400182a936a SHA512 a863956bf359b694cf3f2ffe7de2e79abfe379b6ed4c68ed73550da96c5d98f3ec562e7f790e97731abfb5b290dd874a459e91d38edd8918073d10c5b16c896d
-DIST kunitconversion-5.42.0.tar.xz 770968 BLAKE2B 34a5fd6860cedd64b2af709c8762886358b2ba3f2831dde328872410a88a484a513d4bb1cf5d1102db6916c895e34e370a8887830f83cedbb48e84f80cb4f34d SHA512 c99e9bec7a6dfa801333c49137446f27bd072d424472060fb73dd1c68beeb6c50620dd031ea9adf1325d8402e896bc6bd4e4c34ea0de7818851ae24c7bc30817
+DIST kunitconversion-5.43.0.tar.xz 770752 BLAKE2B 3e4d30e18206468e3c010d49dc0a266a78a5d1aa22020aa6e97ebe60e72c009c47a2f1ba91e290e75b352e142eb3214ef23991e1cc8682d83352c63bd4d25f0f SHA512 bcde5bd5208fc5762c90e6b3c152bf4abb264d776dc3256ec246b1d0b9079d10ffcb1679a87ed4c0e39a1caaf092e5b4c3a1a8790adc1faeee148c8707e4aafc
 EBUILD kunitconversion-5.40.0.ebuild 463 BLAKE2B fe0686ce1f4d7613740590f4a07ab8d6b6403c2c00ff58cabdeff00e1e5372c2d93a6d44ee48192c1d74c1626f701b6c90a27fb7e555965ee799b32372255f5e SHA512 9d638896966588eb5f0b7fd51893cb95a02d16b45c873a64088a4150ff53e0e7c1b8f0b0a6a63521e56bdc6bc8f5485e326622469bf96192a6336d61217e7ab4
-EBUILD kunitconversion-5.42.0.ebuild 444 BLAKE2B 635cbf217f3292c2c80edfd0ad8451ed99cb351b9ec8cf6e49fb7cee0940708c60607a008bd9fea3162f3686f5c162c6cfa3569c3016d844f98e3ed19415bcc3 SHA512 2707cf4e5e2cb6721032c31b640a009c2993bee3b264066f9ff2ff77084feb9a2c2719c758f3596213eef2f5309afadabf883e93cf499df50020024a71f71620
+EBUILD kunitconversion-5.43.0.ebuild 444 BLAKE2B 635cbf217f3292c2c80edfd0ad8451ed99cb351b9ec8cf6e49fb7cee0940708c60607a008bd9fea3162f3686f5c162c6cfa3569c3016d844f98e3ed19415bcc3 SHA512 2707cf4e5e2cb6721032c31b640a009c2993bee3b264066f9ff2ff77084feb9a2c2719c758f3596213eef2f5309afadabf883e93cf499df50020024a71f71620
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.42.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild
index 8f880d3d8fcd..8f880d3d8fcd 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.42.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.43.0.ebuild
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index ba710bd0c74a..c240caf4f205 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.40.0.tar.xz 306244 BLAKE2B 84fbefe01377d3c960274c9750fb7eecf3c0f45143004a35a9b331f197b84a807fb37655ad9793d0f4c8e29781ab30d0c09977ea24acd196a4eeeddd07254e58 SHA512 a162d5ed1901fe3c8675f715ddb9a32640d7b563bf0755a7add885208a8f55465d9082d2abb9553d411018d3a5a4856b17efc94789dbd5993ac6f11a8a0c71c8
-DIST kwallet-5.42.0.tar.xz 306540 BLAKE2B 7aabef63f3455c947d84d531f5181ba97364cac8e0e29264599acbac7e94df2f8bad154a097f6bec187f4e35bf98568fbefeac7e002e9d61d667911ecb829997 SHA512 800eca462be0f95d5f0c41aef8cbf5513b5599cea988c49fe94dddc5803ec2834acde0f44a83d4739cef120cbfca5807c523c3b5a7a7f07f1ee3372fe5e63987
+DIST kwallet-5.43.0.tar.xz 306848 BLAKE2B fbeac0ae4df91dde98840c3c88da30d43ce7ffa0fb4f18a5d51f0d15921d613804b235b0aba81c113ade1faba979ce105eaba956fcb9958a092925afc589d133 SHA512 38d129c45b1c2282c1e09a01fc9316b30b0d3f3c53f1b56dba295f732a2aaf5dab7759ca40b46ec80985d773a59a4ecddfc6edbe7fca7beb59c3392dab44e13b
 EBUILD kwallet-5.40.0.ebuild 1574 BLAKE2B 9ca7064bfa9cd5bcd6d51138a7c90da5002ea5cc8cbb2f92a2be8102083d50e6f6269aad1c3613540b0835d99b71f1a359a8aabdd9d6818c6c6999078557063f SHA512 21bee1a8001f9df996b093a3a05a8cfe91ed98dc4a97619cc250855ae38675af4c76e6e1e35ee84134eeebd4801d3f605cfc48384a0c9f03021971248b1e4256
-EBUILD kwallet-5.42.0.ebuild 1576 BLAKE2B bea0446006a7d6610c1c06fca0b8df0a7431bb7fdd45d2a8d80cd41fdda8ff2f13f19dcd119859bf6f6b8bcea64948806e53229df5c4064362c30c83280319af SHA512 17c1643b34a2501924da0712ba5b1cef4f9a454b54449515342d95ae074fdba4618fbe844367bcbd1f90111f1d5b45b18d6da3584ae3fb250dca8b89026c5516
+EBUILD kwallet-5.43.0.ebuild 1576 BLAKE2B bea0446006a7d6610c1c06fca0b8df0a7431bb7fdd45d2a8d80cd41fdda8ff2f13f19dcd119859bf6f6b8bcea64948806e53229df5c4064362c30c83280319af SHA512 17c1643b34a2501924da0712ba5b1cef4f9a454b54449515342d95ae074fdba4618fbe844367bcbd1f90111f1d5b45b18d6da3584ae3fb250dca8b89026c5516
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.42.0.ebuild b/kde-frameworks/kwallet/kwallet-5.43.0.ebuild
index 9ebbc724defc..9ebbc724defc 100644
--- a/kde-frameworks/kwallet/kwallet-5.42.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.43.0.ebuild
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 1a0a08bcc753..d49600cb6e6d 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.40.0.tar.xz 284976 BLAKE2B 756f461e431647fc80144eea85ba24fdbd9eced45c8d1802369c7e42d7e1590ae1481af98d2a3561ed7076299f7832a163ee048c9649d4b45cf2ac778c1fd2cb SHA512 3bbf49ee8a7cbf613d29fec59ac1444be1e89946792fc265a6c889fb32cb2ac93aca16ddd0e636daa8fda556ad01210e4bdd6b6ef4783ca95de5b0834baaa403
-DIST kwayland-5.42.0.tar.xz 297904 BLAKE2B 2e82bf6eef464f0bfebbd498abacea28b64169d1c09fa5ece40c74905bd59357e60a0bf1064f931c0281a2bd2c35f2719c6244c83086408c0c0733e10a69a847 SHA512 0b841c9b96895de504621c467fea07483543b50b274511708a21b48f12e63dd206d41f7614cea3e34fd9d169b7f7142f96db4dd1b2b14b7da4f5aa89cfaeaabf
+DIST kwayland-5.43.0.tar.xz 297900 BLAKE2B 1684b506e01cccab46a9d19bbaeb7e98e2a4b3c5891b28c90c03150b3940a492f07540b284e4b2ec19fa76f23a43036bf123c3a4c0bf43a90561686e864e90e0 SHA512 02204faa2f125f9f902315cf2e7377a9ffdb73b1b66624510d1b77f32b9907c71d7e8ca7f79c8c10a2b9ab8e8eae13f8166ae3e33a34b2789c8f2e79aeb0f5a2
 EBUILD kwayland-5.40.0.ebuild 576 BLAKE2B 9de9fdcc57a1e4c040d97c0d74ddf6752dbaca88ba6f82f626668837b0926ea7423d5366146151fb87447eb55191226a550b43f90595af9667bcfdfe65ddbc67 SHA512 2529ab9d1c5f0fe308b868236d538e47866c054a534ac74f03eb2a0e3b366283ebada354648d17ad3c069c95e883a70178ab2bdf3574cd84d925488f192635f8
-EBUILD kwayland-5.42.0.ebuild 579 BLAKE2B ad3c16b9cf6424b2ee3d71d51973d78f63229d1c931a2593fd93bafe07322b0cfd92286812b6fc8f18107781171f4a059a7d4a2768205681a43f195e45eef99c SHA512 8c5d7cdf1369f8fe4b66957c30ab5fb976a773cbc3a464a3c728f25d58452a65f0a2f4ad5f898c3d474292f0dd0ac66bf4961169876cd09f149a925179851d1d
+EBUILD kwayland-5.43.0.ebuild 579 BLAKE2B ad3c16b9cf6424b2ee3d71d51973d78f63229d1c931a2593fd93bafe07322b0cfd92286812b6fc8f18107781171f4a059a7d4a2768205681a43f195e45eef99c SHA512 8c5d7cdf1369f8fe4b66957c30ab5fb976a773cbc3a464a3c728f25d58452a65f0a2f4ad5f898c3d474292f0dd0ac66bf4961169876cd09f149a925179851d1d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.42.0.ebuild b/kde-frameworks/kwayland/kwayland-5.43.0.ebuild
index 4bc9d6baa35e..4bc9d6baa35e 100644
--- a/kde-frameworks/kwayland/kwayland-5.42.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.43.0.ebuild
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 14c03dc4df3d..79111539071b 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kwidgetsaddons-5.40.0.tar.xz 2179044 BLAKE2B ea6207fc550ef58a15cd2b00512f4ff30487b1acd3b337072de67342c26e4d640187c95995c86ef88c2f7843a3409dffb1811181d639c7fdac9c0fa0f57ebe3d SHA512 885afe981ff9aee90b9ed98e6d2d0a458729133ff9b681597a9836fc68c022906ce0e0dc53f58e60a907e23d5e5914993ce6a4610d931b62613ad15a0ac011b2
 DIST kwidgetsaddons-5.42.1.tar.xz 2178740 BLAKE2B b653efd24968fcf212cb8d35a3825e44533113e68092d04d9306f211cb037919e8063f19876a841531f2e78ffd6cd5d98256816048ca7512f88840035e29f7ec SHA512 4ab5549a6dd8c62ac896c9e589ceb3c6f26834f3a03558b565f3781a46d38f81c0f10edb049ae3dd8a358c9d8ce74d5743fb82007c8af9d2379b6ff7c1b80873
+DIST kwidgetsaddons-5.43.0.tar.xz 2180220 BLAKE2B cd82f14bc6d4970377857d0f66a5694473db33459be0337cba863bba206243bdcc1aa4c2c7a3b37df3aded7e88174215c01b5f8be82662cb56ef6d2b56aada2b SHA512 ae7664ab700cdb9aa35334005ae58d49db659cea4112fa81a09a37538809910841494bf97f3f982f99e27a376031645c5d0349e4cc77ab2c0fa6ea9484a08140
 EBUILD kwidgetsaddons-5.40.0.ebuild 405 BLAKE2B 0bcdf18bf22f9f86b4a6147f918fb58f1d0f47cf13910df05bce33ceb74ccfea741ec600e91b054fdf4fb21dcecccab248cc40d2203b60b9f6d54d03aed8bf90 SHA512 146334cc51cdfce91d148bbdeec8c331c390fa21919436eaf738400cd60f45478a4f0d5f2bb923eece4d48cfff0d4f1c3cc4c5716832c3b654abf68a35b277dc
 EBUILD kwidgetsaddons-5.42.1.ebuild 407 BLAKE2B 97de2063f7f6c5aac45a2ea05baf91de163c2a80a67ba225332e4234d9b096541b1ce3654d323e6b4b4c92185528cf112233bf1870bcbf91a0bc35c538ddb757 SHA512 904b449d2787744d2b85d54d3e19b0214b6e7e59ef8d34d50e40803f49603590ef8b7868588977c12f996d13d1db6c35c3b33714c5fd6c4251a13993610726e0
+EBUILD kwidgetsaddons-5.43.0.ebuild 407 BLAKE2B 97de2063f7f6c5aac45a2ea05baf91de163c2a80a67ba225332e4234d9b096541b1ce3654d323e6b4b4c92185528cf112233bf1870bcbf91a0bc35c538ddb757 SHA512 904b449d2787744d2b85d54d3e19b0214b6e7e59ef8d34d50e40803f49603590ef8b7868588977c12f996d13d1db6c35c3b33714c5fd6c4251a13993610726e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild
new file mode 100644
index 000000000000..d59d575f3e78
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.43.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index cc7e63e1bb42..482584bcf626 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.40.0.tar.xz 169628 BLAKE2B 39a5c58a91781730436ebf911c7a31efc12881584c5bf2dd1695ac4e009612064ba617fa2f2834b9a501b7c9f82928c8fef2dca342371303a05e58b0dd54b417 SHA512 e07531098de25d96168efb2820b209b47cc5fd0ea5a9a38e3c7c86b079619427e1e597e7b07fd92ea1a64ad6f031afe037ccc73c64bc59e3e5143ab54fff530a
-DIST kwindowsystem-5.42.0.tar.xz 169544 BLAKE2B 7d0d3fdd6e8ce187872f5c8c5e5b81dfd9aa21c87205c1f8b1c9eebee08a2af98f651e8a355efb42bc282d5dbe10aaddbd96cb28bdd95d91eb86688f86866e12 SHA512 1b1d8cd74ec6aa318226029aff230af07fc91280d56eba607ff53786191e6492e6b3a22e4eb9c7cca158017095d534048e74c0f13cb9c23a79164a3f21931ff8
+DIST kwindowsystem-5.43.0.tar.xz 169592 BLAKE2B 24bad3c5b54fac52a9aa7cc5beb40214fba14759fd67478c2b38db600562b46f995ddceacacf41925f4df3f980cad9262de6057d50c173011fd9744acdf7881e SHA512 fa3df2f1a3eb1596ef429b8e84ce9696ffef3aa125727f0becf725b949611022887074a796116aadbb81adf6e5ff8e3b9fd49e72cf0066138c91ef09fdffd1c8
 EBUILD kwindowsystem-5.40.0.ebuild 756 BLAKE2B a3c6bf4255939e42831660097446b6b42d53548f09f88559babdecaf70225482fb1b84306269b42a6c98a0b866d85ea6046fc50ff3ccd0526f61ebd905070dc8 SHA512 37f6b666fd723252aca41f90edf4399b4172b3781ce18bdb1950f8202310fe3f6776af09032552819c6710c9116e984de8bcac26f869ea919c4a106a74bd675f
-EBUILD kwindowsystem-5.42.0.ebuild 758 BLAKE2B 52213d3e2a5ec47bf3e5bb196367fc9a6564d0ff0ccc8cf80d1e6a1cf40fa4600a92f987f99d919581578f77c64b478e6614414918b1da6a988f38da8711f141 SHA512 11e2fce2281e70829bb2e684fc2a9f51a065b97dbc80d833a67ab3432d6cd32b35a59df20459af391d832d4a18ebe2ef3add834f3f13fee42384f9974679b68e
+EBUILD kwindowsystem-5.43.0.ebuild 758 BLAKE2B 52213d3e2a5ec47bf3e5bb196367fc9a6564d0ff0ccc8cf80d1e6a1cf40fa4600a92f987f99d919581578f77c64b478e6614414918b1da6a988f38da8711f141 SHA512 11e2fce2281e70829bb2e684fc2a9f51a065b97dbc80d833a67ab3432d6cd32b35a59df20459af391d832d4a18ebe2ef3add834f3f13fee42384f9974679b68e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.42.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild
index 2615478ef608..2615478ef608 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.42.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.43.0.ebuild
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 5bfc2c753bd9..f13443c6fd61 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.40.0.tar.xz 883668 BLAKE2B be1406a557c48ea3779aa16aec94fc76d6838b7523995290deb41d14f5738fe2669ef3309125e32c0536053ce1ec913d294563fe357b8218b5ab3ffbeb5531c0 SHA512 fc29a88395a9fb1979fa56d6e98e789da2831745358b71c2845e8f180b42ad76f1880fc22d13fb3e830dadcd945dd3225c1aa3fd008b14eaf7201d6f05355177
-DIST kxmlgui-5.42.0.tar.xz 884252 BLAKE2B 85dd2fcccd936c2a2d476139afe2865df3b254fbb9446626b91949b85a9b5852a375a300f294729c494f6899f8dd4b7e9b153c405174dd2d0c1639059bcb4a4a SHA512 ac1208f464434faecdb122cbcd11ad5ef92f0dfbe2a72c81865b8862e8247d1e593bf975a53ff8dcd4e659e2467656c3eb011038acdb3e7e91e91263a817eb40
+DIST kxmlgui-5.43.0.tar.xz 884284 BLAKE2B 01228a6aaae155bce38e44ee64110a2cb29e952c1ac9cf0107e1f09a7003b35487bb23000eeae17bbf0debe8b7b509b03733b4a0d595ff3bae58db9e013a28bc SHA512 ace47a5a01267ba33bc9173058a05cb49cfba7d18a171527df4afb094e437885b697fe5ab02d1609f6e577857f3f27d7d4ac2a25f6ea2dd659291d82fe25aa75
 EBUILD kxmlgui-5.40.0.ebuild 992 BLAKE2B 6fba6338bc261707ceff1ea3883948005f5e1ef48c0f623210b1fe2a2bc87632595e728e6055386a22f397b3451e1ff8e3dc713509eed019576190b1e9af9c28 SHA512 7c80deda380933c538d4c78c401c07f2cf909caa5a894d1df6239ded9ea6e0810b3bd6b418e05ff3e5e0e93460d915ec4ef113a627dcbc61772cef55249317eb
-EBUILD kxmlgui-5.42.0.ebuild 994 BLAKE2B d8b6fd1eab40d03112284a5479845a8d7cf805d467167d0573a361ee506601da38b0a804bca499aa17f8ccb9e6e775256c3ca716b573fe1c9821b88abf88b165 SHA512 afce7b8da8f8e651a7804b8b08ce03103703214e56e07bfd3fd6a8ff338837e6faf01e96c8e8131f81105ba95eab01fad72b6cc8d5d79fde57d39ddc6ac06264
+EBUILD kxmlgui-5.43.0.ebuild 994 BLAKE2B d8b6fd1eab40d03112284a5479845a8d7cf805d467167d0573a361ee506601da38b0a804bca499aa17f8ccb9e6e775256c3ca716b573fe1c9821b88abf88b165 SHA512 afce7b8da8f8e651a7804b8b08ce03103703214e56e07bfd3fd6a8ff338837e6faf01e96c8e8131f81105ba95eab01fad72b6cc8d5d79fde57d39ddc6ac06264
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.42.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild
index 1962dcc0d82d..1962dcc0d82d 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.42.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.43.0.ebuild
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index e1820f940b27..648529238fc6 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlrpcclient-5.40.0.tar.xz 29296 BLAKE2B 4ca339d8fe3130c53fac366754322fdda2acb155b0a77ce6677756a5fd2f89e895f829b92242bc5c51a6d6885c8f38cb0153c051f11a1b55522485ae333db532 SHA512 e35410b53dc39940b5487bae385167d86f8b2cb82248953aca246cdb8bf21db65749f3179940156e302d43aac03756a2085217cf66716718dfd6765caafc7294
-DIST kxmlrpcclient-5.42.0.tar.xz 29204 BLAKE2B 5e954a23a75aeaa37f8b20f9b0c71eedb6b1ff6b3e1c6785b861fd608b10efabef8bfa5f44f22f1e0b6f37dbc8cfbb6a6d9a1e027a5ca9b1b475d9e4d20b1268 SHA512 51ba99d8482a372a8785dc79b877d6fdcd64b55ddc4d528d362b129023a64e3125ad5395bf322c56ae786677afa5d07e0dc51a44e3bebe7996ff462e5273c306
+DIST kxmlrpcclient-5.43.0.tar.xz 29320 BLAKE2B 8b96b30e7ced5293d7397935b93b6fb92b7455ddef3c463a1c5d3e48c65182479efbe285aabb62befa646db22d27c80bf201c9d9cf20296ce9681f1497436737 SHA512 82940cd57ab846009b3bb2f50ff8502679a24212df6d4c8f7499874070dbf43858564f29ea09b278d766ee4a13ce5b92b0d847e5ecb8aacb00194a31393bba3f
 EBUILD kxmlrpcclient-5.40.0.ebuild 426 BLAKE2B 99f6bd61e7e6a090517680f99de18a158ae7748c945403325259e6dadcd474ce30715807aa02a61cab84639f8f3e8eaf248b310c4d3fea4af14cdbac3e32da25 SHA512 f43eb7a40d230af7c71eef9ddc7c32f11ee234f63561c47e5939875526b8c93774e2702463e88a3966d713123a95886341c4674252d7b2a5c007a0efd7c6ef97
-EBUILD kxmlrpcclient-5.42.0.ebuild 428 BLAKE2B 5d998bf9d6f8d4c3fbeafe073737a7f8c5aa1be1e7df79c01fcd1925590fe158cfcba17ff489d0ff33290692e3ecac6a7b3c7b810611cb4944f474bf6692a3f6 SHA512 b41cfa153cc3802acbb01341daa104fe9fc01f2dd5a5e3c3dd996b063d31a3642de9640016fd930b54ca9c97c399c10e1e39ee6bc83939253488a92b4564d38a
+EBUILD kxmlrpcclient-5.43.0.ebuild 428 BLAKE2B 5d998bf9d6f8d4c3fbeafe073737a7f8c5aa1be1e7df79c01fcd1925590fe158cfcba17ff489d0ff33290692e3ecac6a7b3c7b810611cb4944f474bf6692a3f6 SHA512 b41cfa153cc3802acbb01341daa104fe9fc01f2dd5a5e3c3dd996b063d31a3642de9640016fd930b54ca9c97c399c10e1e39ee6bc83939253488a92b4564d38a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.42.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild
index d9a11e8ddd03..d9a11e8ddd03 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.42.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.43.0.ebuild
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index e9b9875ecdb1..f94f0eb63acf 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.40.0.tar.xz 98404 BLAKE2B bfb16ad423c67ae213c97a2c1e463591910e42b49e2c7d3199dfe77e5c5bcae11bae2e680d87cd18b8c73fe05a950ec093fce7d159355779cbdce03dc1e8cf79 SHA512 81d9cc2a851a5846c6aaab561776f7c4a04b8567f2db5e2c235f11b3261aa1164d3a442fc4401225b57acb1e9f75efc61bf4f8a04bec3948e7cb0854653d0758
-DIST modemmanager-qt-5.42.0.tar.xz 98288 BLAKE2B 50bdaedc1917a98f91fb9bc722d9fa062a31e171875caffe8c70e2c8804fe52401941b222beba575be829ed4c94a964fadb6df5909f05da888a7ddb3f2097b40 SHA512 6329e9233613bc536ac4f77f766af2f05d6217246a77862ff467df6f39d72acb1c47c410d51d3b5adbbb6d1e658dadc79aaf4073aa36394fd54b228fe2004426
+DIST modemmanager-qt-5.43.0.tar.xz 98252 BLAKE2B c91a1d1ed261dfe58e16c7628d2a5126de924f82676fd3ce042eacef877a90971b4b26b6106cc4aeb28d0e50fc67dfe59ec681609eff2b21e227dafaf7ad5a4a SHA512 c51e3368520ebbcbd1f5eaf40b4f8ac141eba135a4f5259538ffa5cc790c778d4c415daadeaeab8fff122bf9a04e845ba68acf80110777a63d8529d0e83eff8b
 EBUILD modemmanager-qt-5.40.0.ebuild 393 BLAKE2B a17a9543e26ac580809ad302020de1ae60f13befe5b4589d49d91e73a0e4d62c4d246707a1b3f9a8c79e0ab5fe1242e0d90b3ced9ef253d4168f826ce7e59595 SHA512 a523fcecfc853a6c6df45b2451dfd08debc9f9dda21ca1c36ed07c37eefdeb8cf9ae865a32080984156dc24922fd36b161b014c0864a7491b1a2452b6fe7291d
-EBUILD modemmanager-qt-5.42.0.ebuild 395 BLAKE2B de105df8a4e9a3051e5a9f3db826f40a04dad408f76bf7c523b23eef0421af86e2420df9bd0bd78df301697ff67ef9b44b4c041947a025bf32bbea41cb9c8468 SHA512 5a2e685b48462c723284aaafa72894c7dcb5a1cc832bf275e3b158c19c82b736a4e5a614418b0b0f0f9333af349e1855b5e7eb79811576b1ba46867a9b716af4
+EBUILD modemmanager-qt-5.43.0.ebuild 395 BLAKE2B de105df8a4e9a3051e5a9f3db826f40a04dad408f76bf7c523b23eef0421af86e2420df9bd0bd78df301697ff67ef9b44b4c041947a025bf32bbea41cb9c8468 SHA512 5a2e685b48462c723284aaafa72894c7dcb5a1cc832bf275e3b158c19c82b736a4e5a614418b0b0f0f9333af349e1855b5e7eb79811576b1ba46867a9b716af4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.42.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild
index 0c4e09a7567f..0c4e09a7567f 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.42.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.43.0.ebuild
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index f604fd604193..479c7bc00765 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,6 +1,6 @@
 AUX networkmanager-qt-add_EAP-PWD.patch 3077 BLAKE2B 5725f8f6b4a2580e50c236b366513e4adf99f46725742ba4716e73f0218457bc29651f2a7ad6c601a881b0582e90fbd754c766c66afb763f404f1e677d9e23f3 SHA512 fe483c7b53a98965e37e1e424dff2582b386aaaa420e95dddfef9619cf7297127714d079b5f4035936c22d7a0b3a0445fd1aada9706b7351e70760a0631c1303
 DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
-DIST networkmanager-qt-5.42.0.tar.xz 163480 BLAKE2B 11d105062007a41824001efdccebd36ed9488c584f476c2f819a17ae668f42e649f371942cf474c294164203ac92fba52ce6f0fc5ff1bd5e5671807b851b7a25 SHA512 bd8f9a4dac1f79c94f210ca7823ec012e0ac82c95103c294dcf0f676842ba4c901edb268fe1a4c6f6c69af034e9dd14a3425801c702edc2587517c00bafa0695
+DIST networkmanager-qt-5.43.0.tar.xz 163504 BLAKE2B 6c06f3ba40e8402795cbb25560153f3b2ca8252dcdefb5bda1af70f1032bc0d136fc1981ab3cd57f1bdf631ca448fec29dfefbc61a3674a87036144d1717ff9e SHA512 29c4102f3de6eabb18e9afc15f96032153a073bc189a7422b39d405549cc5b206a1519dda15341669b63bb487c60f377cb66a215cbd3345d40def485d0205de4
 EBUILD networkmanager-qt-5.40.0-r1.ebuild 738 BLAKE2B a18a548f08cf2965094300879ca32b62a024db5797cf8306fcc6fea6cdd122065feabc3eedb72e9a1d9545a4a6a239911e959231c30aa6e01a009c8a5696345f SHA512 652f60e7a849bc413c1e8469aaa3e65b5761986bce3d921a9def195f7b02c0c3dc8e1e5545ef03f8e0df54b7117d9e6e7a5b78940856cf2d8da312e910593e92
-EBUILD networkmanager-qt-5.42.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
+EBUILD networkmanager-qt-5.43.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.42.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
index 4bcf5b7443f8..4bcf5b7443f8 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.42.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.43.0.ebuild
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 1edf894b0837..773d22af84ac 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.40.0.tar.xz 234407136 BLAKE2B 0f654925131cb958516c54ed577540c4880f0fa45c31741afe15cd717d37d07342f62a5db211d628d095b25d78e45df5a37af469d22d807defe09b04499d61d1 SHA512 c1bdfdbeb01440d56600b9b17b9247207d0cdd5bbd316cf0140788e76efdcb094fee98b4cc00f86951005e5a125407edc0902d0edfd369065d934cd8fb1c37f0
-DIST oxygen-icons5-5.42.0.tar.xz 234410672 BLAKE2B 560be8762c1ea2ac6550141eaa53d66419f967a32543d18eaa140c8363441f1ddd2580a99e618532803b40504e02ccc96624df5b5e40a74e87a7fc3f083e9298 SHA512 b82dde30e254867f1cb7e68d6575f50a7fb52d703af5c8b24e80733732462dc20ed0fce2299549c7665ad6226d89ac3f97cf16700e2a900f7a2f9ccd5eb8fb29
+DIST oxygen-icons5-5.43.0.tar.xz 234410612 BLAKE2B aa7c2d43a75c9581faffae424ff9d81e4f18b7e53649652aa080fc0295c1516100137609d984a27fb552d4596b360d01a0e7379268c47a30911c8d3532fe5ef0 SHA512 15b902dd91e4ea041b5305d3661b22d87eadac110230103f1ebe44b6357731f1140a275626d0adc0baac577b665d0d3bf58a4e18163f7e0e07c644699ba5e73d
 EBUILD oxygen-icons-5.40.0.ebuild 533 BLAKE2B 19c27ff693a38fa6bb8b830ab30361063cfd17ea6475ebb9103afb49ed0c898859035cdbd2c89ac697600aa06121629d9f135396dfc96e8ee158809b124648cd SHA512 2348d444ba5f98af032ba1c85a571c97bd521124c1fd16396fbe465f294aed516823ccd6d0e431c231fb7f67b6538aab9ef0e14b3e8a792575d6b928656f4ef9
-EBUILD oxygen-icons-5.42.0.ebuild 535 BLAKE2B 14ee28425a622b6bb62626a73b50494c0d7afa5d874e6d4fcdfa8384e5eca7883d913bbfacc1ee457a14445855005d634274dc324d9e5916b31c27c1b0afd4e9 SHA512 68808ff06d72a0d4848d97de358d0d724edc03e0632d883e8cded78507bb343d7cff7da0077b4da1a69ea1c5c57e6d825b7f3a4143369c8976bcb16b9155b607
+EBUILD oxygen-icons-5.43.0.ebuild 535 BLAKE2B 14ee28425a622b6bb62626a73b50494c0d7afa5d874e6d4fcdfa8384e5eca7883d913bbfacc1ee457a14445855005d634274dc324d9e5916b31c27c1b0afd4e9 SHA512 68808ff06d72a0d4848d97de358d0d724edc03e0632d883e8cded78507bb343d7cff7da0077b4da1a69ea1c5c57e6d825b7f3a4143369c8976bcb16b9155b607
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.42.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild
index 30f0353067e6..30f0353067e6 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.42.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.43.0.ebuild
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index ccdeefe5419a..50b450e79d6c 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-framework-5.40.0.tar.xz 4607172 BLAKE2B 84c72797dc00ebae7a2daaecaa4f3bfdfadd53eaca84253f08e54edd3e735c09ab50d2a43f08302e33d504ce77f0d877858e3224c2a1b0ff2d8c046ff5805104 SHA512 0718ff2fa45d6e793aec947ea42c7264ec379014a6286606eb7bc2577a64f236621f67f20b5223794c1d9b65989a2ebaa6f77f2c11f48fafd0f992dc03e01189
-DIST plasma-framework-5.42.0.tar.xz 4609604 BLAKE2B 9c2f5180d2a06007a540bd75ebbda47a93a7c56d2a83c126db15052193483890d5779201e13379ef52d9d3e9cf861257c00e4c9150cdb3fe8e2d478a2269200a SHA512 90cc77a17beb1240b9d46e83a413fbd931ab0000a4155f732f33384456c48e69777d088c0c8bb87dfa29a481f8ae1c5d876c042ddb4f446ccf0548b0647e4681
+DIST plasma-framework-5.43.0.tar.xz 4614848 BLAKE2B 459a1cc128ee2e110871f690c485f6b7707f6830f8ffef4120b65d8da18263e6c2ffb3e159fb31beb1dd3cdc93436634c2804e6914cc9c761373df133e764084 SHA512 e86d8ba66edd21712bdaba0d2e86c3a2618b8925115022d3f614d5d0bcc7b9f9c1b33a4d09ca090555c508d316ba7341d85d3f515698982e014d1e5c3d1c7fcc
 EBUILD plasma-5.40.0.ebuild 1652 BLAKE2B 99d3c0913e17b793ab63ee14449d18606d1c42213fb66679880f3758145dfd6d4d07e0231a359ce2d5021cc885bb9a41f0d66b5109f0f2f9c5de30d85fd7e1d2 SHA512 280974848d1c5650e8bd76fcffc9c9b391b1a3b2427c15907ad44b4da9d3d7ac3fd39e98a29d432f4eb878fadaf92eb3b4d311062bf8db426f33eac021d102c6
-EBUILD plasma-5.42.0.ebuild 1724 BLAKE2B df0c2e6e8e9b6f207f37d0a78befdb323e07126f7b702c721365b8dad91d5d1c155b9910d9a6cea07bb7263493218c4ec17f7a46243472f708d35d58db00520b SHA512 f28a15d5f67cfccadf72755ae15d89fc4d37aa2a888262e888521c951b0d9d9b7fb79c9cb24585e6f3aa0687d12220b371a0e3325b41a38fdd3122cc82e1a6b1
+EBUILD plasma-5.43.0.ebuild 1724 BLAKE2B df0c2e6e8e9b6f207f37d0a78befdb323e07126f7b702c721365b8dad91d5d1c155b9910d9a6cea07bb7263493218c4ec17f7a46243472f708d35d58db00520b SHA512 f28a15d5f67cfccadf72755ae15d89fc4d37aa2a888262e888521c951b0d9d9b7fb79c9cb24585e6f3aa0687d12220b371a0e3325b41a38fdd3122cc82e1a6b1
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.42.0.ebuild b/kde-frameworks/plasma/plasma-5.43.0.ebuild
index f8fa9d11bd33..f8fa9d11bd33 100644
--- a/kde-frameworks/plasma/plasma-5.42.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.43.0.ebuild
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 79b5e23e33b4..ac67edcbd5e9 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.40.0.tar.xz 13904 BLAKE2B d2fec20bcba0fec9f0426ecb8b42cb559b0869c158016f02864cfa774351f339705f96830f7f30f2d0f37c2628320ad490dc8cc0ecaa565da4fcc904da3123ca SHA512 a4cbc5c8200b280c802f1fe2314d464b68ada11a1e3ad45d4a851a324e691c6b24bace569118405c10cbc97e01cd7f233b19da31887e86b54d1b260d73fc0e48
-DIST prison-5.42.0.tar.xz 37484 BLAKE2B 7e7fe72bb56d1117794ed064e69607abdb0033668f92ff5e595f3144b74fbc319d7d1859f93d8a71b314fd0c97b89f18d9ccd447ab01bbdbc76553c983eb4efc SHA512 88fd2bbc1fb39d3d0ee55bb49377b34019f248140474c09824fdb29dd665084ba24b5ef3d341f40304f0877ee70d34fa47258ec4f3fdfa8cfe15c6298df12e5a
+DIST prison-5.43.0.tar.xz 37500 BLAKE2B 37ddfd6a79ab8d20997db5a6c894664f9c9e9247dc412bc2377e0a73b01d83d2139594bb26b56bea9c192b02d9bb640832d98bf769d72049b29f0fe2335c793c SHA512 6cb086396557a7bddb4ae7bc75e8503f5f037138b6c486abf10eec681e9440a642e5fe21178005092ae537a2e7272ada33aeb17ff70a65849a7476810bae15b6
 EBUILD prison-5.40.0.ebuild 379 BLAKE2B 856e73e1c9a13a1192f43219b7ec7459366f07a90a235546e42ea60bd1f018026a9af868c750cf23aef49d9cd6c18ddebd2c74e900b4c91bfc9c54af2076a2ee SHA512 403f2140d377045ffeebb7cc1c41d146e2d1fb177e4d16ae61fdc044987c6256f3991691ccf436fe3f690cc08de5549ccae93a561a9c2d4ae1b8b9791c531e0e
-EBUILD prison-5.42.0.ebuild 381 BLAKE2B dc8407485dd2960ad71df37a262e801256f89cf5797796732613864d8e78e6783da3e733f21b14ae70a4041f08894ed9bb5256484a0a531c99b6cbe6cb8a6f13 SHA512 37b1b33e3bca21185872d88113e84881992d995a0aa1f142997e035f8da4f959e67671a09f695daf610b53c219562e7e3a362bb76b337b566bccc31df7afbfcb
+EBUILD prison-5.43.0.ebuild 381 BLAKE2B dc8407485dd2960ad71df37a262e801256f89cf5797796732613864d8e78e6783da3e733f21b14ae70a4041f08894ed9bb5256484a0a531c99b6cbe6cb8a6f13 SHA512 37b1b33e3bca21185872d88113e84881992d995a0aa1f142997e035f8da4f959e67671a09f695daf610b53c219562e7e3a362bb76b337b566bccc31df7afbfcb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/prison/prison-5.42.0.ebuild b/kde-frameworks/prison/prison-5.43.0.ebuild
index 58d93e06213a..58d93e06213a 100644
--- a/kde-frameworks/prison/prison-5.42.0.ebuild
+++ b/kde-frameworks/prison/prison-5.43.0.ebuild
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index cd4cbbaa5c1e..374a877ffe35 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,3 +1,5 @@
 DIST purpose-1.2.1.tar.xz 114408 BLAKE2B 99d5eff18fd66b0823c36381281229705c54d4266926ce02cdcff4899c2431b8c3aa97667dab19824676b72c456cea2bf56a032d6137f2c9c207d724196fb262 SHA512 39747f5043e09f198bbec25d011a45c54cb681fd564ade25016f1b898a3fa4d545f29dc96ca421c266414d375d6b95259f59292255dfb73af777ff62a96ba249
+DIST purpose-5.43.0.tar.xz 117084 BLAKE2B d68e6153524cac9ab6e221433d5781e0d4060b734cef27786cdafa9dd96a0eda410b1bc7371dc49db7846be48474cedd1dbc2b224811514913d0adf0eec8c79c SHA512 5cd1b90b120111d1d8ba4d3103143679026bedc4de29acfe5d25a39464a1277450030d7ac505cc322385cf9d300c7009c99ce57a21acafb6ac07ab6186ec25a5
 EBUILD purpose-1.2.1.ebuild 1340 BLAKE2B 17d082b7698554255d704567aa653544af849f2fdae5f60218a7fcbf8420f7143a833068c7559d03b2faa2b28ad44cd1d7bda960ea6b111ba1d39f09b3018871 SHA512 40941288e6f580da8b4a29e9ea2a94e5ad7e99d0cb0f9e594b048c546180885b1e487dc595d5b4f3ad05da4f81c6fe6a1e039256971cf57ac6523a831d120c18
+EBUILD purpose-5.43.0.ebuild 1015 BLAKE2B 2e57bb620277ae85e241a8de4230d5fa31ec69dc2544e3d31f657dcc22bf243b3b5c0a65edb3bb586f003dd5cbd69e8c33671a3b7c18b27b15b02ee6f1e15b9e SHA512 b30b604f565079fbe40766a1a46c05d36d0aee7b4690845b11c747778b00877003fc41380dddd672015318c78d4c540534a06597765011583c214da5473584d0
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.43.0.ebuild b/kde-frameworks/purpose/purpose-5.43.0.ebuild
new file mode 100644
index 000000000000..66b1fe611737
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.43.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kaccounts"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	kaccounts? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}"
+
+# requires running environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kaccounts KAccounts)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	if ! has_version "kde-misc/kdeconnect[app]" ; then
+		elog
+		elog "Optional runtime dependency:"
+		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+		elog
+	fi
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 5f11882f67b3..4e209dd810bb 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.40.0.tar.xz 35292 BLAKE2B 367c633eb67ac76dfa0a58bbe2cd021a9eacc4155913c35eef855417234424beb1cf674f5f3ae749518a113316f3f68e8636d7495b94a3f1bedef13637dae20c SHA512 ef6c94583bbd264b1057439cde0428a6f2d95e1001832215aafe14549d521e0647b99f5cd61b56becdfba14ffbc140a3cc3b88a6f98e0aef7f409f7f203b2b3c
-DIST qqc2-desktop-style-5.42.0.tar.xz 36216 BLAKE2B 4d3479505caf55ba1be2946165cdd41cfc521131ba6f273a71e5e77daaa80b46e456e4c9c8fcaf6bfbb1e18d2da56d7ad5c93758685d5952d93c5d5e5e08dd66 SHA512 47188597586a58f5de38e459d9bd6a6d6b277cde9dfc15a9369322f216bcb7dc2f6e2fce002e8d4ff5ac3d5c571e636f536e01aaf8f258ae3b0fe5d0704f0484
+DIST qqc2-desktop-style-5.43.0.tar.xz 36916 BLAKE2B de086300fb86fbebafaa4f5d0065b9ce2e8d7bc9e6c68698d938b555a834857357ab9f949597a42f3a7c80236bfc5a396b881ac92210d578b3a2e0f63672b921 SHA512 f20f67745bfd58a78fbe943b0676326ddcd18f4d733d77d50c29ed5a0b4215e7500634225e14700f3b344a9b5952def756b90bd5844c7fa516fba28e7a27bb13
 EBUILD qqc2-desktop-style-5.40.0.ebuild 650 BLAKE2B 7eeda81585d43654214d74ddad2f173a01db9fe6bee0cb421cae9b59d69e6deb2930bd9ce044f2aa326cde2ccee6e33a08b072ef7ea73d01c5c9afedb41a2daa SHA512 83d0aaeeaec5a2cd4e9f4318aab49ce2760159d75cd67697169f0a888ad7619dd579db5d305814023f4c0ee0e62a8f15f9e6cc14330dae739767fd02bf506ee3
-EBUILD qqc2-desktop-style-5.42.0.ebuild 652 BLAKE2B 9d233d950432f891b0cb36d133298dd26a6cfff3c7396da6ea0101846663e75c8ceeed3208163b9f2ca3334a9e57669187119ddfa1148659d43ef7ce401b4acd SHA512 e78c8c1f64c6e3d8bfc6d9600e2d649be155249eee0c62b475a3776f2bcf4c6e214dff19ef9b457008bf14eb323410900071979513406e4637b451b4674e68ab
+EBUILD qqc2-desktop-style-5.43.0.ebuild 652 BLAKE2B 9d233d950432f891b0cb36d133298dd26a6cfff3c7396da6ea0101846663e75c8ceeed3208163b9f2ca3334a9e57669187119ddfa1148659d43ef7ce401b4acd SHA512 e78c8c1f64c6e3d8bfc6d9600e2d649be155249eee0c62b475a3776f2bcf4c6e214dff19ef9b457008bf14eb323410900071979513406e4637b451b4674e68ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.42.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild
index e4c5e5dc30eb..e4c5e5dc30eb 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.42.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.43.0.ebuild
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 60970846177f..597fc2d813d9 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.40.0.tar.xz 247840 BLAKE2B 0aaf2e81d152c3e616123e0959e356170aaa974d6431e33ec6fd935e3750311f444c57adb1f45772d1454db50b82a601df5929e2201c09960ecc4977b636f0db SHA512 83a63f08569b385ef21e3401aabe61c04cc7a727e0788b126a9c23f659fb24186f8810223b8b64da605033f46775b5b3ce6e8b2f1b2886b2b533afbcf2691bb9
-DIST solid-5.42.0.tar.xz 247816 BLAKE2B bb5adbe270aa9d8b699805699a73e483521ac978609b78e41d60dbe6190fe9e3a0c2146f89e2e0ee24986ee3c6113827c9c133f4a242af6accb31005c01eabb0 SHA512 2f7adfea5127821cec068151ecc8225ac09359494a890d3012b6d05eddc735f596982fb0742be95e2d8e4cbbf717dd7cc8119284ca39cfb4536f8c9ac433b66d
+DIST solid-5.43.0.tar.xz 249208 BLAKE2B 26db66973201b164b227e25763f619a4988edfd230673eb5d322eab438b1e6e40261b5a9dac7f921de27490c93e874efdf29c843bd82dbeca030693cad579e4d SHA512 6a7dc7d75a0340e69900758be5aecc201bf8c1e5a28b549e4f50107ae9ff800701b0abb88cf0c917347723e62d3222f4e066e399c916c537f3560ac7b9d20f1d
 EBUILD solid-5.40.0.ebuild 721 BLAKE2B 0ab80f5c90ab4dd480199ab5cce8161053434892ec23a3601599692861a5deecb5a645f001826b2e38dd51bc74dd6191b53cf4ed68c718628eb2109e31e205c0 SHA512 a2d4c1e4a65dacff05253cda3559ec04ec70ea83a7789f95dbe7d75c313e8f53cceb504b4985177d9976ad85696140e6a9ff4ba51763c96ce84d98d33fa89e44
-EBUILD solid-5.42.0.ebuild 723 BLAKE2B 911ac9dfbdb3d07f1813c2ab918afc61db02f32503170a7d602fe3c3e8c3dc9edb40359132c80f4d11c913c50fdef1928898e7b7a91dcdea1a041090cc91368c SHA512 34fc5f901ea145470607edb4a636fcc0aaeb86b475140ccb6b595315cf09e20d3e146b763ff76af8d7dc89aa010eb884de53caac53e646b88d7aaa81dae54204
+EBUILD solid-5.43.0.ebuild 723 BLAKE2B 911ac9dfbdb3d07f1813c2ab918afc61db02f32503170a7d602fe3c3e8c3dc9edb40359132c80f4d11c913c50fdef1928898e7b7a91dcdea1a041090cc91368c SHA512 34fc5f901ea145470607edb4a636fcc0aaeb86b475140ccb6b595315cf09e20d3e146b763ff76af8d7dc89aa010eb884de53caac53e646b88d7aaa81dae54204
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.42.0.ebuild b/kde-frameworks/solid/solid-5.43.0.ebuild
index 5ba7d7e87013..5ba7d7e87013 100644
--- a/kde-frameworks/solid/solid-5.42.0.ebuild
+++ b/kde-frameworks/solid/solid-5.43.0.ebuild
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index c5f79d46e6e1..d62813dfe3d8 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.40.0.tar.xz 284824 BLAKE2B fdecd27ab93d346884cfb0ec6c21cc15451a8f5f8060b8037cdc7197ddbdfe31ce74774dd1875e17496cc1f24dff7e74f11095d098db7b18ada420b6da2f2023 SHA512 bf304b06607a1c98467621018445638e6e7fe96198c296452b853d5f593da406b247bc812616b354d114d83a5156df7794fa041e0a41ebd6f3d9e322a7a47d0e
-DIST sonnet-5.42.0.tar.xz 285832 BLAKE2B c473fd2e159d8c34622f75dc4c473bec76144ed192e5627b663fcfddd5eaeae0eed5dbec02bc886f733331c02b3923e057c0ea4a1f488146930a424bd840a486 SHA512 f066d54107895970fb4502a3b6987373300a2c753e54ed31b25c952eb2c9e4d40cb2ea98a14bffd6e05147eee8ac7d59c210b04809bf99c826cd0c93e4edec01
+DIST sonnet-5.43.0.tar.xz 286196 BLAKE2B e5f18c9468f612a30098faed7f84e447a8de88c98e905805115a24b2aab2d7546d561723842d734d4be3763ac42fd43f99b1be11860cc68cc004578073eaffcf SHA512 63ee853d5f2df8b8163253add74418e46810188d58fc4ea56ee1d6dc6cd2f25b89c40f21039840c1992b2ce84e44acce26373cedb70770ca3d806e1dc73a0aa0
 EBUILD sonnet-5.40.0.ebuild 673 BLAKE2B d84f8fa5feaa112645cd5422042b5850b57c5daf85b780e745abed423fe58408545b70f74c25de6a1872d4ef1c66a3d8cf4facf1382d5fc14d706ba035b2e7e0 SHA512 6620b7de5b633f2a7139bf04fe6a988dbbbb7f1722fdb496c8347e07067b4d97bae6ccdcefdc78c0f96850b2aebe56004c5e41b51d805a03d6e9f0638ad7463e
-EBUILD sonnet-5.42.0.ebuild 700 BLAKE2B becb8bcb31a4271814083734910d63af328cb31dd8302d8d58090b7bffc8fd56a2be2196c63a1f2a1f9dbfc74b82ee1d6f37cd69733fb9dcab6103b215518dc7 SHA512 be5b5906da4ee91f946910577ab7c573e1d57a1c641890d9ecb4f5a733f875e55ffb80d156521549ea87aa3ae49d0b2e4539db6ae367256927d8852be4b49318
+EBUILD sonnet-5.43.0.ebuild 700 BLAKE2B becb8bcb31a4271814083734910d63af328cb31dd8302d8d58090b7bffc8fd56a2be2196c63a1f2a1f9dbfc74b82ee1d6f37cd69733fb9dcab6103b215518dc7 SHA512 be5b5906da4ee91f946910577ab7c573e1d57a1c641890d9ecb4f5a733f875e55ffb80d156521549ea87aa3ae49d0b2e4539db6ae367256927d8852be4b49318
 MISC metadata.xml 426 BLAKE2B ae2511b818ef6c330062e792c4f0bf503fd73d0c42d93965f6b3535d6610a75229c6de627e1be5046e95ffbb055b5c1c07c5cb4eb8e824354d9d3e7ddc6ff8a4 SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5
diff --git a/kde-frameworks/sonnet/sonnet-5.42.0.ebuild b/kde-frameworks/sonnet/sonnet-5.43.0.ebuild
index c71996ffd9f6..c71996ffd9f6 100644
--- a/kde-frameworks/sonnet/sonnet-5.42.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.43.0.ebuild
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 5435cf7514fb..901c4b338161 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
 DIST syntax-highlighting-5.40.0.tar.xz 1108400 BLAKE2B 44fd2a5374dd2a28db211fa1d258fe612cd6fe6c72422cd1fbe942d56684a9c4286a947038e105e8e90d1a701bb5df376a3f18aa73e836773690f695a6325152 SHA512 4e7868ae64e18b7734d7d5b778187951ae01fdd2d2dfaa1a78f8d9c0b9d5c435e30f4bc333dac3ed18f864f3458991144e870bd6a2c5b17c8ee49b61a82c0ccb
-DIST syntax-highlighting-5.42.0.tar.xz 1106488 BLAKE2B 713d2ea27097129d64b8454c75e419a39ff5d8b5046d442dbed64575605b60d625350e6cb1abe62369349a9ba5cf92b28886bcc137cc9f4d8055fb0e05f20974 SHA512 9475cc613f9de1f675d95e06d59fd4bc688a5255f8471bab7a01de2b35cc6fc7c4b4fc58b1f7d5b187922c841cfdab7f261987007b936c2a63d569ce241f8f88
+DIST syntax-highlighting-5.43.0.tar.xz 1108032 BLAKE2B 7ee4f4aa63bbd374e750eee8ad35a3e9d2f840fb3e176d2f055c5c89c78ffc585fcc908d046946862c1f5ee3957e121183649f1ba811ba3f49b3688941518099 SHA512 3d9f2e073e05690922126b4b5360ef178655482158ff3471b469826681b86cba1ce1e555f0bc15df27dd980632a8324ad666bad178ee98eaf5fcdf58e2618c83
 EBUILD syntax-highlighting-5.40.0.ebuild 525 BLAKE2B 3247f7ee3cb47dac62c1b57f89d4e48f0ffb2b79e40e697d19212740f3b9c3451db1160cfeafde966c549a12db97df940ae9b43b9d0c548439e5c1d050d96976 SHA512 7c54f6c74e1d172d91ec9d9678f8679ea74a135a6050b110c18a31609da75ea42d90fcb336dfca5abce7f2a09a2825a0c9d7e4767b1e368b6c93e0fb3e1d9c7b
-EBUILD syntax-highlighting-5.42.0.ebuild 527 BLAKE2B 1bb1dca51da1a7f0586a19309ff66fabb3a9c70e85d8f465872725fca1e26924999dcb0c3d7ce97f14351c26c6cd56b075072b93616850c33eda9507ef56d805 SHA512 c073e449ae41fe7d0347bedb0405b71bbb5e80f9834d52a535b4740ea3fb02323869e3ce4b2a49f2fd6f0dfe04eea4321470d666b499b9ae52ed280fde195c8d
+EBUILD syntax-highlighting-5.43.0.ebuild 527 BLAKE2B 1bb1dca51da1a7f0586a19309ff66fabb3a9c70e85d8f465872725fca1e26924999dcb0c3d7ce97f14351c26c6cd56b075072b93616850c33eda9507ef56d805 SHA512 c073e449ae41fe7d0347bedb0405b71bbb5e80f9834d52a535b4740ea3fb02323869e3ce4b2a49f2fd6f0dfe04eea4321470d666b499b9ae52ed280fde195c8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.42.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild
index dcea91c13a70..dcea91c13a70 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.42.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.43.0.ebuild
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index d59b9f4f6c9a..1dacf63dadb5 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.40.0.tar.xz 1409332 BLAKE2B cf48a1086df5ea8ca6dac821e01d74e842639381aee3431231dc0b7a2f8ef536b20d0c22493aca2022840138326ffa7b52a73c8ba212cbe6285320c8d84e2b21 SHA512 7ea45517957a0970370a57f3f2e50fb39b8e4723546d5f0784db14df310ef5ad1820e682da36e109c13a1215992235a9bb878ac2b592f03e31a516976404765b
-DIST threadweaver-5.42.0.tar.xz 1409344 BLAKE2B dfc730996406721378e3ca217caa2b9515be993b5b7f21c52b286b699f061085b6b0bd697d7f9061ee8dd673daebad9aed736ade134a5d7b16ef4bb2031251ca SHA512 6b8f3499c6888521f165f9c4b114589595da1663da623359e2482899a7b901607e7d34780d4269a77e8a7ffdded94988a7cf53ea60ac1bdfff98dac78340674b
+DIST threadweaver-5.43.0.tar.xz 1409220 BLAKE2B 4eddba0db7c0bfd3775d514871919760db384ccb92ff5ae79cfaa6d0d08eff66cdb129ec25c7af2bd25633b3103b2e983fd624584795afba84954549cfc2e317 SHA512 0810e64bc4bacc548d1b839633e0fdd178f86bfb80c7e2b77fc185810207c3c2ca7619d982b806d7a0337329a034d09106fedbaea6218df78e46079d703a57c1
 EBUILD threadweaver-5.40.0.ebuild 351 BLAKE2B 7d4a67fde3d976972bcb7e79d5648a681e2d97de2f34a302a4a7bd81c0cc222c113755f9d05aa732e7b2ba61a04dcb064326a21e6ff141e82cc0b9b5c656e2ae SHA512 744662547235cec4a872fff5fbb96a7c3c82fc55acae7e033569e82acba4211fd6c88c7605cd9fce0a5240c0f64caef990656d8b6b04840b967345bc4f4d8d62
-EBUILD threadweaver-5.42.0.ebuild 353 BLAKE2B 27eab9442775246b176656f368b7de7103fcd7fb809b80521242cdc24cf339e982c46afbc7e64b7e67573be68eb72d0e3e3adfbd1c1c49556f11aaf7d691bae5 SHA512 7e46eb34fd33c32a9bc728b7afe171a2a76c21df0d8f7a0f9ac0ecc466b6c17b98145620f0787f609042acfc0125dfa7d24807592653ab0d5d4f3bc9abc2a403
+EBUILD threadweaver-5.43.0.ebuild 353 BLAKE2B 27eab9442775246b176656f368b7de7103fcd7fb809b80521242cdc24cf339e982c46afbc7e64b7e67573be68eb72d0e3e3adfbd1c1c49556f11aaf7d691bae5 SHA512 7e46eb34fd33c32a9bc728b7afe171a2a76c21df0d8f7a0f9ac0ecc466b6c17b98145620f0787f609042acfc0125dfa7d24807592653ab0d5d4f3bc9abc2a403
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.42.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild
index 44bbeff6f8d1..44bbeff6f8d1 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.42.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.43.0.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 24812b35807a..3fe1ad5b7a72 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index 44d9b1ac0e95..99a3ee156569 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,3 +1,5 @@
 DIST kmarkdownwebview-0.4.0.tar.xz 57728 BLAKE2B 7149f13987d1e204071ad6a030a40371065c016b94a56e7d4688b7d806ea1eee6cd543498d38ae540fc48fadd7fcbdd55842546a5f9ad337599d5edfec728a34 SHA512 3ea108441e6f35d04156b567b0aed25ce6a6f96311b69e6a6f3cfc71a4eb9b9613d36a127da19fc71dfe5118f14064f725a994dd667560699b33830482c2d380
+DIST kmarkdownwebview-0.5.1.tar.xz 58876 BLAKE2B d5bcf612844050f0877dbfea9140379315c63ee882327b40196bbf2d4071c0cdc4c14d911c94e6e01ae7928268e8909efc792f99f0fc51b49943d282e9c84b59 SHA512 4ce47765265f15e623aeb2f9a76dba284510dadd5fc31d238387fc0c2104c8ac8613b25eee982f3dba1672128557e5b54fae7aa7c3b16583eb1a94264a10f5d7
 EBUILD kmarkdownwebview-0.4.0.ebuild 843 BLAKE2B 6a84cf130c17f744ff71efd03863d500573a5e6a100a40266d037eb21284581267398da169abdff6183baeb9b1f777f4c8f1df02e7d7f9125a27b092ac0873a7 SHA512 76ff115bd89d5198c93a0b3ddff44b75aa123374a00f2f46659b7751d3015b766e238aa1626c811f1badac1b780ae8fc3151815e3c8473f1453723065a2c6334
+EBUILD kmarkdownwebview-0.5.1.ebuild 870 BLAKE2B 6e3d20c70c6a966e0bdd99e73485942e50285b629cd59d9366fa72937c92281776695c9c749d786f44b9b2e06d0335c5be6512ecc851d8e648380d515e29db22 SHA512 1b812e6d85c1b10458eec8d94dc2ee584343b8f92c17bfe61dc6e1c502839a7be0923b9b5bf61c47f0562ea7475345094e4ad03eb9ca887e14458cc953cc2b3b
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.1.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.1.ebuild
new file mode 100644
index 000000000000..4a3e6df449f9
--- /dev/null
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KPart for rendering Markdown content"
+HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="!webkit? ( BSD ) LGPL-2.1+"
+KEYWORDS="~amd64"
+IUSE="webkit"
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? (
+		$(add_qt_dep qtwebchannel)
+		$(add_qt_dep qtwebengine 'widgets')
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QTWEBKIT=$(usex webkit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 1984a6a658d3..a165b01979e2 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,5 +1,5 @@
 DIST krename-4.0.9_p20170610.tar.xz 117888 BLAKE2B 811079cce2e2524aa32146068f534c662d445eb84170b0060fd361f790705691e621277109ba6d43900787dc3fabf83cafce1debf2a9da0dfca079de509575b2 SHA512 a406650f9c2b9094e21ea5224166b6f621da8cab9720737ded37b92c8fd0942ef10cdedc475a08ab363320719ffb203e3f7e0e72de4e64658fc68ad0600736fa
-DIST krename-4.90.90.tar.xz 272304 BLAKE2B f926d63082bf7456e22e9a89659c84afa25ee4c720c0592e814d04980adfe754de60cb81b415b7d35f9fe3a26ee988682e0f4f3670120e36b9106517bb504f7f SHA512 cf257945b9cfbd8e5b0c13328a6d30afdfa7d0d4e5c4630cf1eab3916b9191ac89f300339c731697f9e40909fa163a57037618c9f341981586aefe7fa8f64200
+DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
 EBUILD krename-4.0.9_p20170610.ebuild 1335 BLAKE2B dfc17ae4b8495f15a00b3b8810e7a3cf18d196c040ba250bb71dad66caaecc1529182e439ed3fe2f0aa52245291ab737a5dd414cbdbe7f2a3bc34b05bf98224f SHA512 0d2a7729872cc38e637ad6f01b4a3d61ddcf009d3dab599237f22994f1349c36dc86d4d5d8f7f4462a6cf349a5bd4260546f0b85a6e2db553d472e02b2e17954
-EBUILD krename-4.90.90.ebuild 1330 BLAKE2B 498e845b4c19d4058f6f0fd0b36b8089323ae265d44d5ff9754dbdf2927a5a749a1abfb4daa2d20c720981e27173e2fac4c5502a11d00366a9d6c97162fbc079 SHA512 781cfd0d038c7ce1749631ebf3ddb3bdefbb24c8ee0f20a7eac86c40f84124f073d0ade6d7986322478603062f00a0a801ccf944c86284f878ec3bbba592e4ec
+EBUILD krename-5.0.0.ebuild 1332 BLAKE2B 3d3f1301e86f234e9aa49ef8a0f1da7263363a3cadeecde48788dd8c832904ef45b54aec41093463a1bbdf6ce015b81842ef3e6c27f9ec4b864e0699ec7e9bba SHA512 201b2d03289599e3e54191f734ee26ae7d5d565bb3fc29fc333cafdbad234a3e99d93452643f6a98296b948ac5eb1a050ef60fcd52c31824067d246c98193b6b
 MISC metadata.xml 326 BLAKE2B 162b6b74c0a5c56f67fdf92c854a4b4b76103283cfce1116fd87d55d8c6ae8f43af099069d332dfa39c8342fc080e453c24bf82e74559fe8f3a41ab902257d00 SHA512 fe1996efa870db723392ce776238f79112dae876116d156cd0a9017050709e435ff3d864178472a772f268a12c185a3696ca2d1876232e8da993cfa099c71ff8
diff --git a/kde-misc/krename/krename-4.90.90.ebuild b/kde-misc/krename/krename-4.90.90.ebuild
deleted file mode 100644
index c9b4f04c917d..000000000000
--- a/kde-misc/krename/krename-4.90.90.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Powerful batch file renamer"
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif pdf taglib truetype"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	exif? ( media-gfx/exiv2:= )
-	pdf? ( app-text/podofo )
-	taglib? ( media-libs/taglib )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/krename:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package taglib Taglib)
-		$(cmake-utils_use_find_package pdf PoDoFo)
-		$(cmake-utils_use_find_package truetype Freetype)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/krename/krename-5.0.0.ebuild b/kde-misc/krename/krename-5.0.0.ebuild
new file mode 100644
index 000000000000..52ad2b586c7a
--- /dev/null
+++ b/kde-misc/krename/krename-5.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Powerful batch file renamer"
+HOMEPAGE="http://www.krename.net/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif pdf taglib truetype"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	exif? ( media-gfx/exiv2:= )
+	pdf? ( app-text/podofo )
+	taglib? ( media-libs/taglib )
+	truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/krename:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake-utils_use_find_package pdf PoDoFo)
+		$(cmake-utils_use_find_package truetype Freetype)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 7c0dfdebda1f..2a1ad2ab71bb 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 2767dc859409..23154a22116a 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.11.5.tar.xz 153380 BLAKE2B 1342ea233c6ea2b7a325eefafe1528d27d1f060bdf628ecd6c7dcddb0323ed10d6dc11ddcbf96a9f6913202ea327979a4f06d9cc7fdc70d02595b0a593a9a819 SHA512 273c1d3a649c7e78e78f27a10199057e2b06940e281eeeb7555bd2d40a6d9f9f7aaa38b5c0a84549f3ff13ec3209b63dde00dcce2ef8855a0cf46030f477594b
-DIST bluedevil-5.12.0.tar.xz 150172 BLAKE2B ac54ceeff2cdfab9310374cd72613d26979ea5a29b3ce601a21ea2ef9c0b1d7747861a3a2b9d22a31d6220f65f88b321325e0264b45d36b4d30090df24815ef6 SHA512 2978dedd543b452848b5173f4ebaa2aad844a7dfc03680952c63bc5cb98dd3ca48c0b77911b3eb5e2395774022484edfcab43cfe314db099c086f61f4840de1e
+DIST bluedevil-5.12.1.tar.xz 149628 BLAKE2B d888cfb6a79e27f12428354e9e09743f39228ae0934db06f0219bcacc45ebb103bdc717456f0f4eae32d476c9ca9137e85d8e4b424f78582c236921b0aac1115 SHA512 aeb34aefb5e966523cfdddd76a6c738602167cc28eb3d8471d54aaa4b72d7ab94e359fbf8e1a79afb9c8ba41d008d662fe820466f384112f52a9762f21c965c0
 EBUILD bluedevil-5.11.5.ebuild 1003 BLAKE2B 57d5960097bbd4ac906c8f3e9d276d501c0526a8fb66843b3ceb3f6367142ef44f2a0a49a66eb128a1f71f16b423343ea7f2d31331f621d02c73231cf88dfba1 SHA512 671c68e6b660dd79464865cc0a98a460a5e6db41606d54b95ac232aae44b12e5e11afc6af19f3b7c2b51ba1db5648516dcafebdedfe5c49d93b5639c1a9cc323
-EBUILD bluedevil-5.12.0.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
+EBUILD bluedevil-5.12.1.ebuild 1005 BLAKE2B 05e9627ba7e5d8d2e26d71106252e1476927ff424f235b15d0a8e45207f7e84cf9151801cbfecf6d574706fd961ce819b02d9c69ffe5533a0e0f7719d9b13f54 SHA512 d3385bfe6564ad077dc3e35882a7f0e77119640b8b1bb2e7c1ecbac4a62126f058ea438c478eefb43cb35fa129cd35be14b24590ccb5390a5ac5d75a47fb6c34
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.12.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.12.1.ebuild
index d57eb297ca48..d57eb297ca48 100644
--- a/kde-plasma/bluedevil/bluedevil-5.12.0.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.12.1.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 1b101b27882a..19743d3e7ba4 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.11.5.tar.xz 3157272 BLAKE2B 1c4f9bed314f4968b00e7283203ce24ffa7911c4e7fcd0631ddb942ece5eaa104773bf267ee23449125cc902a20e7d8eae5be595d12c7b1eeae055455b5849d4 SHA512 87802343c23cf4a73160a669fbec69cd529b992c31fb6d4a3578e31f5c9eeb4bc418ba811e705d95c37b1e2047bd08619c369f3e16208dba7fcde1f8d56bd6f8
-DIST breeze-grub-5.12.0.tar.xz 3138676 BLAKE2B 02ce62e5fb0b5fe0b7c93803a1d5d5770671b3c9009f7ba83d8b8d519e1887972747225e24a65b0efd544aae417c3a805a13eac0d7ce703968d6f82b4f7541a6 SHA512 087705327e23eb3a35f08523fcae8240ad09be08043f8012ac6bbf6b35dca6c06ebe8ea8f3e101bd3b0b10467e7864763a279b99249dd65a952315b0ba3520a5
+DIST breeze-grub-5.12.1.tar.xz 3140160 BLAKE2B 6d32eae54fbd6fb732ea01af11ae3d8682587a3f3a19757427876d2a3509c533a22000fd7fc288e495feed372a79166accbb95722c8fabaecd86cf4562e6110d SHA512 828fd6edc8078f8121ca3662bcb51ac38e586dc95194b74ff3736fcc07d89308dab9208322001031d51a869b07ca60f20cc117ef0398551c06326b7bdee917e3
 EBUILD breeze-grub-5.11.5.ebuild 398 BLAKE2B 34128bcfe78858a3695db8c09bc6666396dab77c982c12bf987c0dc727eda420cfb8b8474e8dc21e0575c4118854bf33f84a81057b52ee619d4b43180f831c50 SHA512 06527001727ebde78101ce6e8672fa30393b4652d706c54d94e463aa1aa062b15ba2ec85adf555fd418465d3802e43b2acba0490fd1279b596e628ca5fd4d353
-EBUILD breeze-grub-5.12.0.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
+EBUILD breeze-grub-5.12.1.ebuild 400 BLAKE2B 33e052f2157f317584cf359e91e95e4fb9792527079fc546b13af9cf6c4b476bf62f9c0545a26f3b37d6a2cccc238d1bc3f703324340b4456f9f81e429c8c4be SHA512 68b00d4e69b7282ab2b09bbcfae825302cf4b6e41a87e627b353b3bf11570df6a09bb4ad88f687e0ae7b708a4092e1239b908f9982653679bfb6afeb3bd97723
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.12.0.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.12.1.ebuild
index 8ef3ef186a85..8ef3ef186a85 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.12.0.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.12.1.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index beddc4f2f9e4..02c2fa130283 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.11.5.tar.xz 218340 BLAKE2B 9f729336e0a5844fc8258f9900f7e5dc738c33e4d6a63f3a8b7fcc0f5fdf202d36a991397568dcdd3c608e3a93e9c5ff085d47b2d91a345f7b6587b530b035b1 SHA512 d940624cff5b785d2b32ca6329f463b4c545ae613fb5e7364537703086900f920fe72c25f5731ba24409e27469e2281b5d74bfd36ffedee66cbd8ac62be0c53d
-DIST breeze-gtk-5.12.0.tar.xz 213788 BLAKE2B 6bba8cf25b9acd39dbcedc0677d5b0b6fcc5ad40ad951235b33b4840f6161db4fa7e1da873f4a98f62cfc165fbfeb657600572761a0d8116912d9981a9ebdc77 SHA512 88ee271dff824a269e5eeac1ffe61265fddff9969a77393aebd8fc3f82567a9c4342ced7bca4d70e1a37a89be3923196374a2169b43731a1ff633ae87c3301e1
+DIST breeze-gtk-5.12.1.tar.xz 213804 BLAKE2B 1826ba92c1f756e116d8648b8e0edceb306110a732b48fa2c6522a4d197dc3a482dd30508337177c5e75826abf04c2de83e07c34d02280923b93609327ea12b8 SHA512 3295dcdc5c5982e49579488b3a0d120600596fc13560d6daaa1d3f634b16fb0ff651d13ad5bb37ef95483d952ad72148070a6616915bf813541d37c3de325768
 EBUILD breeze-gtk-5.11.5.ebuild 296 BLAKE2B f1bbe6e13a0a65a151abc8c8a7cf5ec1e0db57167c3237236d061b500c716fee97e9eb7aa3e20d41d7b5d6b898cebe388914390bd7220e1142ed2a2a8d4e767d SHA512 c6cd9fb98a87e8c9ee53dfb708645cf340182e4bc9b88a830d809e642f3b6c3db300fc377865657240b4d110cc9a206be75af38715007aa22efa38f1825723d7
-EBUILD breeze-gtk-5.12.0.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
+EBUILD breeze-gtk-5.12.1.ebuild 298 BLAKE2B d2afb0d13195a3d1ebe63a0d39451904bb6fe6f21e9ddcab226b8598bd2c1696cb93b017d55192584221d90dc3041d615fd15558ffb65bb33ee4da6c0ba302e8 SHA512 755cbe7501e95f4481c6d13524815dfe81dd84b9af9f5de023563f5ba9d9cf4232b4518dc8181c03432bca30437de3cb8c992ff5233fbd2f12dd8a3b8217bbd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.12.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.12.1.ebuild
index ef50e787f58e..ef50e787f58e 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.12.0.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.12.1.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index bc0ad06fe919..2dd815a77815 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.11.5.tar.xz 106612 BLAKE2B d2f3f63e1f04f31de8b98a4ca63a529cbd2282db64527fe6faf030bd6bfa441da9213b467ac441eddffd870028f3e5bbfe79562fa7eb3f485d5f391f4c7d1dae SHA512 218045bf35efff475bf9aa4f1e8d117b42b671ba036a7dd67a2b6a8538ee4317f84415e53ffd17bb9645f7971bf575beae1cc1de7b6f67e37166fde25cf92c44
-DIST breeze-plymouth-5.12.0.tar.xz 105732 BLAKE2B 752abb58e1d77b8cc43ac0a3a11bf13594520f7b495726d16905d878152882fd506f69af26be3b1ce9cb6442433fa2dac76039aee337fa8a6ea14a7d5156034e SHA512 687afb656560236c39d070a49f97bbd5eeace6ecfc96d64b3bacb34284ba4d41235b9994159740f0cbefbd98533b6040ad1e5656bd4ee87584c989cf334e1fe9
+DIST breeze-plymouth-5.12.1.tar.xz 105516 BLAKE2B 8176b45227c1cfccce52404fa9917d2481bc4e1a15057456fe082fac13c192f2c79d610075ffeb71f4582a00a25491342fec4c9a160a6c6acdd9bbfd886cd4b1 SHA512 58c99957e1a40300d522288083a41cb7c1ea4012f5d7fa35f9885ec4a253bae6bf4dcf199d673469fc01e93afccfd72173466910b3c1aa6cfce717e9fe3924ed
 EBUILD breeze-plymouth-5.11.5.ebuild 459 BLAKE2B 25ab42a671b0dc5b5f299843f8c56d583cf042ad375ba7f57b60d62510eae9760937a50d8b8cd3ca4154e829d4712970df5183cd88d8c7c125aa3cc48285f41c SHA512 e47b0896263d14f388f5f5bb2dbb8635a075bba76046f2a03e77473829d843393dd4b4eddac6869ee03dda7dbb8fd235c1b2bc99655e580cae138865a0d7dcac
-EBUILD breeze-plymouth-5.12.0.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
+EBUILD breeze-plymouth-5.12.1.ebuild 461 BLAKE2B d00839097b233bc94d276925c7b75caf9f1f783691b76d36c6d767aab9a69ef7274adb99a27793daa2292f6a7eea2cf5629b5c4fe60d43db0edf5b29be22fb09 SHA512 4c225c044e171ffb0797e0a49cb21919d04d01d40fe336ae1aa2b9517a3f8ce2f0741111bb373c9e454ee10a7ca1de4b61b4817188df32d705964bcbe3cbae43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.0.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.1.ebuild
index 7c86b9c8d818..7c86b9c8d818 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.0.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.12.1.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 1f2a2c481caf..c0b1ac1fae6b 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df
-DIST breeze-5.12.0.tar.xz 22210036 BLAKE2B 768cef2db1f38ea50d2d2c741f48f0e3b53832f1bcf716e4f16242a0c54eafbcd578ec1ec4c4de34b7cd8da0f87983597cbdf9c4b107dc34cc740c3bc1f4d168 SHA512 5551e988fa615ccd713eab20058c4d61fba39f256325759f80b61033f7025c403e66ffd55ed8c86d5faccf586fdcf35f7f56d87d6fad1f426ab7205970fb922f
+DIST breeze-5.12.1.tar.xz 22207888 BLAKE2B 02e89483eaaee2fdc13f954b01cdbc7a46cd66e66a01a4fed08b6de5059f05b53f72a91e5e2848ac28621911cc9ffdbe027d038bfb95c2d8587f1329563ce46a SHA512 a96a58432821d65a943877d4db97098c3a04c8a6e87ba35d23a6e3336233ce4b4eaee5fbc9f6f447ce62608ecd88d5b70559f192f7863f7a7135272707e5aa6a
 EBUILD breeze-5.11.5.ebuild 1867 BLAKE2B 24ba84df08da2ed59de370a074062e35195d0460e571c405c1aede248af731438b9c94e7ab6fea288790c0021e8ee0be332c42007e79b76a0316419bee6cb4be SHA512 2d93e0dcb6ce34f3c042e5b7edc3b098aa9ef7cd72efae48cae3966ea355064a584edea9e42ec86ce5b3410247af1a49cccb1ad1bb2347f0a670ba9e17bc585b
-EBUILD breeze-5.12.0.ebuild 1869 BLAKE2B 3b2321cce93b09d45d87979768db5beb3aae44ed719e1ebb0d38b923d1d6fcb5609a1723f02ca8d74bae9d726fa8e8cbf7aca6ea0da3c7ddc61960b4021d37c1 SHA512 0acfec56efa5361419f51f358418bd2b30e62157e07a427a1f68448f9d465af7a6aaa9b7ff53d0757d12a5e597db19dfa0d447dfdaa0e9566eefc1a0de0d3174
+EBUILD breeze-5.12.1.ebuild 1869 BLAKE2B 3b2321cce93b09d45d87979768db5beb3aae44ed719e1ebb0d38b923d1d6fcb5609a1723f02ca8d74bae9d726fa8e8cbf7aca6ea0da3c7ddc61960b4021d37c1 SHA512 0acfec56efa5361419f51f358418bd2b30e62157e07a427a1f68448f9d465af7a6aaa9b7ff53d0757d12a5e597db19dfa0d447dfdaa0e9566eefc1a0de0d3174
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.12.0.ebuild b/kde-plasma/breeze/breeze-5.12.1.ebuild
index d16baa9e1fe0..d16baa9e1fe0 100644
--- a/kde-plasma/breeze/breeze-5.12.0.ebuild
+++ b/kde-plasma/breeze/breeze-5.12.1.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 4965f080033c..4084bbf2ccf9 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,6 @@
 AUX drkonqi-5.11.1-x11.patch 1438 BLAKE2B 99750e2d33999bf2f97e5f6ef519ef22aa6889e9605ed133350a5ec0f9df55a4736b2bb61cccc8c414dc445cc5b4cd6b7742731e985609e76e692009f5c258b7 SHA512 3d19b11f7cfd47bcabcdaf7b3bb4dc1e38b38a5e52a3c23849860ed851b1211aaaa61da48f23a46f7a51dea7ec2f132a3c16577bea042da513d1bc84264e0bb4
 DIST drkonqi-5.11.5.tar.xz 746660 BLAKE2B 9ca5290ff64186347bc03133440c54da94256064868e1c854fb7813b7211d480e34ada74ae312dc7f18219ea81072eef5e2e4204e0bfcf7a712296157c37086b SHA512 6bf7435e091494627f50d2c047467e585f31e51ad5ecab242664230b118272303d245c07ff65fb3fbdbcfe2fb1283134fa69c029c5e42b4df98e6f9a859c0105
-DIST drkonqi-5.12.0.tar.xz 739424 BLAKE2B 6ec9309b6e7a216b40d479f249ee87c2abe334ae2cd3a399e0f13b61ba36e9b80ee42518b31eb186a02e20b2758bc1c805c7e6e5fab706a909458f7faf62ad1e SHA512 08e88b9341489642db265c0a18348bdc7bb84c495f39710dfa4c2f9e63ed7b2e922b0ae17536b0841ce34a8a4fb0d54ffb7787511a778959f1dfe6d7a3521214
+DIST drkonqi-5.12.1.tar.xz 736708 BLAKE2B 2ed86d8ca6ef20532a380792910736508d7f2a490881ed377df03a1edd52e74823c08d96cef1dbec8e3eb5c727869eacb8ab6c675fc7a449711068428859e30c SHA512 0481789740950d85fdd1badeea34aebbb8869ed28aa24097e4b6d4991f1544073677f5cd236749c1b09e9032eb70d49209a35e43fd93c68373d8931dd40c9f31
 EBUILD drkonqi-5.11.5.ebuild 1414 BLAKE2B efa2f0f71116246f3a5e394e3be9241bdfa638865daf575d8f820662715fce9a6a107425f87682af3707eca22c729ec32fd47ac5ae41096a0e2ab3199e5bccb0 SHA512 1555dc8391e557a98f953c8d36dbed282efcd46c7add75199f64868d59277c07c0d63de46ad30b067eb275741ed5fbd5b3d37df003ee3a905f3279be088bd5ff
-EBUILD drkonqi-5.12.0.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
+EBUILD drkonqi-5.12.1.ebuild 1366 BLAKE2B a1e50162598d1f0e60c9dc941ba2c8909f2cc3411c50b01fbe70d148ca20d6be2899f5dc6ed2459dc9d3946881f1994cdbd6150ceb1bf28fe3cb01d65d5c981b SHA512 154578eaa885cc2772f9c8ec239bc880b0e6f10e42bc6c9253dae951251a7f64bc7fb4d0e277cb27a03ff1a2dd642c53d8ac26a19b8fa36c027478029e53fc0d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.12.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.12.1.ebuild
index 08c83e00ef5a..08c83e00ef5a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.12.0.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.12.1.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 0355c41bbd52..81968f422441 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.11.5.tar.xz 89720 BLAKE2B b4fea473744ed25abd44831418a2e427b86b865385392044aea8b3bada705b8038c2e85b6273f05874c2bd26d6f283e7bf674f082f5435690a08b2348ae2c1f2 SHA512 8c10b5a8716580dbbb42883bf7acc78e23877797e30208400cca9b37d7d921a2873854733ffd730fbb37b6d79b0b44aebbfa6274376123fdfc0999f362793745
-DIST kactivitymanagerd-5.12.0.tar.xz 84636 BLAKE2B 71f2266373330ee5435113443b6f984fbfaf7ad692c366924b7581f009f17da903d2810d77e29687a501826bdc2d2501237baafb3fe78b9e99849865a9a12d48 SHA512 4f6fd7672e2fc4b280d14c5b95d5b4010393b6a06259bb1680e9eb3c2bb845ce55764970d50567a4112d7e66ba7b61f7b92f2da5eb34f78511975ce0b50b2b9c
+DIST kactivitymanagerd-5.12.1.tar.xz 84940 BLAKE2B 3c7386e4d254673b3363b67783fde92c33cabc0ff86514a6908c7d2246ddcfda583dd41b9ff308bf666b04470fe53b4ee1c188ab2597f1e65a050b81917440e0 SHA512 3f924a0f99bdacc5575d6b077f141cbf9766195204a7035a714e179349c2264d6388ebecaee64d2d75f1ab6370b94e4ccdf9829f2b863a837c4ff2e1057c96a1
 EBUILD kactivitymanagerd-5.11.5.ebuild 886 BLAKE2B f7585849689d9db572c6157d21e7784fa70efafee71596809db33fcff09f2a76b60eaba7b75ef2becb72ce241f8c28b42fa7fb2c895df887f743e96545a4553e SHA512 f9536e1bf8f5271ea2e833ee3b21d4487e08ff0ab25dd509f4ed4f9cb011cff363ea81b9f5705b3fa6140b80fc36625d3354505e4214bee51259057c1f707de8
-EBUILD kactivitymanagerd-5.12.0.ebuild 888 BLAKE2B 08dffbb6f68abe07727655187f6082abf0c8522e4069a1141e7ac822fc7cbec4d1d18a0205e019c58c02c00817909e226d67c4c93edc38b18c8366a59aeb7239 SHA512 00425be891f6a8a2888077a84099ae2acaf06a64a74a3f1ab8a2d425113551690a693c23c6fb4526ccdf882cc4bee20a96b22c591e3a54caf59dd07edb91cc42
+EBUILD kactivitymanagerd-5.12.1.ebuild 888 BLAKE2B 08dffbb6f68abe07727655187f6082abf0c8522e4069a1141e7ac822fc7cbec4d1d18a0205e019c58c02c00817909e226d67c4c93edc38b18c8366a59aeb7239 SHA512 00425be891f6a8a2888077a84099ae2acaf06a64a74a3f1ab8a2d425113551690a693c23c6fb4526ccdf882cc4bee20a96b22c591e3a54caf59dd07edb91cc42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.1.ebuild
index 547e3aeefd46..547e3aeefd46 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.0.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.12.1.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 8481a031ce09..417f7200466b 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,5 +1,5 @@
 DIST kde-cli-tools-5.11.5.tar.xz 597040 BLAKE2B 8e17d08d45699c618325710fd4a054e1acde34e17965b65fb9054111d77e8c944fb4806d7d50e5073debabc948c79bf167887243c68e3227fc0c74c31d5eea74 SHA512 1f1363026d7d372552a06db19630a7deece8228bba020c0469971012f6393d4439fc56645b7348fca777b27dd86f7ffe8299c6e024384aaf7525d91baebe4b48
-DIST kde-cli-tools-5.12.0.tar.xz 570692 BLAKE2B b9d77acee27f96b3ac362ed3c9d5b2a8f11e93df3ef9941ed7e269a21a62aaf4aa1deae310660b72045df6a4238478650e43d0318543b3ecf85c9f0621e20fc8 SHA512 3091f6c722fbfdfcc3a97932f4895536fb551c35b827a1b833e7cf066f2ea99ca3197ee8114ed347e089e436d0998332413079d86e71f686517c3197350872d6
+DIST kde-cli-tools-5.12.1.tar.xz 571488 BLAKE2B 01ed7b5bb910f1a3bde38baf893fc0f03084439d66489783139ce9a5dffab3cc5064ea106cc1f4b4f27dcbac5e5e9b867d2d810adc9bd922260f51113e3ee435 SHA512 780bccb6a03bfb7e11764521713b828fa73b4c89bf4f3077e83f7bc3842888eb5a9fb083aa6b325fb9a7537cda35c99e71acb643c908cf1c04e9f01b7eab780f
 EBUILD kde-cli-tools-5.11.5.ebuild 1415 BLAKE2B 62733ac6b500c63456858a16de37fd9feafe80d9e06c1965f7b5d30e4e659f6f76ddadd54e46c4acd6cc85e4310c3e27e1cf1ee7e3de05acc7e2a97d5cc6a2e5 SHA512 9e97dda7e652e8703e0a74acb425f6949fcb09a11ce0db6cbdc5b48ea7f79223e07fcd6c84f5b29ac1bd574baccfe4c97e01c26b5ef3954ec379ca7b722c1eb2
-EBUILD kde-cli-tools-5.12.0.ebuild 1417 BLAKE2B 35c251d4e8e872dac6d1a8ac9f80ac2e72575ae19f1421e9bbf8837e99a4faa4c08c7025ba8103664d4cbe8d8fff9958bd2575a4b7c8bf6b7e894636cdbe8944 SHA512 e8b7be68b473f7e47132de03006662d3dac69d348b4345bacc190e387e74dd11f9c9fcd0e6653e73c6fbf2f2383bcd9079e1718c5bf7be5fd0306a7ae9b1f0c0
+EBUILD kde-cli-tools-5.12.1.ebuild 1417 BLAKE2B 35c251d4e8e872dac6d1a8ac9f80ac2e72575ae19f1421e9bbf8837e99a4faa4c08c7025ba8103664d4cbe8d8fff9958bd2575a4b7c8bf6b7e894636cdbe8944 SHA512 e8b7be68b473f7e47132de03006662d3dac69d348b4345bacc190e387e74dd11f9c9fcd0e6653e73c6fbf2f2383bcd9079e1718c5bf7be5fd0306a7ae9b1f0c0
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.1.ebuild
index bcf243febb89..bcf243febb89 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.0.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.12.1.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 22b950cc17de..a053bba46e0f 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,6 @@
 AUX kde-gtk-config-5.4.2-gtk3-optional.patch 578 BLAKE2B 7e528903187c1cd4e8f3edf4d3b7234d5e944761740a1d6ed1b0bf7b34375781e9c4b2a283f544614ce07c71131698dc6cbd6f7e6066cbcef7d6f8fc2f902d13 SHA512 f4cfdae004dd0c6d26eca2b46a1d28bded9576c3488320b4436742020835ac5029a163f7e5859542d087181e07651b66777cb3199d79c1aa1fac682edbf20617
 DIST kde-gtk-config-5.11.5.tar.xz 159700 BLAKE2B 3de3d056f47cedc7d04191853a7642e783d8e03af60a5198e9dc3f8eb49d14f2422324972a1e3569816df36869c19c1d34bfb5e7c0ce9bf20b8543c26029ab20 SHA512 bcaf0e8c6495fa2418caa92e4fa30f6369b7ed6d45ed288a6f4d071661cefad9240e990c57727aa709e398c1947a4caa6bcf77f3ef53c24127a5696186c989df
-DIST kde-gtk-config-5.12.0.tar.xz 156684 BLAKE2B cc2487f4634393d12172f775f35b60fe068854b58e4dd03a991946fa305489957f119d99f257587d4861f3f6e22756fab645096d5d6a833a18180edc99463a57 SHA512 03cd422651db23ce2657fba3d6a0203f7ccc887921622d49c601b6dfb91716c3346d240d666a9c40ea27b8be738f596fd1a7e66d48428b323eab9f0f0f9b04c3
+DIST kde-gtk-config-5.12.1.tar.xz 157168 BLAKE2B 7abe5e39c97143210c9663adf1aefe0fe3980864f4936d49158e0e707fa15031696fd6480dfebda52cc98ac8f3ad28629a2546fee14e90485f95cb8902694738 SHA512 8cbda7bc61a18e267f9e670399dade784e4e2b431de055ad6a71b513da1504c9fff2ff71f6618ef399708d029c3f2a97b9d87ebdb4492c5cc8a5dcc37fc56061
 EBUILD kde-gtk-config-5.11.5.ebuild 1355 BLAKE2B c4b16ad68736ba32664ea01fdda00bd66ca2836669346f17373c61ac379e2c4aa46b8fdb03df1225e205159fe3101c12977e9418a9b4edf806bbc30ce4a41b5d SHA512 9ed7f5bf17eb3408d632860a9062180f567f2cb10d572f122b094cca866c02f830195dc5d26bb7a75f14271d3b22a064e7fe38251d6fd27101ca0185a4df1acd
-EBUILD kde-gtk-config-5.12.0.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
+EBUILD kde-gtk-config-5.12.1.ebuild 1253 BLAKE2B e0bf2aa2633289dddcda686116dff24c52663e032ee939d2677f20d1c5c2bef4f1e3151e435495008ab0d7d816980f7bd2f6af275dd1b1c33a457712f8602992 SHA512 6551166ff3b4b20090b418e1f8b34c894f343df4c6065e09185ae97158bc8a469a221f581f76f42a93e419e6e7776e9eb31012da4629c548f40f773c3930e803
 MISC metadata.xml 333 BLAKE2B fe2211e8c1798fa7f3d3863ca5182a360f3ce2c5091f57c6ec14cd64733c1bb16a15fb57007e19502a2fca7761a54f0aeb2f228df10d23db3ee1e9a4911e1283 SHA512 ce7ff5491e0b8e230a07d5170efa584645eeb59b83f5e446569d230ba1b7e86e0419648fb11d91d81dcbe96139524b2371ad9b9266d1b97f147784674c64c326
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.1.ebuild
index 13b77b96ddfa..13b77b96ddfa 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.0.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.12.1.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 1fa6f6600a1c..0d5366373f5f 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.11.5.tar.xz 36280 BLAKE2B 64a8bbe8d9891f011bfbce69de5b989931f2129a87d01486378ae2a327c11615baca1223113c6a2e21a9bd2698cee7c908a6454b598389fca6082788df8f683e SHA512 a7dbec450e7a67b6c029ebba1663ffb3fa199f4c855322673ddedc4411506b20ff922a1dc6c728a6a8b5332ca8b0eb542fc52dad91ce3d01ed39d5bc5efc4cbc
-DIST kdecoration-5.12.0.tar.xz 35484 BLAKE2B 588ffeeaf2dce9ccb0bc7e00b3701e0116fc3744127413fb8ff1e652b0b48d869c6c969ade7298f34106bd571c1ce594ac9443614d699f59c495a85926a4b96b SHA512 6c1de729ada6cd88ae4e78506e834cce0c5977e9cedc39d0a53d7efce4bd69f4ced7dcb7bb9529faa23146d724e6b0232db9a57c34971a465748d3168b58d70a
+DIST kdecoration-5.12.1.tar.xz 35288 BLAKE2B bf2f58042373fc863d6b0e2f5becdd45348ca90f1575333675f5c270b7121cc8e63c766911698d97b3c7e03f7b440731f6742f6ef7693587e44dc1f6a6380aa1 SHA512 af529c51d9c9625a92e0d64db45c435d3d2c3d632cbfce24bd6c87c17f1f2d29d797bacffceb5c76ed535be70c16e536b105fe2eb139fbabf3632275aea41924
 EBUILD kdecoration-5.11.5.ebuild 368 BLAKE2B 6926d03e513b21a5d09bf629fda76c1e351709b0ca5e4ce7cba51cab88f9a3eefd2038b269090f16bef9ac78a5724cde7e6880bd8992afb35c5c3d56fed05935 SHA512 940302029114e1ce499159a58a6fa0881cb31f4b5ef61f53eafb726142bfa79d22dfe04970771ca9711bc66ec2cc2fc7058a7a9e845eb322da7e22a60197efa4
-EBUILD kdecoration-5.12.0.ebuild 370 BLAKE2B af3340879708d1a5ea4f9f940c9bc28323c5f6cb14429e2f1b03049b720d2daba1634010af6abe5aa300bdf2b123589da9e153ae675b73bb160e1afa3840d9da SHA512 9246769e79f1eb0c096f8cc90b8bc00be2369467f05cd4b4c7e7b59d3e465233277cf7522c1c02f4bb241bb7aead8b7a0d6a2b81f9da189b73f43bce27c5961f
+EBUILD kdecoration-5.12.1.ebuild 370 BLAKE2B af3340879708d1a5ea4f9f940c9bc28323c5f6cb14429e2f1b03049b720d2daba1634010af6abe5aa300bdf2b123589da9e153ae675b73bb160e1afa3840d9da SHA512 9246769e79f1eb0c096f8cc90b8bc00be2369467f05cd4b4c7e7b59d3e465233277cf7522c1c02f4bb241bb7aead8b7a0d6a2b81f9da189b73f43bce27c5961f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.12.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.12.1.ebuild
index fce30fa8c298..fce30fa8c298 100644
--- a/kde-plasma/kdecoration/kdecoration-5.12.0.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.12.1.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 1de06b3eb688..a91e219e7019 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.11.5.tar.xz 1459308 BLAKE2B e64360e7607b7ee653953dd487bc4bc087be349304909f88546f6f7bd1c79903f3b67d239bbca63d4b145cb95317e4542e3b8fba0cfc5c7cd470c3b8c9bf9d94 SHA512 b4a2e191573dc72d6a32d3f1a612153ccc502232fe7908dea90a7dc869002da6e50e6126a0b6b921478fe687479eac096971fb105ed757d82bacbbfb15fed471
-DIST kdeplasma-addons-5.12.0.tar.xz 586244 BLAKE2B 32c413af2a761a17a926989aef33f6821b2b6ff567a822b86644ee87b318d5145bdeff5ff8dca608edb75d897b8b6044566ab6c23ad32d878d6a640da61d3a6d SHA512 38a174533d429c323fbbe7f14a2058cfdc07602e94ccba98eb2bdc8d516f53fe32cb70e0ea95626bd6dd030567395ac31771029a3e7bd83bfe2b8aecccbf2bcf
+DIST kdeplasma-addons-5.12.1.tar.xz 588528 BLAKE2B 1af88bebda3c16af39414df86c705b15e6ab014bf34834abc00891a0473dceed344fc856339b4b0ab49f2c172568309573d7d1915b45645579da030e9b2c7996 SHA512 f82352aaea7ddeb7260d1c8d1a2fdda200c946fb963102b0db034ba7a586ce4021536121dea856b0fa5bef8de698df0df6420f461aa10193e5513c6c2146dc34
 EBUILD kdeplasma-addons-5.11.5.ebuild 1434 BLAKE2B bd342fea71f33fb5ed300f265fc29e70a3493d66ab574d7b896e114d5c0c9ce4778171f1a11f3910b1c297e2edfe1d016155fddeee9f47a640ff64bae8a56528 SHA512 e89e572b35ed2c78eb5ae1b48ef545e279a374213d01e394443a895abc1c59301cec1fd8f5de65ca27e8873419e235c15ca7d868e35e03b904eda84e965c0019
-EBUILD kdeplasma-addons-5.12.0.ebuild 1589 BLAKE2B ec3a1c46a9ecb337823ffb4ffd242db7e24a37790786e376393daddb252636c5c8fc55cdc685f09ea1214e02d94817cfdd947b83db3dabc73eb5482f2959df10 SHA512 ae0898dfc886d3aa3947e09320ea36d7e26408fd2e000dafbf5be909917ca407113de06740d50012f3f5ab1f34855700fe9f455be5e5953bc66ca1824ced7e54
+EBUILD kdeplasma-addons-5.12.1.ebuild 1580 BLAKE2B 185c8f56b34e5f9a68de6196acd3720adaa717765d99d715b946e8abde923dfcd39dd4f1ed1c0b4101dc8a2021070a6059d031cb1f44a3ab361e02c13c438b08 SHA512 f4aac2c159ba60a36fc8b837b4aefb4f845e0c3c92596a3d7529cb14328ca6389e2d7d218effe97098a06649067d116f87ff715b9326aa87fe3298d99c61667b
 MISC metadata.xml 449 BLAKE2B c65e099c2e1c0b03a7b5096842caf875a74c6d0a52109d0cefae1e7c890492a3d8c0ceabc2e9c6474b15208baceda99c75f8fffe951ef876f43496acde6af4d1 SHA512 41859edf7b9a36220087bddcad932509dfe8c98f17f3a9f98be875aa5cf60dae52de24084a16c194c0db3b5af61baf64ed81b49fe3a3289b70ab254785b0f688
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.0.ebuild
deleted file mode 100644
index 4ff38a3b8e57..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dictionary share"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dictionary? ( $(add_qt_dep qtwebengine) )
-	share? ( $(add_frameworks_dep purpose '' 1.2.1) )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dictionary Qt5WebEngine)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.1.ebuild
new file mode 100644
index 000000000000..e42b2f529c8d
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="dictionary share"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dictionary? ( $(add_qt_dep qtwebengine) )
+	share? ( $(add_frameworks_dep purpose) )
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dictionary Qt5WebEngine)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index cd5aa11bcfeb..73d2d4df6199 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.11.5.tar.xz 64108 BLAKE2B 0eb21c1c79a40c60e066f7aa80e336768cbd89405a0083019a299d6dc379d7ccb9100efe01ccb1481413d465afbdf61f64db546337c4b2c1675e18a54951cff7 SHA512 ac923f6e899b2b35ce80ed990315c3e72bfd239ad79a8630cdbdfbdc3248dd72608ac219cbeafd1d20e768496dc6bd2d71d1d326017a84f30b681b6c65e604df
-DIST kgamma5-5.12.0.tar.xz 60460 BLAKE2B b9dfc0fed93d019ef5e1f0c4055f1ab95237b7fda2f3bd4d39be5a561f705add20b55a81f58eba65d67838dd178ceff0a9829a7367e6accee54f9db5dbea8a44 SHA512 deee339c2af4aea9be52b8a9a00f47361145a35622f9138257521753e4e25f593cf626bf9922b9929abd64c36bd2f9788fc188c9f13a2917d7425b25c87a2b1a
+DIST kgamma5-5.12.1.tar.xz 60276 BLAKE2B 1a2de39fec9cad7970fa8b0b31a012cf518be584cd24d3066a6c954562695fd66b4fcf9a1a9e11aac56b5ae83265b83334b5e01debba61346084fe020b869e5e SHA512 df65bc8f7cd4b4f851bf0c2221e2455b04d93388c6d97485e928111869f633378daf770bd70d1c81c14547d4cfb876b460c804271eda21de5f36140f2706f591
 EBUILD kgamma-5.11.5.ebuild 538 BLAKE2B 02f28fdd2ec410f5068f3c9a27b484aaffc1063901e378cbeae42fe7e05ec93b885f4c608a9b87089c9cbca466335e01a0b2752755cc08c78129813446ff773e SHA512 0cce38f8e624dc056254df3e7ef7e5fe4cbd974533e88054edc864f5129e7f56b9a43faf1491fe9fa30799809c0d4a6d8e316bcb6e74b85a4bf466bd52822059
-EBUILD kgamma-5.12.0.ebuild 540 BLAKE2B e05e344d4231306912c7f09027e6a1994612f16acac901427c435a5e8cc8ac2d5ac9b0f70f288ed42cbc7ff0b471609cda3739e4ca6907d203808e0f772cd827 SHA512 85474fb4d723c375823a07381d4e02ae6fc6d847ad25fb46a41bc6b179afbb0a8343045d9323a4a8eef0a4f39e483b68727e3fec6736265c5797ad278f7e6bc6
+EBUILD kgamma-5.12.1.ebuild 540 BLAKE2B e05e344d4231306912c7f09027e6a1994612f16acac901427c435a5e8cc8ac2d5ac9b0f70f288ed42cbc7ff0b471609cda3739e4ca6907d203808e0f772cd827 SHA512 85474fb4d723c375823a07381d4e02ae6fc6d847ad25fb46a41bc6b179afbb0a8343045d9323a4a8eef0a4f39e483b68727e3fec6736265c5797ad278f7e6bc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.12.0.ebuild b/kde-plasma/kgamma/kgamma-5.12.1.ebuild
index 30b8c5ef9211..30b8c5ef9211 100644
--- a/kde-plasma/kgamma/kgamma-5.12.0.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.12.1.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 5df998364242..ecc642f7c56d 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.11.5.tar.xz 1071588 BLAKE2B ded5b2936068cc0a540ed6ec6f0229c62babefc8038db76578180625f04214dd98d3c06da7ee3d4b8a7d7286319039c2fa8c1fb5107f595cfaeb2109a9677c25 SHA512 fbbe09514cba58749945fc310b67e4ee716a49c38e602087c26e9c531334e0d1483a388778ef013678f7705ef575d18d403d922d83058d6025eedff0420693a3
-DIST khotkeys-5.12.0.tar.xz 1057424 BLAKE2B 859d21c13460f1c1ecb0b89318e7ab7892e86f64ccbacd34bd3cb57c17c94772bb89373dd773fee1342bbb52372f52fdee47d69f38a446c14c45b639a23a672b SHA512 b84aaa2733d79bb0d358f5e171737ba71a52f34275a8e9560d4cc982ccf9ff9b42b5aee398dac7ad2ba1c7866c9ccef127c3541e1cef330e8536e90ef21f32a1
+DIST khotkeys-5.12.1.tar.xz 1058416 BLAKE2B 893cd9ab6a8d3e94e1073fadfe34ba6b94e80ed2a73066adeb926b48d8cd8497540695849a9286dec244038e6faefa494e1a07804d71f39ff6d9ff182e8d9e66 SHA512 308d915f13178211a446ada86498fc4a9c37b2905bec3d8da722ec0dab03e0ee7f4ec5c38ed86da472ddc35f3644ad989fff786a730ec1f216e67c8e136cafc1
 EBUILD khotkeys-5.11.5.ebuild 1122 BLAKE2B b5616561f00ba86f251105234816129dd58d8acd2cc82fe354cc8d2789ab71b6412514b6f03e33343bdc0fc62bde837bc898e7d7dde5ae66237743eb549e69c7 SHA512 ffd4f3918a03554ecbe8f330d01f18715732dbafecd9dce39cebd4344943f1e4ed2354d541fa1a7468b80e14d4274db9da9b49068fe487438c1103ea4167e72c
-EBUILD khotkeys-5.12.0.ebuild 1124 BLAKE2B 4a85249b9f692c243c4bc44a8f5c3a62a7d05b8188f4f16db7cd88287b8ba566c2dd504f5dbe0d00ec101dfb6bdc95b0eb530e727f58d4f643d41899a05360d3 SHA512 50db51119dc32d08bb1af9f83b58a92f68811b34ba5e8fdc31a9c39e179b4509e920a90c45f3b6b69e29b7e11ed1a257a0b75587b397c8ff10b241fa3dd76cf4
+EBUILD khotkeys-5.12.1.ebuild 1124 BLAKE2B 4a85249b9f692c243c4bc44a8f5c3a62a7d05b8188f4f16db7cd88287b8ba566c2dd504f5dbe0d00ec101dfb6bdc95b0eb530e727f58d4f643d41899a05360d3 SHA512 50db51119dc32d08bb1af9f83b58a92f68811b34ba5e8fdc31a9c39e179b4509e920a90c45f3b6b69e29b7e11ed1a257a0b75587b397c8ff10b241fa3dd76cf4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.12.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.12.1.ebuild
index 60f38c3c3a35..60f38c3c3a35 100644
--- a/kde-plasma/khotkeys/khotkeys-5.12.0.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.12.1.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 91931a72c6f1..49ec93a6ed92 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.11.5.tar.xz 1302960 BLAKE2B bd938c9c330c8f335825810e3fc8e8c97b1629d89bfeef0eb18bd4852f939f5ba0fb55640338b6d817c08d0b8f0099cdc303a19874811af52c35afd2a63a728c SHA512 d64cf466b4b883c9a57a0dddfe5a1d1cae0687655897803e5f14bcf73e90c1ea05d96458dbe131428c6d19a50d92b2614036136fdb897e422b1c1fc3d38f5303
-DIST kinfocenter-5.12.0.tar.xz 1268932 BLAKE2B d9b58bb8edcce96fe17fd4c3216ab5381456f654d139644bd873a2c2bfd91d5c10dc2bf948b665a20a3a6603d88dc9d4203d30dc3ac576c029b8f2a76060b6f4 SHA512 329d30bfe7ea509f814e85eb78bf21b0ee9b1b69910eeb3864708a586e12c28865756816bc6957b3f369e0386e2ab4f2f44a0f2e15b926970e09f5ed88b0709e
+DIST kinfocenter-5.12.1.tar.xz 1268476 BLAKE2B 0653f133f9f7c658044f3ba5007c0ff7b4ce150eaefdd89ac4c72c8d792c90a2e615c0922ae7a887d454805c811bfd091fa078a513307295386e2cffd10c421d SHA512 d6e274402181d5cf1e299bf4ba926759aa31b3f9e8403243d0f2ab16009def6431d0e5c06cde5c42877aab3951004d2634b94c8a1f6f0518229dc942c4bd8994
 EBUILD kinfocenter-5.11.5.ebuild 2420 BLAKE2B da22bd0116013b3b79246f2a579b353381d9ec018efe97ddcf770a72ee76d57fdde18d52d4378851da577d9757f0fa507800d426a334c595f4ac0e4e8a174a4c SHA512 3f16d3bc5cf32511d53695315edebf42059971cb66e7d1c373d72ac71d883a56b3f887545344263e235a3a9477f620ba1e9fa4797023b6f6cf26002691b9a806
-EBUILD kinfocenter-5.12.0.ebuild 2422 BLAKE2B c64d5e3573160a015217f71835e009dd8b6e7962cad973f24f0ba958de182efe121c50d8e98ad76dc4afa4349ff0bfe1390203e4787635f73f00538f02c1ff52 SHA512 95c593960f555ec8c8254b8e974e07ab7f9aff34a739db3f86f282e7f805cc07d382480b08ac331506969b8388c7c427b65b6f6088f5ce4d073ac2353cdd50f0
+EBUILD kinfocenter-5.12.1.ebuild 2422 BLAKE2B c64d5e3573160a015217f71835e009dd8b6e7962cad973f24f0ba958de182efe121c50d8e98ad76dc4afa4349ff0bfe1390203e4787635f73f00538f02c1ff52 SHA512 95c593960f555ec8c8254b8e974e07ab7f9aff34a739db3f86f282e7f805cc07d382480b08ac331506969b8388c7c427b65b6f6088f5ce4d073ac2353cdd50f0
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.12.1.ebuild
index ff2f95c95937..ff2f95c95937 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.12.0.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.12.1.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 17e7b8de4895..9d2ee2479079 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.11.5.tar.xz 663336 BLAKE2B 2a3adeb669c00cacb0e5334f7e5c41f38683926db315714d2026256b702cef9788c8d9014dbaf63c6e68b28de953f42b9421ec5a94a165e121341e7d945ca2f7 SHA512 65fd7e67eb67c56adad3f9dc422f8005fefa40fae37a29444e305a20434a1e228c63c8db04c4f031cf60f9f06d07d794727344ad10d8f3d5681119ea44e3c5b7
-DIST kmenuedit-5.12.0.tar.xz 652728 BLAKE2B 8d8bdf1dccfead73ecd1fd39cbe2fbdbffe7253dce238dfa412bb3ac71330d6c128bebb60316778557e200b3d6a73e5455f204461c721dc7410d452af2caacf5 SHA512 8778f056e59525cb9b77e6199305cab006d4d1dd586d67e0f7037b4cd3f0224624a2766b78689df4b9a3c5db2a66cc54a4e3b46b84cb5a4afa3bb2955ef9523f
+DIST kmenuedit-5.12.1.tar.xz 651836 BLAKE2B 0b1324e6d4ec451a5eda5fe9197ee53945a33c8736c014d0d95f692060e2919e26916d2a0d586d6699b5619d025602a484d382147d776492d7f32c177566f513 SHA512 0447f4a4f569a38e161a6e4ef0668f6547eb0638cebac90c5cdfc2e5180e838f1bd211b50becc67d371121ee067a0ed7e4098541bd17f0b6e4596f58d039dfa4
 EBUILD kmenuedit-5.11.5.ebuild 1028 BLAKE2B 61939d330fe0251115207ac560cdce1b00517a31f97c0e176ee335431fa3da77b498b1346fdb668d7120af7a2850e2f02bd80a258fb13dc15527e69b3cc2f46e SHA512 7c150deda5597fe3cf45a74a53e08375b38731b770f09c0836fceeeec1dce0656a347d5d0eb2276f0605217b89570c6ae5b81e6e2560e680d2edd5d4fad265e7
-EBUILD kmenuedit-5.12.0.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
+EBUILD kmenuedit-5.12.1.ebuild 1030 BLAKE2B ca866e167ca43334565ec69f02b94b0792d943f99959380c8b76efd25c2f8d44469415ea48865ee45cd9eb5ff37237056bbe10029ad41f90ea20f1d2f5e2b11b SHA512 b6e1aedda37e0b6ec05707c7c98c70d707304f9c8fb80bb20946d260d1ebf3071969d30c20d0d35dbacf2fcab8bc973d6562e62d1426f5a66ca4178f4fafcd76
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.12.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.12.1.ebuild
index b504d5a6e14e..b504d5a6e14e 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.12.0.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.12.1.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 7f6a32360336..96b902196939 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.11.5.tar.xz 124060 BLAKE2B f9af27d740c3467700aeab51b8cf75cb087379dff833f2bb43c1fe4c958fc28204af41c81247d3835bb376516ccc2e400272b4cc9d0f9778af38a0fdf17b65f6 SHA512 a6224de2c9f3c2e539e97461ef2a7cdd626c78dc3a1e3eeebdc63b12368df26c83315497d647abd008f9246f9b7aa2f1b94425a2c6d366200811725b64d012ab
-DIST kscreen-5.12.0.tar.xz 117656 BLAKE2B cece953d3bf4272f0ee1e5c6675335ccf5355a6e4167280f076c5ddb542dcd45f7de18491107e5e73c58e95464cb9de9bc1119ed49450b0526dc9cc78eea7907 SHA512 305c98558b9331281de7065f420971c24797ed10e3d0edad5503e60c1ab0376418b0c0a62971cc1a3dafa4dab895119ea68f44e670767a3620ea5614a53468f8
+DIST kscreen-5.12.1.tar.xz 117360 BLAKE2B 67d8ea26df413410cc9a1e3211135acb75227dc0e4346a9b5f6b05cbe0c2bda39533ad17a73de2843d63242833fa5ea0a84545ee02df11ab209bf3a932e7cd32 SHA512 613f51e8afe6a3608ed7a44a4117be47eda892a58632197d85f87b4f490bd032a127ac671e7da783612aa7ed9e1dd5bfffc70bb2b8ab638ffa59b79c2151c242
 EBUILD kscreen-5.11.5.ebuild 893 BLAKE2B 96a21fedd04dd1f65d9400bc67aa2d2324c7b39bbccb2ed937f53c11a42386d1f14f8661d74720228b31007d610ea791f1095c1b5e69f1c602c245c16d367de0 SHA512 806d196ec98ca72aa1e2b81d5ed136cc0e61ca616e2ffed6ab0f08ea46dee62fdbb093bb891c73b473053b11a0abe8a74cd884f36f8c3d657067cd32e8182f5f
-EBUILD kscreen-5.12.0.ebuild 895 BLAKE2B 05a0a5838845a9961b4bd3fc0b7d4640953df52eccea95e58c33eff0b04a0e8c045f11146d48b36f3d726ba8e3105df9f47d14425b6d38e4d34cad4327ab1c96 SHA512 4225eba2e3ac0044655210a7916fd0eeadf98f095d5f202170eb1a5f9bcdbd3c6e03bc8cdda70985f971fac7f8b0a5f3954d32bb7cb9cf1a485e8801ddf32ccb
+EBUILD kscreen-5.12.1.ebuild 895 BLAKE2B 05a0a5838845a9961b4bd3fc0b7d4640953df52eccea95e58c33eff0b04a0e8c045f11146d48b36f3d726ba8e3105df9f47d14425b6d38e4d34cad4327ab1c96 SHA512 4225eba2e3ac0044655210a7916fd0eeadf98f095d5f202170eb1a5f9bcdbd3c6e03bc8cdda70985f971fac7f8b0a5f3954d32bb7cb9cf1a485e8801ddf32ccb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.12.0.ebuild b/kde-plasma/kscreen/kscreen-5.12.1.ebuild
index 05eae8520855..05eae8520855 100644
--- a/kde-plasma/kscreen/kscreen-5.12.0.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.12.1.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index fbdeccd2d6c5..18174b60df95 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.11.5.tar.xz 125528 BLAKE2B 32bad30682da09245cc567f3cb79c0e0fd4ffdba26b47ef0c49c3094374503640cab7718033cb9c366ef7acddb6180995f4121b61ed1d04bbd867e1361e9d7ea SHA512 20eefbb4f970b2476d3df2e36bf74021d854f0ba61cba4946b3fc7190cff9edc9fef753d3bdde24ab135cc0dc5ad826cb22063db7b12ce817007355a98a3011a
-DIST kscreenlocker-5.12.0.tar.xz 118720 BLAKE2B 8072d2fb87c9a067a30d881448fa886d5e9cc343796ddfd518b154c7bd1e2db745e28eb7b05ebe3a660092ee97f0263bc3f4923d5ec868593815ec6b337da421 SHA512 80530029486fc57ea506bdc8bc5d1299442929d929f6201249103a253f2491f0bc6266f379458fec553bc83404b433a1a0d6cac2a17dd09fd38dca8c141aa7dc
+DIST kscreenlocker-5.12.1.tar.xz 118452 BLAKE2B 1a8eb4742f026af8ce9ab81b63adc37df192cb1c6f66a014d807641e8d40b126664f7e1a0a0c3812975730398ab4aa634ff186a1aab34d13b8086ffdd358a2eb SHA512 e3895c1792f630fe0c8b73910629c0b141c179557eb8da7216564fadbfead659a4eb0b4fdc872054def8e5a6a9c68c27a19e65ec5256cb871b33b7c08d384e46
 EBUILD kscreenlocker-5.11.5.ebuild 2088 BLAKE2B 467a8c4a4da242250fb776c4b6e9a83777ea81296cc917d7ef79460b083ca0418429cc093964a259d6eb9d1b56237df15b0411721ceff9ab4694cf8dc00c8370 SHA512 1e133cc0cbfbf6505df1ceae6ec5b730e6f4997d68b00787e7cc5a934b843ea7d567febe5b83e7e1b2d2c37241ea0e11fafd1ae7eb40fb07bbd1106c0ed4a4d1
-EBUILD kscreenlocker-5.12.0.ebuild 2090 BLAKE2B 0f469d2e658e834e56964d032369450f910289a8ef694482ed712a4a84160c2a07e5501054eebb952160d8f30847969ef560e505d72eb39072f798525eee8d03 SHA512 70ab11dcd7671a070094d902beef4a5ecb1f146709ea37fd1f78851220659f336843ea94142dadd9437314bd933f45e30d09732b96559fc328ade43d8c54e25f
+EBUILD kscreenlocker-5.12.1.ebuild 2090 BLAKE2B 0f469d2e658e834e56964d032369450f910289a8ef694482ed712a4a84160c2a07e5501054eebb952160d8f30847969ef560e505d72eb39072f798525eee8d03 SHA512 70ab11dcd7671a070094d902beef4a5ecb1f146709ea37fd1f78851220659f336843ea94142dadd9437314bd933f45e30d09732b96559fc328ade43d8c54e25f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.1.ebuild
index ba3e06457c80..ba3e06457c80 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.0.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.12.1.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 11328af21ebc..05f74e1c4837 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.11.5.tar.xz 23168 BLAKE2B 74d10be7c303d0b7d1d8765e08a89986b4c1745e5f601982dd406cefc7c73ac684c1c05acdd355d45f5078e034ab9971467b4b76c0ae3a94800ce6480fa8c3f0 SHA512 34a8fe5da983a0fcc6d5d223120f2d23e0168a534d29941e83024110eafe981d6c46ee503abfb7bf8e072dc64060eea373c191ef0f8dbc5051cb2d968e6d49d3
-DIST ksshaskpass-5.12.0.tar.xz 21272 BLAKE2B 5b2037c239e0f3697364daa31cc3dfd632f882d4729369a44284601001f44edec1df8ca0b6daddcbde05467196e866513b4cc94d2ad7127462934b315e580462 SHA512 f785f6e58bc580eb2b895bebe2a1d9eaccbb8ad9e493eb8f55ffc86a4dc32d609278fcb351c7b33787471e387eb47e6106ddcd0fe2a8fc27ff59e40a41cc5052
+DIST ksshaskpass-5.12.1.tar.xz 21148 BLAKE2B 7ab77527bae0bf3c0c3547bdc0fdc45dc1758c95308f26164c12d9af130f7f5080260981684633010e929908625f56bf7f3505bc4ab4d71d2c40470dc81d5e64 SHA512 210cb8cba185a06d896430011c087b85eb0ca0db6a21f2ceba58d3497cc49acc7a9b67ef31f21bb4627049f34369250575de7e33beb09fb0014cdfe52c8318d8
 EBUILD ksshaskpass-5.11.5.ebuild 1235 BLAKE2B 76ec180a4af4bf1b0f861f3f86e8ba4df59d796a58bfd95dcf1e1dac2dcf9eb7e7682a714fef94cfbe1609518381e8d812b10f6665d2aa2100b6ac337181f5a7 SHA512 02ef5de19976e1b1aaa20ac0c6534bca3094a4befad0da39d557199455ec37d8f058e5aecea2be2a808bb98d5723ca511147ab7148a205fa39515d960d3b41eb
-EBUILD ksshaskpass-5.12.0.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
+EBUILD ksshaskpass-5.12.1.ebuild 1237 BLAKE2B 1c99e53800164ee9b4fc7a1b3f0e455d73731bf4134c4ef564ab87232172821c4f0b21cc6585b71af7260f624fc2e72bf65eb1f464c3cb2306387c41a494eecd SHA512 8dee7f813fb760cabaa932423c2cb099647141f664abdae30996d212226aa9c42f5b683543d021ec2abe48d19086e22a26416806375849c07c0db7900ab5b0ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.12.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.12.1.ebuild
index 3009c8d5ff69..3009c8d5ff69 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.12.0.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.12.1.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 40be94f4d9f9..d9f1059cadea 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.11.5.tar.xz 502228 BLAKE2B 49e82c26ea1c032e8e036e509c6a46c5da409f4092679a623bc26342f34ffa90d96306fb5638b1fe5a4edafe6f48af6ee12876286788b11145c00c1a32765edb SHA512 62af21b0d911abac5b66ccddeb0180c08199c0cfd8807d461fcfe444105ce7912efb5b8286e7f4955e97cb537edc32f046d646e82ecfc2d61ec39b2a53ed4d93
-DIST ksysguard-5.12.0.tar.xz 487248 BLAKE2B 46ca521c6149e1b2a5baffbd9248ac2f90c8b58b67b095936b5fb59399b1b4b9411fd0391e75cc1e93a57dfb1b1ec0def1a344375998caf30facad0ad1b5ae5d SHA512 d660b01d190860e42b4f21c420d6eb91da5f8cf35f658ecb13f19e86136070c14cba3c9ac13338c6586aee3ef5e8363c8e65597a7ecee2c5b88356ead292b9d9
+DIST ksysguard-5.12.1.tar.xz 486224 BLAKE2B 5eb72fd7303ce3157147eaf4d02148da36a4c0fa235b9cf3ba2134da8368cb77da4fda501f44eafceceb6cb372e49ecac0bb1eaaa64948a3aa903736b03d9afb SHA512 5a263ec8df6b7703864ce8f5c17f9e34aa8752e076ee5746ee9148dbf54e2705be8c782c8077493c5bb0fd7e49abbd3c2606b64dd34e787b6a52adae97f76996
 EBUILD ksysguard-5.11.5.ebuild 1143 BLAKE2B bc2409ea028c763c822431abd58fe334cf5f3ab8430b43ec61cd53336e278f4a8bcb518e01d1de86607053fded35b8924bce024ababea2c904bd89159e57a6cc SHA512 3f50f88f16dde5a45742d8012d5a5601955b59c191aa82d0fa410425fa56e13faf3f8370a4f86d2eceda48790d9ffc12aeaf647a1689f5c1310ade072a8037c3
-EBUILD ksysguard-5.12.0.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
+EBUILD ksysguard-5.12.1.ebuild 1145 BLAKE2B 46054b5abb67d1b8f049c8bcc974ee3e2bf7c2029c151aa31688cab1b251e2913aa54bc6587361b2b7030ffed33aef8615af3a8d3641f1463458f374f29a635c SHA512 201d5337ec13c6b615401ea9b0ecf478224d454dc6dde1c9defddd9de9a980f9ab9f3b9061e1c3a84a5013cdb0964a7238b4a3b3caf83f741ce8c36fa9247209
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.12.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.12.1.ebuild
index 5e2260a85627..5e2260a85627 100644
--- a/kde-plasma/ksysguard/ksysguard-5.12.0.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.12.1.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index fdfcaa52807d..b98d1fe0c628 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.11.5.tar.xz 19060 BLAKE2B 814199f67c9026ca420c66d0dbe48ef9f1cab2d30bf3784cb3441af56ceec9ab3841dcf41021bbc5d42edffc0fc0849b714c1f279065c974bba794924fc0879c SHA512 1602ef0eeec86c653c2a99c1c514133367e7dee07d11ffbe0533066d895c71e3b7dd90187cb353446b717738600143cd09de1a5baffad5113152fd616bef90ee
-DIST kwallet-pam-5.12.0.tar.xz 18596 BLAKE2B 65aae9ad00f717b0c679c16a7543391f28f6112b90a24833050564df256ee8930335f3ebf5fc04e0cc6532fb25db6bbb4bc4655857032fa50d4a4c8c5089d925 SHA512 54d3c08b8872b27a03ba9a4da4939e1722dcfa3ad440324f6ea103d95f82762a8e3073f91e1373a0916fb60cde242afecab5855b3a5627bd1aa6698899887fff
+DIST kwallet-pam-5.12.1.tar.xz 18484 BLAKE2B c44033e90be594f858913afbd20bd8254c6dec7b695cdfa79265c2f069e28b3457238f3e4df9a2a3cd37bc6d709d087d3f4bf09239ec37fabda7b1edc44d1bbe SHA512 c5bd45b2dc6d0637610fea48b93ab9bb9068bc96ccd5f41a537b8f41db9f3d35bc5c1edd510885735e2605a93ed166cc7b5f979ffe48e6fc3af26f81cc822d08
 EBUILD kwallet-pam-5.11.5.ebuild 637 BLAKE2B e60fd96ae3c9b69d8d79975ea5fa340e625314f6769a82ad46546b1f7791bf28e95a7e3aae40e1c07b68b373a32c0b52930951957d36f087d7b3bec384314a84 SHA512 502c7e484ae0da13c6c19042308a8cbf7c95544c4f302b42f6743cafaba8214a0ac6b0f05f743c00806c73dd5001f8c238642191e5d893994adf562e9965e444
-EBUILD kwallet-pam-5.12.0.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
+EBUILD kwallet-pam-5.12.1.ebuild 639 BLAKE2B 2050e8d5536ac921c663db3912957c054a7222ce9428e731972302b50375a5de3dbb4aa6799fde9c6c070fc0c0083791a8f36863c799d6c793ab102685511d55 SHA512 1f2770a2b879c386e35627ca74a4b583e9fdd3dcc7a8468ed1f993c26d8fa0e4eb7c700509841a2d6b434bade703c4bc61523e61f276f3b41d1521c445a33ff9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.12.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.12.1.ebuild
index 8c9a7437fc09..8c9a7437fc09 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.12.0.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.12.1.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 037e367cc55b..8af8bde17e0c 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.11.5.tar.xz 19080 BLAKE2B 3f1bf365f4886398fee77da4a1716232cceb691746ed6f313d6bb48f46d5813eacfb32381b9cf3665cfb7706a04b863d3545be4ddb5749176ac25055e5d643ea SHA512 246ff96d30d6a212aedbc9e7a5680e20bedfcc398591f670b0c96f68127aab547e21537aa11f2db68c505845c7897ce8be657b3430b420033100a774bcf6c1af
-DIST kwayland-integration-5.12.0.tar.xz 18628 BLAKE2B bf3201f96d2b5d83823044931b19c6d4df83e40f9bc5920fec4baa91f58cc37566a294a15d18cc593027e1ebc5a9a2ddbc2ab56af979eb6335e949472e88360e SHA512 41212c0c77a4d2e50deabc16ce9c2d22d41133242f1ca2a1cd4776bb1b5ff3b07ad657af273d300cf10506cbafd5a07e9b5ce3007ebb3dca56edbf8117f900de
+DIST kwayland-integration-5.12.1.tar.xz 18520 BLAKE2B 9afedfd9d0673740b5a2f470ac0f78b95072232d042fb397b46996286a716c0a954649150953d88db18559fdaf868abf6a33485a3ae97624a27e62fd0f0a74f3 SHA512 c002ec0a32b0b641aec3248181b42fa892ddf9a34ad3cd59766e0e42a01174d16ab4e736a35a40e06aabb36b493086fe7911feefb117deb67cbf5753ba49e08f
 EBUILD kwayland-integration-5.11.5.ebuild 503 BLAKE2B 1b4b9be2a97f6051ab0e45da929edd0c106f056f06f8918e2482eeb22087ba790a0eb4a5b3234481f107adc7315d1dc547439cd04c6e82460a9a59707267fe65 SHA512 c21a517a77603c7560c7833cdb53dde7c4599ba5d777c90987e8d606c22ff8a1e4a43378611bbf820f4e65d1238d7f1a5e98f8786f48c8a28dc73512473bf923
-EBUILD kwayland-integration-5.12.0.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
+EBUILD kwayland-integration-5.12.1.ebuild 505 BLAKE2B cbdc8f11c9246ed71cb0e595c35f58ed4c0adc76e7adb195c5840204e5fe1bd2a6648b065d35a0e100d8902c7a310c47f734fda96cf1121869804a02885d15b0 SHA512 57306cf35020b521fd7fde9cd28324fdc23f170c7b56da613a87fd8005e879b3390beb2b262dadd5e3812c520baf58f88605044f33cac081790500b7171dc30c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.12.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.12.1.ebuild
index a2771a46748b..a2771a46748b 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.12.0.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.12.1.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index e14ef85e74aa..6e99bdd3963a 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,7 +2,7 @@ AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771
 AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
-DIST kwin-5.12.0.tar.xz 4927216 BLAKE2B 34ba6b256ad0d8cfdfc36cccc6d4553c0bd17e72986bb20ee7c365b0d3378d86df57245d4127f779eb3027131fad139bd52b65d949d7e629f5504aa63c78ce2d SHA512 5b84efe785c50bbefb2bfc952234ce8eb8c42402b36e0e7182c8fa7f983cbde4ad9fa306a812b87ed94db2634185494f371fea1af0e0aa43aa3bc472f9620335
+DIST kwin-5.12.1.tar.xz 4925976 BLAKE2B c7aea07ffdf60ab2a1b6d11181dbfaef1a1809956b17ebde67c8ae15e2729571d954dba010a9dcfe4c4b1b840bd2046079f67c86d2018efc86a8bddfae5fb943 SHA512 7acf616624dcca6dc13dc9f1ad872ce83182efbd77056f8edf2f74d07111c2e8fb68e1230e95e72482741861885dcf692cddc636b2092c69d87da83c74364e4a
 EBUILD kwin-5.11.5.ebuild 2413 BLAKE2B 3cc059fee6f94872050cf63e5d15998de7a25f9b2f22cfe31a11cd8f4b632f43d6b7b77902ed3207620b5755389a102d10902e8b7cf464d7b110f3f718a9c575 SHA512 93e83dfd948e22611a514b084bf964eacdeea645b49330e57df71d522438a4766836e71d60742e53890022d4e5a4cd9b3130fd026c6738a00ea70c0dda3f263a
-EBUILD kwin-5.12.0.ebuild 2652 BLAKE2B 3f0a61f51ef8ea8335d41ddf48689295fbf5324e100098876b4ee4fecbb05f71e782054f0e291ac9636f3508d052f88b3edae77ae7012b33229c01ad6a9c7f57 SHA512 2765cffa8124bec5f27a2d73561af0c7a644c89b0ccc51c4e3cb966f1fb582c33841f9cfd90cd67ab35e189c05ef6ecbf8936aed74566ded55a5e3c3d88991b1
+EBUILD kwin-5.12.1.ebuild 2652 BLAKE2B 3f0a61f51ef8ea8335d41ddf48689295fbf5324e100098876b4ee4fecbb05f71e782054f0e291ac9636f3508d052f88b3edae77ae7012b33229c01ad6a9c7f57 SHA512 2765cffa8124bec5f27a2d73561af0c7a644c89b0ccc51c4e3cb966f1fb582c33841f9cfd90cd67ab35e189c05ef6ecbf8936aed74566ded55a5e3c3d88991b1
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.12.0.ebuild b/kde-plasma/kwin/kwin-5.12.1.ebuild
index e47e89325e23..e47e89325e23 100644
--- a/kde-plasma/kwin/kwin-5.12.0.ebuild
+++ b/kde-plasma/kwin/kwin-5.12.1.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index b26e54af0813..734c388e3154 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.11.5.tar.xz 20672 BLAKE2B 4d976948ec85e92981a28e99a291c75dcb888159e1203cbfbe35a238132e13fee682cf1566b455ca7cc2bd39c84e4449fca915cc25037a0a149836ab18272833 SHA512 a8ef4c899aa4b38265c470cbdb0c1b47951567f2637255837febec344cb79920986dda6838c60723aa9474e5d632fb8209e6b3090c52a723b1618e134ecb6246
-DIST kwrited-5.12.0.tar.xz 20440 BLAKE2B eeaa8d8f3401c8f9821f1199c2b04406b24f863e64cfef47d306c63cb00b8024d38552f871bb1911c39116efc66d661a56f409db96eb0eadaa6dd1dc9db5b21d SHA512 4a496d3b92a208ba1281ef7b3dd1e9c48f91107c679bd46546d6686dc1582c7462f664cd385056510c628196e47cfca8a447ab3155abd6ca47cc663c1e925186
+DIST kwrited-5.12.1.tar.xz 20320 BLAKE2B a876b26c086f61c1b52d62f6207f1c8f9e52f94a1e2f1f8304f18290d0468666c1a46ab8d368ccea7792e97f5fa32073bdc95074f48a36713b3abf42f53191b3 SHA512 eba69716256ffab6a73abb3c050e2fa371fde216ca60a6f91f21fd2a9ea45c6ca174b0ec5079f3313003a50220c44bdc854a16b77e72ed5ad424d289b838a127
 EBUILD kwrited-5.11.5.ebuild 501 BLAKE2B 10c4a3455ad22aa30db3d80773b354a1d5db3860625103e325099b06de6f3b45093f74d538f1fbca081f3ea926a4c4b91e738380a9a5abd2b624255ffc9a7c80 SHA512 aa11e4f344edb76da01f6e8ccedb8be4ef3e58eccb1de6de2b39550c8faba29308c8759671ed03d1d720e8dd0fc1787db343349a2885c48bd911600611586e3f
-EBUILD kwrited-5.12.0.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
+EBUILD kwrited-5.12.1.ebuild 503 BLAKE2B 75f08b16b27beeeb0a8997247a7ee1182279a152b3d96ea6ada42cb856ac23e9df8d77f02a4a18595410409070523e6664bd99f1e83c447188c12d154f3d1167 SHA512 2b975e63c0972504c5a1cbcd365ec8acf9bbb2f0ad4c324b53742f70366a4b561659e23964e9389a68704067de7dba5e537ad4368e9e66d6ccdb3f7f7971f736
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.12.0.ebuild b/kde-plasma/kwrited/kwrited-5.12.1.ebuild
index 9e8c97481c25..9e8c97481c25 100644
--- a/kde-plasma/kwrited/kwrited-5.12.0.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.12.1.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 6bab29e9461a..2e59d38c3def 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.11.5.tar.xz 96556 BLAKE2B e0744934eab4e8f906000ba61ccb0bd8dadde9e699118195c1ff795a97c6625ee89d8478f67f19fcf8c990b339ae9eb5f088b9530a555e98bc55d4d190eade05 SHA512 40f5753d08d7bbed5693cbd2696a680565f4012412b6a097048a773ccc15af59a37659e3b73c3695c012b6c7435a05ff04f05009d9cac7971e40d75696ffacec
-DIST libkscreen-5.12.0.tar.xz 94640 BLAKE2B 5bd13ac3bf730c1c582839d7cb0bbcbbd42a8bbc0e58fc7ddf04fdd56da7204ca6024c24dec55bc3e8f95b801de258fcdcd205ef653f6873fcff150940df6524 SHA512 2a383b0cec520cd92f633fa6e7d67d9004f55303ee65426fd87931d5fbd7ef817b69b621e730c83276657762dbc59d5920f62dd5f8fbd0f3046946b3d60da199
+DIST libkscreen-5.12.1.tar.xz 94468 BLAKE2B 57e34a8ef5c25cea66fcbefdd43b0abc36d910076faa371d4bdf0561692d4634882192ff2e89e4bcded1dc90eee909a560529dce43b06aca92065147e8376d41 SHA512 f65b352184a53e0f758da56bff87318446506d0803bff916968ae06270a252b8f4415ab65015fca965b619a6a492eee76bae2d38a8b1d6bb61df85859197d7f3
 EBUILD libkscreen-5.11.5.ebuild 501 BLAKE2B 315265c1c6421fce51b41f6a6d108b5ecac4ff1d43bd8a19a3f87e246b6834b8a54ff4810a0d789424037ea43d67781229daaea1947927b13edeb48a67069448 SHA512 bfd421bd2e8a96688fa0ae0673954f7a115d2443e2aff066ed3d4a4f9cc5b4d5537f80d1fe7f323dfe847303bc65196bd45130d59e25efc9769d35474c06aba5
-EBUILD libkscreen-5.12.0.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
+EBUILD libkscreen-5.12.1.ebuild 503 BLAKE2B 9b2e2e3a9ebc3053d147e95be68294c96d76e2d9ae39d25a1b9918f32f3f069b6e520fe97ddeaeba5c2b06c630d286c1051f4099411747be8053784b23e35959 SHA512 fc1115a2e8f49a183e694ba8b468fd4c4f0c327c777e2e0d88bc68405963551c03cfb3838c8a1310e8b7bbf6838b02582a897e098511a3360c572d59da348eeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkscreen/libkscreen-5.12.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.12.1.ebuild
index 56ac7823247e..56ac7823247e 100644
--- a/kde-plasma/libkscreen/libkscreen-5.12.0.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.12.1.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8ceab7d5cad5..05cf9fc54441 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST libksysguard-5.11.5.tar.xz 576200 BLAKE2B 8e17dc3eda1a69ea2a37664c80695c77087779138e8b4b99c9ab0ae444074d9f78194db55b00170d3d917310c0c1ccbc5c77d3aa07dbb2a31210ff4e8a9155c3 SHA512 3a4c08aba07a71841643fc830a77ae4684ed41a8f26e6222d202738fb3c9f7ee2e816f15bcbbf5b3032fc100d33feb4d6771bf335c70548ab3bb4440d6d90286
-DIST libksysguard-5.12.0.tar.xz 569792 BLAKE2B 2a103699d11d9d9031a59de6a910a8dc557eb296e2e5c665dfa671e3cd551254fe3aaa24eaf0c9a637ca2f0c08d7d3aba1b12eb5a8ef3a76f6ff0229cfd2e976 SHA512 ad8f78e9b5f9f473667559bff060f1cd6daa086c2033c617223f906cd808224b9dca103ddb48f8f4ec9fd708cb557af50e066a4da43719711f52ed9bf1d42a57
+DIST libksysguard-5.12.1.tar.xz 567868 BLAKE2B ca56fdfac583917bb1f0fdf269ec1373940abb020370c68e3992af4e1454ff868d0b37a906a04437e78a5d0c3d6e2637c8e9191d439682d87c5f75a8d2c921c7 SHA512 e40ae55ab3c6001f69849b3ef1594ec954003e3d63f3d198575aa378fbf363d58d4911ef7ce26d4038fe585e8118086436741b7e1359311e2708a0ab679be37a
 EBUILD libksysguard-5.11.5.ebuild 1241 BLAKE2B b971b2aeda2a3ee5ebc8438502262823d3af09d264e7fa0f209e1461b9e10c484911db10766c63542603ef101e7083ae148d3b944f2e081bfd5c9926b8e1fa0e SHA512 70ad7a0f43651b8f0fce0f394464f43a6a238c2e2c7b360b1666b5ac7bb054c7aa511caeb92dfdfe5c6c7327f7516fe0b05ae8372f12a6de0defbd844e5bc499
-EBUILD libksysguard-5.12.0.ebuild 1243 BLAKE2B 98011d5bb9ea00c62ee9f83c0238e302b10d99615624aa732f74dc751081d09f8b877f5e9f841114880be62cb0845b9f2ce8fe736c4d75c47b8aa852a0979264 SHA512 a45400d5e0fe8f5303bc93a841d0628f96594ab33122f33f09b1efb5201679ac777498f0de75e87376a70d665e10897a633cc9d3ab2f4315f0c60bd62a0927bf
+EBUILD libksysguard-5.12.1.ebuild 1243 BLAKE2B 98011d5bb9ea00c62ee9f83c0238e302b10d99615624aa732f74dc751081d09f8b877f5e9f841114880be62cb0845b9f2ce8fe736c4d75c47b8aa852a0979264 SHA512 a45400d5e0fe8f5303bc93a841d0628f96594ab33122f33f09b1efb5201679ac777498f0de75e87376a70d665e10897a633cc9d3ab2f4315f0c60bd62a0927bf
 MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
diff --git a/kde-plasma/libksysguard/libksysguard-5.12.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.12.1.ebuild
index ec1440424001..ec1440424001 100644
--- a/kde-plasma/libksysguard/libksysguard-5.12.0.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.12.1.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 8884165367ac..aaf2485c0e6d 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.11.5.tar.xz 61832 BLAKE2B e241f388a6a17243123329a8075b5453603a3b1f174205a1be78306c3fcc84f56f78334be3bd58c54c90c722ea64927acadf2f1108354fcfa613960b9abaf82e SHA512 c0db62a1b8e6e72f4d738d9f26d7d16d3b1e77db1e6566451b23cf32f2b2060ab3ffa439caf1edea2c65c80d73b6e68aa054c73b54aba3fee93446a70d65557f
-DIST milou-5.12.0.tar.xz 57376 BLAKE2B 281210323d3123d2cfe28a1ba9b5faf1ce2d9c0d3510cb89a6fbc2cf6fbaf19c410bdb7a832f4cfcc5697406c22d988b21e06b4a785bb130a78ee73cac95df46 SHA512 15260d1af69c8154ecbc7636b0d9eb3115340a648d8546eef3f766d22b3cc453d10af76ad3505cb3a429cbc40650f37a519c73612d44bce3fdabe4e9b270c8cb
+DIST milou-5.12.1.tar.xz 57348 BLAKE2B 71c71818e59ea18269efedfc803d2518e551f27297e8e6b6c3b109897af8da93d8480bcdf172ef6fb97fe11b9505d9c4058db3e56ebd2450d8f06d018e0779f5 SHA512 897f637829a6b0463c1635541e8fd57b9c0f22ee0a8bd218f921548722e339fa19a8f02db9d935cceac3d52680676245ff422f5c10786a27ea4b82554d4fe43a
 EBUILD milou-5.11.5.ebuild 692 BLAKE2B 6cf9633673d92a1fe2654f5f0cd4ea60e5db47bf4120ed090ce9cbb691255b5a854ca55d2aa608f4a0751766e0ff0c05018cfbe35bab4782c68fc7d221efe05b SHA512 78fb4c265c8b09fbca47b998191c7fbcaeabf7224d0a43caeebadf942071dd92e3ca088e4de5a5678c85ffd50a140c66914a23654c9e3541e1f67617a81efc73
-EBUILD milou-5.12.0.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
+EBUILD milou-5.12.1.ebuild 694 BLAKE2B 3e957664f5e86b816f680c716d1b2248cb9126b58f5311c162d916837a29521261f33d1569daf80a2aa60c96b37bd6d4395f014af07017fb8be1278a43d4a13a SHA512 05034f125f1bb8399609d2a50c21408a3d4e1393935ca64819f3dc77ab52b247c1c737d48c689431bdec84509e03ab64ae0580d0570e4a6b4b9bbefffe454b40
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.12.0.ebuild b/kde-plasma/milou/milou-5.12.1.ebuild
index 05a6dae87be6..05a6dae87be6 100644
--- a/kde-plasma/milou/milou-5.12.0.ebuild
+++ b/kde-plasma/milou/milou-5.12.1.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index d6413b81d80f..559aa6e71f70 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.11.5.tar.xz 4489196 BLAKE2B 89d8e9742a68b59ad03c697875ca8e1e49e253668db0081a04922b057a7ba67bba1ab785e1507bf4e16ceb3ffa63f5adda54fead63a1704d7fe4298408db4b63 SHA512 101b9a3ace2e619510702feba868bb98cb873b18730d3705803e047ce2b0c0a761c884e1714fc654f85775e461c0784d199baa1b9026c6b8f8a4cfecce2e4209
-DIST oxygen-5.12.0.tar.xz 4465216 BLAKE2B ab4a7d4360d9856260412cce53fbeb12c33a208549af787574b994155fca3dc856ca6b7d08b3f7257e82c234d8814b3a2ab4b5302fb5a5a029f39d233477c1f1 SHA512 e745a692b6bcc2c0f66ca65b36d9892cd49a2317fbdb9e6027131ad4b1896b982846b48e594ac811838058aac71ffb0b08e01108bb69f9570a6490400e4ef2f3
+DIST oxygen-5.12.1.tar.xz 4468120 BLAKE2B d9301ee258ecaed0137e5a74651ec8cbb406bc2242c7375e86e266f96b38bc263f073e234b73b7565aa3094f59b6a8fc2daab535bcf1518b60b07999ffae9a56 SHA512 bfa0fd57de73f30d7c1af9e7731123cd71809f71a7cd7c29254f9bd9e00223a6f012050b2c6be45e6adc8f7bc41d2d067db55a16bed56dacb3406c3d8d9fecc9
 EBUILD oxygen-5.11.5.ebuild 1978 BLAKE2B 6948b48c969b6ab6bdf8eaa5a9c2ec0c4c20c770e1ee79f5fbfe47f5ad6f2d3f1a98870883393f836022902e2879ed17cc509f1081c15b3d8d94dddef23f804b SHA512 6d6a1708c3af1600865fc59db2e538e200a6f4c77953016da7493f68c00b237218192fd786e94fbb15e3d5b0fd68d768e60e5380a97e8f4d729706c9f94b5a04
-EBUILD oxygen-5.12.0.ebuild 1980 BLAKE2B 333bef6be5233d9d3c745b076479042f29b03a19ab64f64e62e096cd98f4466628c6e9c7ad36e4a8bc3a12c37cf6393ccae8956f51b6065c6f06ca2bd13e0548 SHA512 bb68d16cb3675a33275b6d277bf97756e8064cbd614170ff8741fe0dff245f83c356c6498dbbdeee452333a36154ae3d89263cd968fca272ff3431ac41e4040c
+EBUILD oxygen-5.12.1.ebuild 1980 BLAKE2B 333bef6be5233d9d3c745b076479042f29b03a19ab64f64e62e096cd98f4466628c6e9c7ad36e4a8bc3a12c37cf6393ccae8956f51b6065c6f06ca2bd13e0548 SHA512 bb68d16cb3675a33275b6d277bf97756e8064cbd614170ff8741fe0dff245f83c356c6498dbbdeee452333a36154ae3d89263cd968fca272ff3431ac41e4040c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.12.0.ebuild b/kde-plasma/oxygen/oxygen-5.12.1.ebuild
index ebd8d663ea95..ebd8d663ea95 100644
--- a/kde-plasma/oxygen/oxygen-5.12.0.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.12.1.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 864e1ef2a1ee..c1bfd45dd4f8 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7
-DIST plasma-desktop-5.12.0.tar.xz 8413228 BLAKE2B b49459828e99962ce16e725d4f92f1ffa67048428a16ec42eafba9b141cbd0a61433d4a83ff01d3adfb32ca63ac7dd23156edf9b2b9be6edb35fc8db7bec757d SHA512 08ae3806250b0ae96cbd9fb60a805aeb76f6848d858ff73772714db9bf461f4e329599bfbfe86cdbcd3db8eee510e4fc18fc75c8c9e1b7a1d694f7fc6757daa3
+DIST plasma-desktop-5.12.1.tar.xz 8417300 BLAKE2B 06fc4b9e23cbc276e5a4ce780916ebae53281547a8e0427da6595696b95d63c885fc06d715e99fb9b8c0eaa6172ef75fefffe4bb6905c286f761a9b5d0a673b0 SHA512 1ff8ccf1bdf307b8483ad9892e5e89a6641784503f19e7e7a26665efca6d73754a80ad9595a2120877b95ef86bad7b4fad6aacdcba9fd991955ffb87c1b8d8e4
 EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a
-EBUILD plasma-desktop-5.12.0.ebuild 4411 BLAKE2B dd1a24e993772b91b6d16552a5090c851b7e84568731f0aa157b3497ecc22e65421ef5f3b1e46c9db1425a0727592ab3f4d9d04115070fc4a424d0ffca6e0695 SHA512 ac2b5895f6d82f2d5e2ca347d8bf867cf7bba88ff34ea36ebfbaa296fd3ecaf00a2b0d034fbc5882e3972667e7911c91b6a8144dd27c546353d2a83cf4fd7009
+EBUILD plasma-desktop-5.12.1.ebuild 4411 BLAKE2B dd1a24e993772b91b6d16552a5090c851b7e84568731f0aa157b3497ecc22e65421ef5f3b1e46c9db1425a0727592ab3f4d9d04115070fc4a424d0ffca6e0695 SHA512 ac2b5895f6d82f2d5e2ca347d8bf867cf7bba88ff34ea36ebfbaa296fd3ecaf00a2b0d034fbc5882e3972667e7911c91b6a8144dd27c546353d2a83cf4fd7009
 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.1.ebuild
index e2df415745e4..e2df415745e4 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.1.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index d0fe173da1b0..051506247878 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.11.5.tar.xz 55856 BLAKE2B 4c1d56f9de0007d369eeca5f7a992f95ac9a7853ad30f80b86a762b2ba88a5c87cd0861590e640466314edc4436052063be7e9718754a73388eb60baa253285f SHA512 2e14b0bae19e344dd0ddd27b48ddf9f9075b773c295b58a35b05d0c9d11c1573821ec1c25ae33da4e3a4091386301aef15c51f4d1163aa195a1de5f3ea1844c4
-DIST plasma-integration-5.12.0.tar.xz 53160 BLAKE2B cf14769ad82c85841eb15e137d233c200f09104ad6673f831eadec31356eb816620ef220aaba0cae245dec70b6432487d66e3f32a457e8f809b16e76e135c82b SHA512 e9176158cabd01fcb81ddff99e634aeadcd4c44aa1f997d0d3869a5b08ca2a3fa6df211923ec2ec1b32229cd31e558f059d1c8f0fdff105f200eceef0cb9ace9
+DIST plasma-integration-5.12.1.tar.xz 53156 BLAKE2B d2413a12682be97c3729550d83da792d968069fd9b6019b93d7307699aee8896306fe92d397e7271382f721a70518a41d0825b2f67fed882d333fa1555e7f597 SHA512 2cd00fb37f981773a6392e29f7ff84bf696fa74880335cad8899c31a927d4c51581a1cae6adf96a04ba20c8f1daf3c70986f0584621fceabf8c455a05f66f3c7
 EBUILD plasma-integration-5.11.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
-EBUILD plasma-integration-5.12.0.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
+EBUILD plasma-integration-5.12.1.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.0.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.1.ebuild
index 1d60d9295f03..1d60d9295f03 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.12.0.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.12.1.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 9fb7ec1f107a..655ae5aa0df5 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.11.5.ebuild 2000 BLAKE2B bb5660a59599dd6d868010aa62a21baffeaee05667c921864a0cea0a6ae52bd6ecea67693d8a91498e6c3c73ccbaf13745a602425913766f004666828a799343 SHA512 ff0cce1055e377dfcd256a2bd26aa53d7ea6c2342bc4b1ad7bc6a07e5a0db809a003ba1bc37c31d2d6bc7cfd576e751dd41c7a38b8ed800a06c8e940186696b8
-EBUILD plasma-meta-5.12.0.ebuild 2002 BLAKE2B a855396ca676c72d4eb59d4209bccdd6e546598007fa481aeb8c18eea2c1f04288dd5f92698fd75746e366f07cb9f9c53d6529df5397d298039fa01b4afc2701 SHA512 74c92ebb40c80ffdf3cf2bf2f14e1724ac179190b00827c1da86d75291a8f4c2a22f844274f0318f1bd6865dc34fa3cf8732d3b394f6e660660030e3922585d0
+EBUILD plasma-meta-5.12.1.ebuild 2002 BLAKE2B a855396ca676c72d4eb59d4209bccdd6e546598007fa481aeb8c18eea2c1f04288dd5f92698fd75746e366f07cb9f9c53d6529df5397d298039fa01b4afc2701 SHA512 74c92ebb40c80ffdf3cf2bf2f14e1724ac179190b00827c1da86d75291a8f4c2a22f844274f0318f1bd6865dc34fa3cf8732d3b394f6e660660030e3922585d0
 MISC metadata.xml 1094 BLAKE2B 881a75bded925cb9136a3ed2322cef73951f6c3b4af1bd60e8fc5c9733b8345699ea3dc06d030d4bb49ae1fa366b3d3596c7bb9886d0dce352536ed706a963ed SHA512 dbc1efc45b907453ebb2c0e0865d5b6c3be9235686e86b37ca9e3f8b5b73644058590cc59db8545c4f7af68f12c0482e5b9872a813a657a03508abedc5932881
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.12.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.12.1.ebuild
index 60b527e958f8..60b527e958f8 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.12.0.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.12.1.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index f3027ef52afd..38e3548eeb2c 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7
 DIST plasma-nm-5.11.5.tar.xz 718500 BLAKE2B bdd9520cfa3a305f7f2c271fdfc9678b43ed46e160ff7c7485a963889b32e60f56408bcc39b4fce81e570ce194410730a628bb2eb96afcfba8704b787d90c05a SHA512 6bc42e9b385fff03d994d66fb2088ce22b2766588c655466e4e26a0b57f1533c142ce7712c9182d9003368f30086333ea9670bac54b9b797e58a968f8bfc3512
-DIST plasma-nm-5.12.0.tar.xz 701352 BLAKE2B b1c3f620b126f7f8edf7dbeb785c5195bd4c98dae78eca9bbc1f0d05de7f0bec5bcf935ab9a62b0a2579495dc2c07563c696924610052e98b0318205d6ef6e61 SHA512 08b6cc42eee0e5a4314884be34e7108bf6bc96fe5916cd52f85cb9913d3e488cb15b7cb680d87ab8257a54ebb16ea6f3f54e31b927e18e86024c43c1f14de9c0
+DIST plasma-nm-5.12.1.tar.xz 703312 BLAKE2B 5a29f4824afbd59824f7ccb15c4ce77713f83b86bbebcbef6167c6dda6e040c1cc4a0c4dfbedc6596ae37105449f5f6d99e328478d5101d29362584c494a95cb SHA512 a35ef52235116cf815aa92ca8c66f2756d31295d940d8279fa032d5f3815b4b376970577a0df2b14e8d30efb9db08b571433ad32cbaf845961c3f501c0e9ef6c
 EBUILD plasma-nm-5.11.5.ebuild 1789 BLAKE2B 7c5af92a13398f943f6277e1b87864a40fd5c2a5ebb1f7765a64309a38e006339c4c0e63192e18180ad1b98143df2ffb4b743c990438f99930406c61b1d362ed SHA512 d376eaf845a52b6e916f554a848dcc767774bb972fde518e10404eda1b269025e4d4108132a64b4dff9d2c7453b88dd47ad5280ac12baef52eb3cc63d89d7618
-EBUILD plasma-nm-5.12.0.ebuild 2046 BLAKE2B 24f4f016ab87efb360cc36d4c8380b809216845381b9f404b790af4d110a5432888d9012ec1ea1e078b70bf780519afbbc7119c9360bd62e01cf1504d2095f3d SHA512 59dcd4c4b8d39e250f7ef08719adc57a25b2592f806a55cdcdd0f17534510814079765dd97a13b0797986231e331131e01c6de23c59e3beef88b8f8fb7f428a1
+EBUILD plasma-nm-5.12.1.ebuild 2046 BLAKE2B 24f4f016ab87efb360cc36d4c8380b809216845381b9f404b790af4d110a5432888d9012ec1ea1e078b70bf780519afbbc7119c9360bd62e01cf1504d2095f3d SHA512 59dcd4c4b8d39e250f7ef08719adc57a25b2592f806a55cdcdd0f17534510814079765dd97a13b0797986231e331131e01c6de23c59e3beef88b8f8fb7f428a1
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.12.1.ebuild
index 3d76b41d85c4..3d76b41d85c4 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.12.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.12.1.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 65053030eed2..0ee96ae82bf7 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.11.5.tar.xz 90384 BLAKE2B 06974711a2b64892414906d0330ce1a5ca31cacc7ece0d71e8514ece78e7e838818a936197a2ad46f641a44ebd7c55d8cf99346ac9220b85135bf5f5dc7bd97e SHA512 f7debe7b422b6c5ec0833d22d1bb46bfac06c4fdcdc54ed2f00fc9cf22d5cee8e7fb29f2ec0845cf3eb829bb938b1afb1ebd4a72185208f056c3c63afb1ef7b3
-DIST plasma-pa-5.12.0.tar.xz 86092 BLAKE2B c81f1dfdfc69a79f4e06da88e08041e2c3701c7266a281b6b30d1ab32fe45763b23c23368632adaedd9a908b24a289cd05b9696d827602851a39de9f47ee53b3 SHA512 c2871bae1f36f8cd693a243ac2d847002c78d6e911561c02c93d061fb0b186d2ba3f00323a2720fd0b6420f4cbb052c6a566e8ec05494805f6381218b7e13350
+DIST plasma-pa-5.12.1.tar.xz 86100 BLAKE2B 357d81262deb580e1c92b1e73e9dc38d0ae054154224640205620022a4f79ae2c36fe2db69feaa0abe2b6e8c1a85165302a2924dada25bd34ac3ccfe3186e141 SHA512 b68f90e29ddfe39120d2f3aff614bdb33d829262b393abad1ef86f05af29b7561974435d1e2eb9416636c8e51128e96509497728a2a46b7be56f43c0a5eeb043
 EBUILD plasma-pa-5.11.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040
-EBUILD plasma-pa-5.12.0.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5
+EBUILD plasma-pa-5.12.1.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.1.ebuild
index aae43ea14cd3..aae43ea14cd3 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.12.0.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.12.1.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index a3eabb8354f7..60580d08c5a8 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.11.5.tar.xz 265048 BLAKE2B 3da4125bb0db4801462ce5907329dc95a4102dacb0d09e404dd0af85d7dfeae44d4be6b60de6828999769c631c1ad09a52359501d7e9454c18ea2d91757df367 SHA512 b7259e5d17f209edf3bf07a37fb7a2efd0be08a5d34ab78115c55f94c74862e076cf58446ce67327c8021800086d282587cbec0e7ab8634b12ed009de3c26090
-DIST plasma-sdk-5.12.0.tar.xz 250056 BLAKE2B bfc4c1009a86b6f11f035151dbd92bb2f94c502a916ef4e22e74737f5cbb05f56e0a3c15f533f2904f009d5edf07f076d401116ff49a5f5200e2d24ac839760d SHA512 5a80ed04c4cc0e99e3721705ecad9e8144ec45a0888b09a41caeada9a8d1b2d9e8daaff7cb77da9fb511c192bd06913c979793ad0dab38c1277eec480a5f7d7d
+DIST plasma-sdk-5.12.1.tar.xz 250664 BLAKE2B 2c35e348d223e0db21b9fe8391822c522471c1b9b050ddf89c8d3a591fbecc0ab40c1f04b10b1b28afb58aec384d8b26c12d6881e7e2055242ff3456431eddf0 SHA512 64768a53d37d9cc66de26f68e024944472d661f0604484c5c5684d770273fd1a07ed39ac6cf65b0f17ea0b8536c922c619cf8fd6c53cce4347c1106f9050e7a3
 EBUILD plasma-sdk-5.11.5.ebuild 969 BLAKE2B a4fc74c2bd385e5d6bf936276de015c1616ead4b35df629d19aa7051b69ccb12dcdd968dd8b0250cffd07987a0762d210999a64f235c233bd714ad64be63eabe SHA512 b942f87567b41693f6568bf9975a907af75b4601a5f1b2bb8c024975c4a4223a7ed2e1e1d870103357632369e9da4fa58f4fee2bb8838a7bfe552857b9ac54c1
-EBUILD plasma-sdk-5.12.0.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
+EBUILD plasma-sdk-5.12.1.ebuild 971 BLAKE2B 751a5ebc2e3cb9958f2929b04f3b141dfcc2a0202e40bc9a142abd51d10e4b7640f12a4576cfa51567ee8002cf2a501af02326f9369bfcc1b53ba5f7150cd65a SHA512 bd7f1c21926ec057dfa456a14bca1933ca046a4e9f6b5d0511197dbc6b45ae2961095bfa0de444d4a3ac8b41def52afbd04785aaeeda73eab76ce03ca841dbf1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.12.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.12.1.ebuild
index 47de95ae2130..47de95ae2130 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.12.0.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.12.1.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index a831303a2226..d87215a92541 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.11.5.tar.xz 97556 BLAKE2B b6a1b8bb4660c8e00ea0dcd098eead4171f44f747f5fd4ce414b35a00e36c9433ea9540b620c713d613e903deb3ef008add1549e163bc4644f0c330392362d17 SHA512 7505afee50f1f0a5340d9a2936ac9534326acf5abe4cf4009efa21584e3fcee54b58311ab850b94e601df85dd446d6ccfffdb18d2839536c6730d3bf7ef96541
-DIST plasma-vault-5.12.0.tar.xz 102160 BLAKE2B 267c5182095012850867f17989211b9eb3ef30671f09951446d2f008081a2083db8c1b7fcd55dd1c1309e198955c2f1220c81f2cf1ec54cdccf6392c8e460447 SHA512 b03b19d892232a0e7eaa4d2115bde5a5351c1f181e7808188d36bdb8935d5d8c78607ed4d9d45180389039cff127919de6595a9f01fc8eae4d299becb3ce987b
+DIST plasma-vault-5.12.1.tar.xz 102104 BLAKE2B e83d89c0181fe1524505bb1d2b2c2e03a3606e4ed5ff0fcc8ccf90537ee8b0156e61f27959825c80e433cd9730500eb4002dcfe7fe3e49173075ba9f1b9c5e7f SHA512 300c6eea0f95112aa14ac4a27eaf26941e4b3a12a1681da3120bf235dc973003a0fffc3916979616b6c71bf3481f6fa855ce15e72b349fac4e9e3399d5843b63
 EBUILD plasma-vault-5.11.5.ebuild 850 BLAKE2B f3b794fe4dc8a1afc6aef448a77084975fd146d1c91493ff4f12881a96ae31b7ac9ff255e92220f68a8be195569a726524c6cf64a0a76f8976af7c76db70c10c SHA512 a4acffbcc8b9238e575f1eb610460c92a92734f5d845863576b6d3369dffe34350edb09e912fbee47d4a9431836cb562241fff41cc8f59280677a3658517babd
-EBUILD plasma-vault-5.12.0.ebuild 852 BLAKE2B 14c5c09baf96f55fa38aea281b16b33fce761e6a221936725e7fe2e6a954effefec0a4bbb686e8d61f3a8939bac3415f6cdf71990591c5a23d82cc442ac20cd4 SHA512 2e03bfe15fbd4f9b5b3d54c2afb64ab402555166235337f3ffb87b308852bff55040a2214245ec041958fe3c214438252374b3d493a8f6440772727c8bd63503
+EBUILD plasma-vault-5.12.1.ebuild 852 BLAKE2B 14c5c09baf96f55fa38aea281b16b33fce761e6a221936725e7fe2e6a954effefec0a4bbb686e8d61f3a8939bac3415f6cdf71990591c5a23d82cc442ac20cd4 SHA512 2e03bfe15fbd4f9b5b3d54c2afb64ab402555166235337f3ffb87b308852bff55040a2214245ec041958fe3c214438252374b3d493a8f6440772727c8bd63503
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.12.0.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.12.1.ebuild
index 307ac700cfda..307ac700cfda 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.12.0.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.12.1.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 876d73968be8..6c2b765d37b1 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.11.5.tar.xz 45920036 BLAKE2B 5e6898a9ec2444f7b9c8a5a637c898eaf8dd9c7e20428dea3de72d7405b585618f7f868ec9e3e6ab4c17ae60d7bea0696a8918b4f4a65b4a494ed0371809130f SHA512 a4cc1776099be2822073a3a4252a02ab1e063a9308be275002f8376ab0c621f2aba1024d085b93135aafde3c34191f40730567b2125e49cfd22162799ded8057
-DIST plasma-workspace-wallpapers-5.12.0.tar.xz 45912836 BLAKE2B 9439594d49e534368e0116fd5b9c6fc3259c450b73179429c429745b36630cf62888dec527eb53a001bde3656393ed11e317bcd397d76c5de3d365f9c8163437 SHA512 efe4f789702c7c3ab6601cebe37ce1bc33b54da0d2b72c4cd1ee2bd772068725b1e20db9817738df1e36eb2f8863bd507e0a0fe12da5f8b173a909126a24862b
+DIST plasma-workspace-wallpapers-5.12.1.tar.xz 45916584 BLAKE2B f30729c7bec4b4c1ceec7a07cc598cdd20d6a7a466fc657fb79c90854105fb317243c1e6c8d2933801785192f6b4770c8f915db2eba36d18f6e06453ab9209b0 SHA512 cdd4a6d7ba211e7a0fa297f8ac8d33c5bf58b192543b1722f907112d6a3ea56b738800f2ebd747956777cf2e7a505f341af5b9f76e51477e3a58130456f4b5b8
 EBUILD plasma-workspace-wallpapers-5.11.5.ebuild 388 BLAKE2B b4bf3798c73f248bfc0c401da88c958a447e2ac61cb7be3eee9660f39e758388542254ad1863c3b98aa409512c6f5b130607ecdf167e81cde36dd32acde61aa5 SHA512 da0ad25926fbb78cae9f25c1d9c0e5601e613aad594d4bbb06be11e24700b599843842515d3204a05f5d688b9e2b863f4dcda4a564136c7f7957cb3e6f71c501
-EBUILD plasma-workspace-wallpapers-5.12.0.ebuild 390 BLAKE2B ea1a77e379d275ef3d2a816824ccfd9016e9d61441ac6db97b7c6fcb63a0f5b6c6f92ac905894a23755894313bf2d466ed0724d43283252f9f5ff87e338509f4 SHA512 1f50c54cca6f1637339ce43498b657a8a4422b7b60e42c557ae3bfaa18dac8212eaf379295e6f3af5a5f72b9cb073a0ff19aa7b8b6d722c3af1579aab333f794
+EBUILD plasma-workspace-wallpapers-5.12.1.ebuild 390 BLAKE2B ea1a77e379d275ef3d2a816824ccfd9016e9d61441ac6db97b7c6fcb63a0f5b6c6f92ac905894a23755894313bf2d466ed0724d43283252f9f5ff87e338509f4 SHA512 1f50c54cca6f1637339ce43498b657a8a4422b7b60e42c557ae3bfaa18dac8212eaf379295e6f3af5a5f72b9cb073a0ff19aa7b8b6d722c3af1579aab333f794
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.1.ebuild
index 96669f76d47f..96669f76d47f 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.0.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.12.1.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b82e32075df0..2c2cf80d2b16 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,8 +6,7 @@ AUX plasma-workspace-5.11.5-CVE-2018-6790.patch 17967 BLAKE2B e9c65a902dc68f579f
 AUX plasma-workspace-5.11.5-CVE-2018-6791.patch 1087 BLAKE2B d388f92343bca64a810da32a12ff2572e6c2100b1ef86107f43b4e7f8e29a36764c272ba5814228c45ac671b31e35d67135e8e5d4e8df4c92037985d0f800a29 SHA512 dcdc58fe65f72325c851ff361cf47f5521f0b58e8ba2fe0715b8dc0e214b7cbff2c2e653cd06189e394c0bcdf980395942d06dbc281eb8131e228739fbdf3777
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
 DIST plasma-workspace-5.11.5.tar.xz 6494360 BLAKE2B de4e3608382ab827f68d61b5095d05168a03fe8da65b219ec5b53e28506e21d5105fce0874d840eb23be1253f3bd3fb3e4ee7d0e3c5e15c895fb4b9f133c062d SHA512 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
-DIST plasma-workspace-5.12.0.tar.xz 4571240 BLAKE2B 817d227cee4e1c4a47fd0c948534d24dec77eb71e9f09ec8a9b226264678d86682234431102133e02342cf61627f981d24289fa9b210da20ff475b2775edcb53 SHA512 9bcdca74cbcff539f4431b8f888143ff278ed79c5b24033c0f81124a4e2eb5538eec959d5ad9e52aa553f2803634ff189957358d83d78a3d76122699a8add6ce
-EBUILD plasma-workspace-5.11.5-r1.ebuild 4832 BLAKE2B 3b7b7acede03964572ec1e52db23cc0a89adcaeb4e4b6396fe79c69b58eed6a8a752109959a9f1a90f9e52ed4525310586051eb66867f5fcef1194226238a115 SHA512 9a241cf2ac52bc98c9a6256aad76521dfacd81b1ba24cd78dd715754994e1ef745dd9ca82e267f7ea53e8c00c0c80222ee2d33de3ae3db99fc7aa366aca963ee
-EBUILD plasma-workspace-5.11.5.ebuild 4711 BLAKE2B 4a7988bcc0f5db27a0d15f3729ad3bc35f802ff9e12446b3451987348c3e8ffbcae8716e44327ef780d7a1e7f82e7b899a1ca14d3b34d6391916c1a9f7dadef4 SHA512 77e5c787120550e45e9d716885b6ca575551918b3b3b7769386e22a2f3e0567c0b2fa9e50a1cf8ca3bc4744b6a292eef3489ee1d8e03c1aa7c972154056b5833
-EBUILD plasma-workspace-5.12.0.ebuild 4752 BLAKE2B 68aaf50c264b02fc83142956e631f5c4c84f2fdbd11d985d959bc2b3293c500c097f1a748b5581091fdfe0456962462219a8a43629b00ff28a94464850166168 SHA512 57f58407321dc8e9bfd21dcd4a3d76f4c182dc61f5377a9ab3f862410632c72a179a71713181a0bb80d51cc0a44431256bcf21f08f7442d7435a06b9169ea055
+DIST plasma-workspace-5.12.1.tar.xz 4572880 BLAKE2B a39848912551f7e7464ddb9ec4aeb5d76c2cb7c188395f3f53674140700e8f959657fc2b4ef6d4de4941d53bebf678d5506d6f70be76c301703ab3fae0cd1b72 SHA512 b7ad1fc1beaab27061b401369a000fc49d27e7b95235f748cf3b4fff6f78e226492457580d6411ebaa94d905af600312253569e7b2ac28f5d1c4bb1c0b148a74
+EBUILD plasma-workspace-5.11.5-r1.ebuild 4830 BLAKE2B c55b1354329cc9b2f7904d1674886085e3c352ede25fd4b9d66fce858bf62c0b285df59ceaac4db68736228389fa3ff4d797f5b5a7e43ae5378b66e5cbd4124b SHA512 2ecfe5362eba94ada58fcb747ec4d497a8f3a56a8bf5a03d06b4bae0d0b23d9678882b2ad3b4e6914f73f75e6794e369eb4d0bb57116572061ef64715f1f18ca
+EBUILD plasma-workspace-5.12.1.ebuild 4716 BLAKE2B ef1e4b20cfe702aad3818205ea79398f770734ed979842e0f2654dfe3c3ea0ae339a3e454962b943272083dc4c25f35c8bfbcee10bc7ca174272671c77699789 SHA512 b1dec91c549f8e048ce988347989a55b9548e35ba863ca5368e7740acd808b90a88ae737fefb4e7c7abe315053cfe0a114bbc406c7a01a1f553b40f30935ddaa
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
index 0f048e46823a..59d245fc8552 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5.ebuild
deleted file mode 100644
index b03658be8cf9..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_kdeapps_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
deleted file mode 100644
index dcc548329a32..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( || ( $(add_frameworks_dep kholidays) $(add_kdeapps_dep kholidays) ) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!dev-libs/xembed-sni-proxy
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	echo
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.1.ebuild
new file mode 100644
index 000000000000..0fbd6e358b41
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kjsembed)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( $(add_frameworks_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( $(add_frameworks_dep prison) )
+	qalculate? ( sci-libs/libqalculate:= )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(add_plasma_dep plasma-integration)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtpaths)
+	$(add_qt_dep qtquickcontrols 'widgets')
+	app-text/iso-codes
+	x11-apps/mkfontdir
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xset
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!dev-libs/xembed-sni-proxy
+	!kde-plasma/freespacenotifier:4
+	!kde-plasma/libtaskmanager:4
+	!kde-plasma/kcminit:4
+	!kde-plasma/kdebase-startkde:4
+	!kde-plasma/klipper:4
+	!kde-plasma/krunner:4
+	!kde-plasma/ksmserver:4
+	!kde-plasma/ksplash:4
+	!kde-plasma/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	x11-proto/xproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/10-agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+	echo
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index a1554c77f1a5..32f660590e4b 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.11.5.tar.xz 39368 BLAKE2B da61b6e32c1a73a4bd5e138c4e5720feb1648091ccf9e28583b40f30ccad20ff6dd8096996c93224accd151d5f9f4298756ff2bec37c73176f2e3159ed3f7627 SHA512 c30ca55c8647b3c32f1266519a7b005f9d2b2eb0b7064c12ea1780b85ff43662dc6be8ed46e2730be84eec96d809b7cf01385a2d38c52769f469bb355c983ed2
-DIST plymouth-kcm-5.12.0.tar.xz 38532 BLAKE2B 40486d613742cddff440e602b0945674c233586333afe5694f001d2aa675eed688b2541fb948606b283a1f6813d83adbf52721f29f0f2986ed1bceefb7d2b4ac SHA512 07b3028dfac9385a86cf2594dff105c2786fd8dae2b85bb234479a49b0811cf260c5d435ac60ef28b4bcf9bec52666f71ce09fc80f42f94fe5daece052a7a4bc
+DIST plymouth-kcm-5.12.1.tar.xz 38456 BLAKE2B e561b0269146bb3edb238b12d2e5b0f31181532c1ef758402657b3338348d783c50a2d11756e3452244eb574c5b3f1f0b557d9d59eb5d95f80f3bc6518e1e948 SHA512 0d00568e4c007b5e2e29fd71269800e90fcabe3fa28bf3167e72f16ce4ababf32539bce2240b4f9c6bac3a6836bf7a963b1f1c0a82f27925ccfca093a15acb7f
 EBUILD plymouth-kcm-5.11.5.ebuild 796 BLAKE2B 589a5ec6877dc910559b491081dda3c8a2fed924f60b775c248b1e4f6c354ee18790d5bcbd0e2ec30651d567574d8ddb21bbee870efba1d33a53df8f88e7dcc9 SHA512 106d4743791473dc7ef56d39a4a9028e693d83a51018da96d9a8f6846a2929ede3f5403254635e48d252d387fdaa8b62f264ebb4bf97b29bf374738c28567a1e
-EBUILD plymouth-kcm-5.12.0.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
+EBUILD plymouth-kcm-5.12.1.ebuild 798 BLAKE2B 57bda54427164cafa92240014189f901650e01abf7ecc073f35af00b88fb1c6233192400e57e47bc293ed36983c5a541cdea5cb25b68521e4a0aa3b981935bd9 SHA512 8d58ab3c4dac137e9cf64326a0ad4481bf5f9e03c27b13d9cbe0cdff24f1b37fdf6363f70ece1f058c585b894acdeeedc8a9457611d795d870fd40435bcde10f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.0.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.1.ebuild
index b22a94e9b199..b22a94e9b199 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.0.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.12.1.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 33403a9bd2e9..da97829215f1 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.11.5.tar.xz 44320 BLAKE2B c1e0add72af02cb34f61a07038580f9b1de5e2b45c0a47f01eaea1cb0a96ddfb071fd56f293cb59d66620ecd3dcb8868f0c4b63a40ed46de4326f78b8314d37b SHA512 63a6696fa5961c4757b9ee13db8d9de67d0ff8c15f72448c05f2728fc57f19717adfe09aba38d7990bbaf3bd67a3674300397fd2f988f0d27b5e13b22902966f
-DIST polkit-kde-agent-1-5.12.0.tar.xz 41508 BLAKE2B 9fa6d1bff07ca4f19a9f6a909db3ca79f12e32a1441db711fb0097015c5e496cdc2b8fb55ff659c7ba7e6bdd74a6cdcd4edc69d79e0ee5fbaf52577bc1726132 SHA512 dad4648b5c8f5bf646934fef462a6e75d14bed0eb2a69e4081a2d50e890848f7be593e4057c9f4ec06ec53fbcbb3d7036da04a842880643c515dc00bbc31d929
+DIST polkit-kde-agent-1-5.12.1.tar.xz 41580 BLAKE2B 3a85499b53e2b1c6c43c3781f0041e716cadb4df4e5f4969e38ce44a5fb4dc82ad64c9b5025334508b001dcd36bf65cb486588bfcc00a6ee53c47edbe57dbfaf SHA512 dc9485d581996dc511678abbc93b2b7bfb97be21f59f824bb4015f503508e1cb265cdf84529dbe9559986c08987b560f0fb500c1a9ea7e16986310a1b00c1808
 EBUILD polkit-kde-agent-5.11.5.ebuild 758 BLAKE2B f0bee542d1b9c877fb506e8cc353527c43f0e477d4c8c359adf1370f598486aceb605a133f365f87f695673ceb7b2b91a9441726ead71c1cc5a7f5144c41d776 SHA512 574c019025905f88e7120eab246bf9f0b28cdf7df2b272768872c0d657e3134896cde9ee6177a1c3061a6454a0068f490dcb39bf3bc263de3df38a16b1f4c215
-EBUILD polkit-kde-agent-5.12.0.ebuild 760 BLAKE2B 3fa5ef3343b19db35725e2c728bf9cad76be58425842517655655d8d54d6e023b9022765a82e64130656c41a42ce078bfcbf6eb4bf65c8b8e170dc532a5e3205 SHA512 4cb74f332228a5a49298018d392fc866bd44ba8b4e1d2fd1a6e6e9d95c82586227c7650f3b3dbfddfe7e400e82cbdab962aa7da6f894e3a6ef9c7cdf2c74e870
+EBUILD polkit-kde-agent-5.12.1.ebuild 760 BLAKE2B 3fa5ef3343b19db35725e2c728bf9cad76be58425842517655655d8d54d6e023b9022765a82e64130656c41a42ce078bfcbf6eb4bf65c8b8e170dc532a5e3205 SHA512 4cb74f332228a5a49298018d392fc866bd44ba8b4e1d2fd1a6e6e9d95c82586227c7650f3b3dbfddfe7e400e82cbdab962aa7da6f894e3a6ef9c7cdf2c74e870
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.1.ebuild
index 99a206395a27..99a206395a27 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.0.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.12.1.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 65f9ab23a449..098247e2a9c8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -4,7 +4,7 @@ AUX 30-org.freedesktop.consolekit.system.restart-multiple-users.pkla 325 BLAKE2B
 AUX 40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla 367 BLAKE2B a43d81771fe1fee025aa631a4f026d6ef9bf9d26fa8b377e5f658d85c85d1182e3e9f5ddeb6f1bf8aa0ddf22657b7a0afe0ffbd60cb447925eb411c9603da499 SHA512 c359ed4a577f02810b56fd6032cce1b59df720598f7ea61e68d74dae2929a2ac81b1db3ffa57e9aa29c594639f3ea6875f2f7cdef214e7f61fd37c153c7b1444
 AUX 50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla 308 BLAKE2B 96be3dcfd39eb58a71c0755e81c33bb8a9fdc5011b8270918cb6dbee59e6cefee98677e63ad5cded12bf2389a3b49259eaa5b0d7f390190084ef6e11ad7408e0 SHA512 f3051bdb62ca0c0e63f35f95cfbf6c8afcc9910fb61be8d78c7769a4e01f8d4a8b5c96a7ffa2b5f8be200a5f23f08ec4201a2d8ffc6230e9468807d7b79d85fe
 DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3
-DIST powerdevil-5.12.0.tar.xz 379900 BLAKE2B 86b361e224f9975aa4119ad536a2a80b2da38eae38df0538ce1c10876d4d0824321a86bdc2018b16fdd9b11b6c85cc5aa2c097b0185a1d7e1efed52f474ae628 SHA512 16a6cbb5eae7109ee0980f530747777f3ba478726c78659c576a30c4223e833522e358eefaa9683902caf9665faaeab60391135332e05acd97cd69f7c7ad8107
+DIST powerdevil-5.12.1.tar.xz 379420 BLAKE2B 79735880a5fa6a23d61a6b661118da3533c9725f50bf10784f3903fdd1dba61cea502ab7f72235a12409be3c3ec1951de7e00337d2a07fcc5b266f035056d7b4 SHA512 ef5151b5efa6662aa753d242148f9b5e9ac18bce87f1d1ac63620e4303075c6c9218b1a1687786c805992f425f559487d422fb20838cb76d5adb606c179df77a
 EBUILD powerdevil-5.11.5.ebuild 2252 BLAKE2B d4f9db9d39cbed2225803934c83bb9449187002ed76aff2770990a5f583c8ec7cb184a0db0c4f68e9b17637dfb9dfdfc4f83614705825e9e7341a38cb9a47c1a SHA512 d3405de703cf20d706014e9207157f029a10412cf8763db86840923b68966e3e8ff20ec5618dbbc4d022b5d8eb70eb4dedb9ae785811871d84054ac6014d1672
-EBUILD powerdevil-5.12.0.ebuild 2338 BLAKE2B afa6783b0a2cdd6cf908ac63d8ffae25c5a43074af6ec1a1cd6020469efd071660575fe308f5627af2e1b2a3aee257e0a5c9ba0e7b2046ab7969fcc4f133b353 SHA512 639ca301d9a4dc62a721956897e2bd417b11a0e620cdb6261e39c9b38056eb2821af78fd797d980e082cc22f128f73227b3dbde096ad489cce0944a5ff7d4995
+EBUILD powerdevil-5.12.1.ebuild 2338 BLAKE2B afa6783b0a2cdd6cf908ac63d8ffae25c5a43074af6ec1a1cd6020469efd071660575fe308f5627af2e1b2a3aee257e0a5c9ba0e7b2046ab7969fcc4f133b353 SHA512 639ca301d9a4dc62a721956897e2bd417b11a0e620cdb6261e39c9b38056eb2821af78fd797d980e082cc22f128f73227b3dbde096ad489cce0944a5ff7d4995
 MISC metadata.xml 642 BLAKE2B 51a6b9a3c4cd0040241ac6be1b9669d7b7b77bda831ddec18380fb4f2b1af4072d0ede8281d3b05da41a6744db95b588dde3efccd4b339e289aee053645231c1 SHA512 870a09abe650b373cd7a4050308fbcc83da772acaf615c36232701fe53835f8bf9d4d092259da42417f97387ed2b37f19d4f4fffbec31087dfa7188bb8bb7056
diff --git a/kde-plasma/powerdevil/powerdevil-5.12.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.12.1.ebuild
index 16f648877dad..16f648877dad 100644
--- a/kde-plasma/powerdevil/powerdevil-5.12.0.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.12.1.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 206923602a98..44828d5f40e3 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.11.5.tar.xz 62788 BLAKE2B 2329b2891a4d3334b06b1083b594bb04abaa38fb83dcc2ce0971d717c5f169043743e8ac5cbf8fcf57f42d300aef521669d30f2b4989d94540d43bd5388fc53f SHA512 7ea9ba1ee71e28f7afc7eedd40030b50fd22ecfc21447972c8f154ad1289a80f25dc5bdd00c01e8ac70b968d720734538f9172f92648b205614bc70ee556408c
-DIST sddm-kcm-5.12.0.tar.xz 59752 BLAKE2B 2b21495b244120d64992d29418e551b92a30336c36979468bc5025de9e9c1aad3e564f38a30bd4033bb794ecdcb214c2ecb3de215baf36fc26cf897b89574278 SHA512 da48138523bb63fae1971126ede5c0c24cfd222b83ae1ea391e17fc23035914a16d13756cc3a55966917748d5be50e6f874e4945a37b54daabc4344a27ec2537
+DIST sddm-kcm-5.12.1.tar.xz 59764 BLAKE2B 51e4f8cadcbd7d9e2fded3fef49429096098c7e6f938e29018751fc1128372e9613bbb0466c58bd4163a18da4598b766e36403ac01c380461a6edfafd207a818 SHA512 868f066863b336137cf0d2f0d2ea1d04d86248cd76e719339f0e8fa21113fa78f7c5dd0867682d36a1e4af20d8540ff0615bf9521a2864c65dc4630a87a9729b
 EBUILD sddm-kcm-5.11.5.ebuild 903 BLAKE2B 4d6baf95830ff57b93ab0850cbf15c657ca4636f282dfbbda5b8c6865beccea8bde071100b483ffa7380b63c79be02c77fa859eed76b88298855fc7944db90a8 SHA512 154faf670b577a4af410a3c4dbc5efee5e6cc5ebb02d2dd77b140434fb0d01f4b0fb9440335ea107ca1f46f3ebccec6d9c0622c5f371e0a5bbf7bb97ad1d395b
-EBUILD sddm-kcm-5.12.0.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
+EBUILD sddm-kcm-5.12.1.ebuild 905 BLAKE2B fc09dea6d864f6058e4d1f3716816141ecb430e419856e8bb4b35a5c77518157aa41988f9f504aa3e45db03382c157aae443b249567dcfd7bb669b0970a717b2 SHA512 68e1f97fa3f3b80f70d1d514ed4cde4461c10b9a2bc5146506cb9177ddcda25fd048e1a36d16466706ba66fbdc857dc185f9342a3c497791d1f657f3384b120f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.12.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.12.1.ebuild
index f2bab93c9538..f2bab93c9538 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.12.0.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.12.1.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 58b4c12141e2..61f44ad16ec9 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.11.5.tar.xz 180592 BLAKE2B 49c79d63f1da81e5699a929de9ea66a7955d57b53516eb289bc70e1b907f6d5f4629d01f3507e722b484d7363108a143e3a64073b043e9c82a74383f07b135aa SHA512 d9cfe14d5dc023e203b43bad20d9fcf8449f4f945600c9b9ed4a3367cb5384b88e77e8f206448a4915cf88734ab6f03dbab55f5586a17d1984e46947e684150d
-DIST systemsettings-5.12.0.tar.xz 171800 BLAKE2B 223e6fa70ebf6751b74817bc55dc095e9225dea642b4abc2733c1562007701cd345f7fcd5ed786e38b46b36fedfa991c5394ea8ef36ceaea575537b95b7a666b SHA512 23216bd6c78b8091b5ef6e42ece08d72e1813d2b4ff94125bf14da4368e9434833ba9b7c1d71473f6bf6312a3c22a6f48e83aa576e620048c7f3784bdf659bfb
+DIST systemsettings-5.12.1.tar.xz 171708 BLAKE2B c041f55824cb915f7227882ea634a8318bcc6e4e5133c43cdc88a63a8d58ed274b7c8ba179f948e7febcb6c3a580bff80106da88660eeb3a245ce4e8debcc120 SHA512 e53a025139e1e00c57632f9d0742bac6b13ad189726c89996d4f890d21eb04d7e6b46aaee5f0e97ea1989b89ebb2a35720e8173d79522631047a3bca1de5a197
 EBUILD systemsettings-5.11.5.ebuild 1288 BLAKE2B e56737a2453b4e2c843548f0947c6ad08725370a46d998ddd693d2dd3f3685da8e67d7a2adee338838a830619ed3a1072eddb2bacfc0a2f1a224d53f8c8bd64c SHA512 615bfc896f684fd6977bc495b6a92d386d6191e0a21dfc8df4745a311c4b7e24b776b7ea43e14ad0799836a76b529d9462b113cec36cbedf63560852e91c23e1
-EBUILD systemsettings-5.12.0.ebuild 1320 BLAKE2B c27960f4875d3eb0d3853313171fb17f2711fa5a9de21e4872f1a6b7868542efa3aadcee68809b4ddb00fefbb3fc4fdce698c1165dcaee7af2301da9e0488136 SHA512 f50342ab1da34e8a9f67c7cb415bd94912cd6bdbf19aa9bd4a62df34b6feed73bb3c43ecd453f1e0da5cdb7cde64a5c7afe3902ea7b9b10ff7d4bd69daa12a0c
+EBUILD systemsettings-5.12.1.ebuild 1320 BLAKE2B c27960f4875d3eb0d3853313171fb17f2711fa5a9de21e4872f1a6b7868542efa3aadcee68809b4ddb00fefbb3fc4fdce698c1165dcaee7af2301da9e0488136 SHA512 f50342ab1da34e8a9f67c7cb415bd94912cd6bdbf19aa9bd4a62df34b6feed73bb3c43ecd453f1e0da5cdb7cde64a5c7afe3902ea7b9b10ff7d4bd69daa12a0c
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.12.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.12.1.ebuild
index d1c4f56be8df..d1c4f56be8df 100644
--- a/kde-plasma/systemsettings/systemsettings-5.12.0.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.12.1.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index d227ab179642..2409aaa780e0 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.11.5.tar.xz 548208 BLAKE2B 92bd23929537bf3a5d6bfc73d04c0aec40029188acfce0859ecf0feb476695c3bcc8ff3b1dd71eed4b7592482e18e8661f54d6f8591da5cd63d9d472d37486c3 SHA512 9c4ae28282bc1ccfc1cc0c817fc89c80185e0e9d756186d920d91d177492de1bf3420cab93e823658614c9e637c8cfeadfde8c093f50097331371efea763cdc6
-DIST user-manager-5.12.0.tar.xz 545260 BLAKE2B 7b1722dd93a1d727fb60c910aac6bf864d6e77a06ee38b8f75828d360499e91dc118df9e59eb9d5fb76cb77f9349c0e05ee92080bd14f5cda1a7bf3f96497ac2 SHA512 b60aed60491d4a435f8183d8e4270ee03748e2a21f9308085079736b710976610bdb97882cb690a2a15b21047bc87ebda5cd196d26f4bec51eedf763e7761ed2
+DIST user-manager-5.12.1.tar.xz 544900 BLAKE2B 3621723f0ba7aa84c27e1ee91f515faaa5b6ccc0b657b09f3f0371fe495df28988dcac2a1e8526fba5f1da949280dc83ce662878c33d1033a5142c6f7a75f5c5 SHA512 59825180f66d88204d2f573c87818ddc85583a588732377b22988afcb292805aaafe5c544d77b84ee30a533145a1843651f26c233d552de6d560256fc8ed5e8d
 EBUILD user-manager-5.11.5.ebuild 668 BLAKE2B 65c027257ba173b05b2ca0161f372c1a478fd84a7301bcef018be3ed2a2d12051920469e94132a6927c6d2217e007c4419e04de61902d66a402cddbcaa884eed SHA512 964458719bf604ca0c37e411a913addfca197bff4a9ef3163ad680cdd308750a349ecfe3c2df4ff1088e2cdbaf9546be31942d1590f8bdc4f3deda991439baa4
-EBUILD user-manager-5.12.0.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
+EBUILD user-manager-5.12.1.ebuild 670 BLAKE2B 1aafa076398b02922fadbe55f44967398971d0e868f48cb5eae1ccc8ef92a9d4297ea5ad989989cf950acb546af80d35f4d44d3172f88ce1f276009d3402ebf0 SHA512 51ec1c8eb1ec9c686a9be09066524500813f8794c5fe61c8bb95f32e53f69d9426f328b7ccde22e7027fe3ea3591604d2b10b87752560293085aee08bb78ecd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.12.0.ebuild b/kde-plasma/user-manager/user-manager-5.12.1.ebuild
index 55c31690044b..55c31690044b 100644
--- a/kde-plasma/user-manager/user-manager-5.12.0.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.12.1.ebuild
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 0fa91963ffae..48d01a9b35c3 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxde-meta/Manifest b/lxde-base/lxde-meta/Manifest
index dfedf5f733af..98eeedd50c08 100644
--- a/lxde-base/lxde-meta/Manifest
+++ b/lxde-base/lxde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD lxde-meta-0.5.5-r4.ebuild 1020 BLAKE2B c93833608026934e75c46177f21eec930a4cd3f021a7ccedde452885e956f8e3eab16da3613d4152fa9b08ccfe3f6369a850945712ffe708c00512545b757fbb SHA512 db96516b946ac25ff9959e1704333be2439c96309a88218aef463dc70079fb817a9766d1692eb52e5082b621853606567cfa146813f0fce19e53e900a1ddd2d6
-EBUILD lxde-meta-0.5.5-r5.ebuild 956 BLAKE2B 03bc5e86bda4a92e917c476241bef258ea5b9812cb096bb6d16aa1f438e31465d30fba7e48bd5befa4233d9c641b0af05b4e8559baa8d51bcb9ee33c5068c5fe SHA512 76dd5b54f1644a21b84c39d5f246316b119a34ab9068de5bbecadb91c0045190d556746229a40ba0507d2f4012c27e77c3ef6978fde67d8e6cd4b20cab16d4a1
+EBUILD lxde-meta-0.5.5-r5.ebuild 955 BLAKE2B e9a7a731dca45a8f3483589f816034795102cc6915fd9305974088f78754277803df6e1cf5888d2b4517caba80f63da53124a68405abee7d7d5d804125ed0975 SHA512 78a0b6d14d92894aee57aeb69703485ba5dff45dec979c7ef994bb5ce7b5c21c7c7d2e6b1c9283bf962570c46e015214303b9075df1d3636f6cbdb2ba405a7ac
 MISC metadata.xml 257 BLAKE2B efad62f245bde8ac51046146d034662f80c0d53ba081e1b308572facf6104e001af8d874e5429c2ad7f2c587545091f286e607fb53e353ee6eddacf01846d9ce SHA512 f25b418b4204c0b1b8c3a08ae8cad894c8352b5f49ca653ec9fb028eb5e0cd1f3a8ce26ca5acce609085b8fd73e49586d8c34ff5f0808ff9cb9688c8aafd8c69
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
index bdc11767c24d..c1129312269c 100644
--- a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ HOMEPAGE="http://lxde.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=lxde-base/menu-cache-0.3.3
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 81d11fe7f2d8..c85c1c845d63 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 6b378495d041..cc8158d41d1c 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,7 @@
 DIST afew-1.1.0.tar.gz 31119 BLAKE2B f5e66f000e8b06154aef8b2732c3d9f9d26befd5b606c78e75c239290ff50041987682a3d1a13abf611118a6153cbd7eec599f266783d41b7c1fca391c4ceacd SHA512 4f3c7234b15184b03264763cd271503cc8e49d9698169744718f17d6c4af9674bb50e592b23875991f9b1671b40dbea960a0e6153fa731aee92d4d1bd5c4548f
 DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
+DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
 EBUILD afew-1.1.0.ebuild 832 BLAKE2B 563ce06a8e842a9d545bb78a9ffb8f5a7b34c413512e5eb3d441ceea85920a396cc92958199bf1c17b2a98419ca250a4b5faf5d76152aec94762782a7297313a SHA512 dbf7954a989a1d3f11043bc781b69ead2b4a94e20d8d8e662cd130973dc247b0cb943f595ddca1e25272e35f4668bda1a37621b2a5df6c903aeae1958e7d2159
 EBUILD afew-1.2.0.ebuild 832 BLAKE2B 563ce06a8e842a9d545bb78a9ffb8f5a7b34c413512e5eb3d441ceea85920a396cc92958199bf1c17b2a98419ca250a4b5faf5d76152aec94762782a7297313a SHA512 dbf7954a989a1d3f11043bc781b69ead2b4a94e20d8d8e662cd130973dc247b0cb943f595ddca1e25272e35f4668bda1a37621b2a5df6c903aeae1958e7d2159
+EBUILD afew-1.3.0.ebuild 871 BLAKE2B f550906d5dbde6a6b775e2962b6db767a1fa6b57f612280b6394ee4c106dab5d874bcb7a80c8e6141b82d0dd51633eac528d1f3f167b5754014ebeb802f06cf0 SHA512 0ca720e1d2e0379b7578b26d771a6f408db1a7c53064be994c8bc3848181fa8c1ca179d00bae8a3d37bb365b88419344c4da0c1fdd5c126649c1d3256307d5fd
 MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7
diff --git a/mail-filter/afew/afew-1.3.0.ebuild b/mail-filter/afew/afew-1.3.0.ebuild
new file mode 100644
index 000000000000..8bbdbf2fe275
--- /dev/null
+++ b/mail-filter/afew/afew-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Initial tagging script for Notmuch"
+HOMEPAGE="https://github.com/afewmail/afew"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/dkimpy[${PYTHON_USEDEP}]
+	net-mail/notmuch[python,${PYTHON_USEDEP}]"
+
+DOCS=( "README.rst" )
+
+src_prepare() {
+	sed -r \
+		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
+		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc afew/defaults/afew.config
+}
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 15d0eb30d60a..0608f16aa399 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 147e5526774f..5356f0804a20 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -5,7 +5,6 @@ AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c
 DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B 3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14 SHA512 c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
 DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B 9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae SHA512 f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
 DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B 0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c SHA512 606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
-DIST mate-applets-1.18.1.tar.xz 7158716 BLAKE2B 9f3698a61cfdcabbe5734d4f1f2c57a4ee11e4072e5bb87fe8f44e0dc6bdf7bb99e7c455ca221c573f0cef5557d4e89a53b7679915f635aa6ab6d257ca478bd6 SHA512 3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036
 DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
 EBUILD mate-applets-1.12.1-r4.ebuild 2264 BLAKE2B dec3daf4cb9c1d53b9a317457e4e40eced00956679fec63a9093efc6092b147c170b839208a70fccf62e016036201deb5fa99ec40304d01d03daf5571d01dcb4 SHA512 81b027473726418d372e07896dbfce908e5224c59dd044fcf2fd630c5b799ca02015270ba62751652c7e4deead7686432ddb6f625ae76b73056a78f1bfe6bf37
 EBUILD mate-applets-1.12.1-r5.ebuild 2302 BLAKE2B a8ae9a7e19e6521f99ed9f7c38fb7c9d26899460013e41182c29f862e6b69c754bf548241333dd98ddfc00c33b77e0e2249bc69c5882878b9723f43c71962464 SHA512 2bf780ce08385d2ad2f4266d3f05363bc10289627a4c79623813017633e2da41d6190a754aa11579245727c515ebbc7bd53eacf1022ee6b82c4daffa1c587d93
@@ -13,6 +12,5 @@ EBUILD mate-applets-1.14.1-r1.ebuild 2453 BLAKE2B 879d76df7c9a12e7a2eb8ea3878ce3
 EBUILD mate-applets-1.14.1-r2.ebuild 2410 BLAKE2B 862befae14e867cbf2cbe59e3cf2fa5961da8e54863dd4bbb701e984ffd5fc605209d57584ed8789f159e2592e8cdd12018cac14bc221f1510f469735f3b3b40 SHA512 c1a96efd69969b4cb5be6e9342ab365ca9bee4dd3133a56f2bfcaeb243d178ace5bf40dc77c0c603b11bcf5a5b7aa9990e29055c8e0b33ff82b36238c8865046
 EBUILD mate-applets-1.16.0-r1.ebuild 2370 BLAKE2B e973bb109010f615a6652e55487aaad98456b318829a20f8e8ecab9d2d2a880daedc6a796fb79a6da1ee36e85f83908fd60af6054b8de3205e650c15645f2e0e SHA512 cf8eb10cbd2300402a7309561bc3b179710995adfdfa7f70134aaf4aef2ceedd374ceea653905f4645532d8530faaa1a677fff7fc071eb2081c27b223d438ca2
 EBUILD mate-applets-1.16.0.ebuild 2413 BLAKE2B 1635d43378d5f761f840d0a433f188f04d59f69bb9bf9fd49a7471dbd2d21797d22f7d90c3624fb2509ce173fd124507e2d81768596cb9409bbe571a2b862dd3 SHA512 d447fac31a5492be65c6a8dfd1724b6956e1f0c657c1750e175d7476fa75b75411a140706c36c5cb54f8e54c7338da9f94a26a70edb1351f66f2c5f5805464fe
-EBUILD mate-applets-1.18.1-r1.ebuild 2174 BLAKE2B 39757b57a816a02471b449b268751b7aea43631ea4490b393512e2a493b9cceba279be2e2eb75695d113a44be7e3b8cfe9d3effa45c8b074611f99999d44dfa3 SHA512 766e9b6432440f050f3c7d9faa477b8046b1ab21724f6359622609d0191af71b8cda85ef72828e780335cf13a4be60b88b151c7ef6e2b42ce0aff90a224b1b4c
-EBUILD mate-applets-1.18.2.ebuild 2217 BLAKE2B 4e8b946dc9a07fce71f8c3283e9d86f51a10c138657789e17c82e73523bc282dfd39111947403d239ae84bacc72fe01ef423fa01fa61ae70dd71c4c06f30160e SHA512 951a01311247bd47cdd1477e12eb4578a8af2487231b1e96c8e5676797fb19def4e2ce983b896f141361fb0e24d42cb0d2b7d384f765c05982c19d351b758185
+EBUILD mate-applets-1.18.2.ebuild 2174 BLAKE2B c467c9c9805deb6afac96baad1409a819d8ffd535f8d6e104408dc123a398ae78095cd85673c3e4de2eabdb3f582883c252dc2bd7e7a67f4b263c9fb113fbdaa SHA512 664aaa372eb7a67aac9c95c2c860438bf89a9dc8aca4f8979a4c5737ab2e631c4c58378676d00af5e516a419793fc2716a46bcac21bea7bab087645b3f465fcf
 MISC metadata.xml 417 BLAKE2B 415a8520ed9bb5dc3fb80e935e607c999254785ce733ada8ac88529876916c6beb0012addeeeacb37df02bc35ea42c1748b6fabc563c40bf4cba2dbb77ccc73e SHA512 8df2d630bab80c248991cb2d57c928b24bfdc92d72d9ecabd06bc362882bb0bc0f3dc376ba54deb77213676eda4fdb8c2a4362c634bdd58f8d2b3060a184309d
diff --git a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
deleted file mode 100644
index 5f55633bb791..000000000000
--- a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,96 +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 mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.12.0:2=
-	>=gnome-extra/gucharmap-3.0:2.90
-	>=mate-base/mate-panel-1.17.0
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango:0
-	virtual/libintl:0
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
index de826c083737..f0e4d037e94c 100644
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.18.2.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,6 @@ SLOT="0"
 IUSE="X ipv6 policykit +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#cpupower #593470
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/atk:0
 	>=dev-libs/dbus-glib-0.74:0
@@ -31,7 +30,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-panel-1.17.0
 	>=net-wireless/wireless-tools-28_pre9:0
 	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
+	sys-power/cpupower
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.14:3
 	x11-libs/gtksourceview:3.0
@@ -62,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
 
 src_configure() {
 	mate_src_configure \
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 097354b26fd3..31bf4183af0e 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/courier-prime/Manifest b/media-fonts/courier-prime/Manifest
index bab412c7ca00..41db9ea246a3 100644
--- a/media-fonts/courier-prime/Manifest
+++ b/media-fonts/courier-prime/Manifest
@@ -1,3 +1,3 @@
 DIST courier-prime-1.203.tar.xz 241496 BLAKE2B f85a3c16d27d3d03657d38d126fcab255263acbfed7c251bc3f88bc172535a6733b8cb4e5ddd02ac5d41e3a63bcfc26aa25bc8172befff5bed2b01242bd8994a SHA512 fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda
-EBUILD courier-prime-1.203.ebuild 449 BLAKE2B b51d2a45446c993774c28e2c98cefd75d9374ab1ed190ae0647d22268a09a0dc6141085b5383c47e1751e02068d9f177d8cef5d239118ebcfd7ff48723837adb SHA512 ec232f91d86c08df1beeb957686511f92e4986deeb9da41d1d689f1eda68c275ef777ad78295437c1cd5a957cdff4b50e5d1b5188c45767b0d83d212544cc841
+EBUILD courier-prime-1.203.ebuild 444 BLAKE2B 89aa13f830f121911dbae375d9d6e801b225060ac2f1b489f6338c3fbd99676d17f02f8fb9e7ba2f3dc45b8d927a74d6a3944d03afcecbc480f8f23581e6a240 SHA512 16a07021efef684fdcbe746e2da039eb1f2bbeae912cca39403849e2f2ecd2d4c15c7c51b8aa17a86367d365e9dd11adbcd8962d1d48aafd6b227e6cfb430ffe
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/courier-prime/courier-prime-1.203.ebuild b/media-fonts/courier-prime/courier-prime-1.203.ebuild
index e1a71018509e..391e8e9c8e4c 100644
--- a/media-fonts/courier-prime/courier-prime-1.203.ebuild
+++ b/media-fonts/courier-prime/courier-prime-1.203.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
@@ -6,7 +6,7 @@ inherit font
 
 DESCRIPTION="A redesign of Courier"
 HOMEPAGE="http://www.quoteunquoteapps.com/courierprime/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-fonts/dina/Manifest b/media-fonts/dina/Manifest
index c7aaa37af302..253142d211b9 100644
--- a/media-fonts/dina/Manifest
+++ b/media-fonts/dina/Manifest
@@ -1,5 +1,5 @@
 DIST dina-2.93.zip 78625 BLAKE2B b2376faf3b94177d657a029bd0d31243e7751b4784b07de08f22977daadbf1e4fec4f93c024d1e1f7110353fd9831a6cc9d0a207cb324fbedd3dbd47923e700f SHA512 cccf05b32d401ba77861e39471d9f6489a85b839dd8d49ec008eabd107189bb0a95bdd36805bc7907ab96fa65792910408192a136340f62c34a61b1d5c6f6307
 DIST dina-pcf-2.89.tar.gz 36442 BLAKE2B 84d343c1fa7b84e436f4a5712bc58b0db2a30b603a4f4cb2eec7bdceb844a1948d3fbc6b2c9c14316519ca0ec907a547ad150e2961493c0c31fe7f11fb9d2684 SHA512 e315f3afde86fa957d18d6903a97f1b2f018d12452d0186464dcb61de6ec9ec1e99f20519730567934fe8fc8555e2c1f4c531d19fd329c36eb5b1a840b2d7971
-EBUILD dina-2.89.ebuild 457 BLAKE2B 5cc210ba52d7e478cefc3c1860552629a51292270a16549fa35a651f613f3cffc41f303186b784c9bc3c254e0d408677c3a85f3fd7890d10219991e70fe8d642 SHA512 d65ea041d847e781d9a765211384bafaca71226d20a7f901fa52e3632363ef0490af280d3680059a81cecc752c7476ce2d5173a03445937d9cb31c9f2d1f9769
+EBUILD dina-2.89.ebuild 452 BLAKE2B db3a1eeaea1d76741fd95ba214df0988a97200cdff8cbade8e1cb383e5cbe88f72c63be3deaa13ab71afe916a5d206bcee794db0045bff7866a858d1dcd65d56 SHA512 e7a9daec62e13f15a2decdef6294e9bb8f4409a5c1720a6086a9fc01a835022b53541c9ae4001fce66d157f0701332f1752aefad244afe3af6b5a8f9b0021b0a
 EBUILD dina-2.93.ebuild 601 BLAKE2B fc6c5082fc935a74d6136d82936896752ce18e29be8927f0469342cdf49a62fa50823f485fb3d461cbbcb473d5d3bf3c36b6df1bd7811c00a9a6c7e5ae261699 SHA512 a5c4b538f62133902c351f5d8471d89a5b76177cb09331b903d891f350b38e202a56f3a2753870636afe77576d795a6d1c8377b70201f1ca3dbea09ded39147a
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/dina/dina-2.89.ebuild b/media-fonts/dina/dina-2.89.ebuild
index f811b5eaa984..3d3e2fcd8fb6 100644
--- a/media-fonts/dina/dina-2.89.ebuild
+++ b/media-fonts/dina/dina-2.89.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit font
 
 DESCRIPTION="A monospace bitmap font, primarily aimed at programmers"
 HOMEPAGE="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/dina-pcf-${PV}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/dina-pcf-${PV}.tar.gz"
 
 LICENSE="Dina"
 SLOT="0"
diff --git a/media-fonts/exo/Manifest b/media-fonts/exo/Manifest
index 05f118df3cda..23ee7727bd76 100644
--- a/media-fonts/exo/Manifest
+++ b/media-fonts/exo/Manifest
@@ -1,3 +1,3 @@
 DIST exo-2.tar.xz 914800 BLAKE2B efd551b1cb6acef6bb565a167fc198a8b8ccdcf0ad7dd54a7dff2c7f0daade823ea0e9054e570c7c5cc5e6e1d202babf910b833680f518997f9f4c2a1a5cb95d SHA512 362f2391563f2e5684c8c0bd7ecec8bd4834758c901e38ddfde7eeb53c573529f197b8cefe7da48ae23de564b8967c03c27e32266649cd429ee5b5187fda16ca
-EBUILD exo-2.ebuild 468 BLAKE2B 83447474e62b8a337c4fa85480705744735dbc09e086fe83f0c14b4cc7f1435bf30e6561d57e5660d8724396024ee7a9854145efffe2a037397aab9dcae5e50b SHA512 a6978932279ace76483a5be227c492cf6ef859afed815ea4b6b250fd3f99fa8b171b0cbbcc6c60f028f5d6c5e55db12628d7fa1ba5c6f16bbd9edd8bf83002cc
+EBUILD exo-2.ebuild 463 BLAKE2B 5966256fcfce3a1f1355bb035f4aeb70ed353bad221689124b772f0d0607c1fd2d51664e16ae1d687a8c774e50f1a923d11e46bbc78b68f2f478ff99a94e4afc SHA512 d6644f17127806939a86906d46c6a51dcabe9d5b1bc3a080ed407b1767c6f24eb2b2476b0719d6c2dfe0a563777baa52ddca25f869513dffbd9a22dc2885843b
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/exo/exo-2.ebuild b/media-fonts/exo/exo-2.ebuild
index 45316e5e8264..bcde786c944e 100644
--- a/media-fonts/exo/exo-2.ebuild
+++ b/media-fonts/exo/exo-2.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
@@ -6,7 +6,7 @@ inherit font
 
 DESCRIPTION="A geometric sans-serif font with a technological feel"
 HOMEPAGE="http://ndiscovered.com/exo-2/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 # repackaged from two upstream zips (exo-2, exo condensed & expanded) + license
 
 LICENSE="OFL-1.1"
diff --git a/media-fonts/gidole/Manifest b/media-fonts/gidole/Manifest
index 269250b09a50..df7b7ca7c524 100644
--- a/media-fonts/gidole/Manifest
+++ b/media-fonts/gidole/Manifest
@@ -1,3 +1,3 @@
 DIST gidole-2.0.2.zip 141610 BLAKE2B b29db824167a9000084de9486910bf627b5fea1a750508ee3c2de899d8907e0911aaa3be80aa2dd2ea6e721c47f87637a6f00b578cbc5fe77e98d2b5fbcc5813 SHA512 adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727
-EBUILD gidole-2.0.2.ebuild 402 BLAKE2B 41875fc2a3bc29f8529d987454a181f92affcc538e1d3183390da4652ed71e446713ba55e8a583cc856920ce4a27d1a9a63da66f555562b7f3c16dc7f8c66cbd SHA512 f3b5dabbb1e4c04c8f4be5a30767c74442979897b49ca19b2c269fb94444f9b21c8cc4556f344ad9595819abb67d5e484f0441e2bd479e776ae758ff3252b477
+EBUILD gidole-2.0.2.ebuild 397 BLAKE2B e6f26eefae3514f2dbe82939067a256e6dad24a842d505ef369bdb494fde77ed684b23e5024462b5ad5abdd3cd0cef001a0c683815c96c26ca09094150f3a6cd SHA512 ddc5030d666d9d9a0a4bb530ca42c5dcb7de82e1f4f1b710061e058a1fa1a584dce839777c5675f003e886c645d0308eafd6fba818e7eec4ccd73511d158ffa6
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/gidole/gidole-2.0.2.ebuild b/media-fonts/gidole/gidole-2.0.2.ebuild
index 8405676fef0d..6c8dec1fb106 100644
--- a/media-fonts/gidole/gidole-2.0.2.ebuild
+++ b/media-fonts/gidole/gidole-2.0.2.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
@@ -6,7 +6,7 @@ inherit font
 
 DESCRIPTION="Open source modern DIN fonts"
 HOMEPAGE="http://gidole.github.io/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.zip"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-fonts/inconsolata/Manifest b/media-fonts/inconsolata/Manifest
index 0479f735a568..d0c71cc315ae 100644
--- a/media-fonts/inconsolata/Manifest
+++ b/media-fonts/inconsolata/Manifest
@@ -1,3 +1,3 @@
 DIST inconsolata-20140821.tar.xz 72544 BLAKE2B 7d08482d9a58c864f629112d608df08d79beb71ceccc6fa4eb1c669843d7d43e2828cd7f288798b0d8cf8eb2b5bdf6f969315afc6bda7f51de716744ad6906c4 SHA512 295c0ff893e421c4d2dcb298a608c76b1790646774e1d77a820a7fa626771a34e2353e6d27b8d49b177541b7f4d2343a12152a75eec05e15e384e0118b19c773
-EBUILD inconsolata-20140821.ebuild 526 BLAKE2B 65a71ada41b8e766fe9e1aadd1ea9c2440b48ba8068994dcc5b9ee770bea4d2225175a0e7a83050bd22d9488e0ff9190296dc0cc25b3331227a1a47a46751acb SHA512 5e82efb2da6018c417067624b1cee8c344726db76a5be514b862167897039c87a53f6678e00eceb22b9aa3a1c3438f05b0fc64cb777f8d5c9eea34ca904c4cea
+EBUILD inconsolata-20140821.ebuild 502 BLAKE2B 6f48a0b98aab0d41baa2f14cec17e22e8aa07c85055e040c8844f68cbb23b7b4b2663d31f315d501316b904a6461cfb614618737f34d08d6dbae142a303c1b31 SHA512 b3d9520c6ae7dd9f5b2f7c9e7e5e11da781a36d176e1a83b2951df288939ed592367c3d34e177f07920032e43b63cb3ae7a41e14020086a4ccadeb15a9c99e35
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index 19d50d255f0e..5b6d596891c5 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -4,9 +4,9 @@
 EAPI=5
 inherit font
 
-DESCRIPTION="A beautiful sans-serif monotype font designed for code listings"
+DESCRIPTION="A sans-serif monotype font for code listings"
 HOMEPAGE="https://fonts.google.com/specimen/Inconsolata"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-fonts/nunito/Manifest b/media-fonts/nunito/Manifest
index 07af87184b3d..4264cf414dcc 100644
--- a/media-fonts/nunito/Manifest
+++ b/media-fonts/nunito/Manifest
@@ -1,3 +1,3 @@
 DIST nunito-1.0.tar.xz 204616 BLAKE2B 79cb5b80e9f55022a3d25778cde8ac9635450c0edeb7a16efc2ed62914a01a2ce18312e67724cc89c844e4ae4a9f6bcd40c8ed1a0fb980ae2f4236ec4f799765 SHA512 5237fd1f1a10ba377fb434786d6dcca6df5ddf7d6d8dd0c4d1a50688c92214dc82b01e97fbed2fd1a0d4a1bda79e560aa6e4824c18e34ad478ce30c89a6e7f4a
-EBUILD nunito-1.0.ebuild 483 BLAKE2B a0cb50a1f616a061a3970bb8254fbf0ebbd9e59b413eb33daf3a8088e30d82a825802a81372e69bf7edb28ec760b908e7b7fb385555153f5d4e69083035ae979 SHA512 538fd83356a26b6884e94c74498d24d045e4d6c53ef7c0726c7fc56df51b6e4e872fcbb8d4a9b10a42002c4a927a8fe6749f491d9ba68580d273c2dac61fe706
+EBUILD nunito-1.0-r1.ebuild 443 BLAKE2B 7a07052a7eddcbed29709a5b63d9eb14e4179493662a331ba73b98223913f24e806e4790c3469e486b96cbc373d7c6b08a43bc28a351273560914f5e97ff856f SHA512 3c12290429a6f753a9f118beaaa630f65a91770a68d8a2c1950882f1cbe1d8c8fdd6b43061e6f89a8f078118dda299eddc4ec9755a3491b1419177a818440760
 MISC metadata.xml 581 BLAKE2B 75ef116099006b9528eddae89a5e10a0f0ae48154df2ddf4bfb0d67797de03cbaa9433a2ee21f902d3066b922ba3724234d7acde482ab5eafdecc5ec55a62028 SHA512 68aba3c50fffc0911d48f4fe6c302873d8e01ac70071c2518b5ba8dd233ed86139fd6203ed02e54ff3a08fbf1bbf24d89a8f8496d99f3a1213200ebbf5ef6ddd
diff --git a/media-fonts/nunito/nunito-1.0-r1.ebuild b/media-fonts/nunito/nunito-1.0-r1.ebuild
new file mode 100644
index 000000000000..619be073efb3
--- /dev/null
+++ b/media-fonts/nunito/nunito-1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="A Sans Serif font with rounded terminals"
+HOMEPAGE="https://www.google.com/webfonts/specimen/Nunito https://github.com/vernnobile/NunitoFont"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/nunito/nunito-1.0.ebuild b/media-fonts/nunito/nunito-1.0.ebuild
deleted file mode 100644
index e094554e1f63..000000000000
--- a/media-fonts/nunito/nunito-1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A well balanced Sans Serif with rounded terminals"
-HOMEPAGE="https://www.google.com/webfonts/specimen/Nunito https://code.google.com/p/googlefontdirectory/source/browse/nunito"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index bf9358bbeaf4..710e07260aae 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,3 +1,4 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1.ebuild 478 BLAKE2B 4e525b3fc14d1fcf94bdea2825211f28f3356180d929c8682764ccd6d30cd676499b0b44eebcc0701e8229ce08357ff28a49f60414ff2b7c6d4088cae51ba62a SHA512 6a4df10ee6c2375efd197a212307f803ce06e25f1b823bbd458a180dd3282564b0a4cef8fcb9c299aea4c78e40a8341d2e9bd5b1ebeda931ec1a303a0a76693f
+EBUILD open-sans-1-r1.ebuild 474 BLAKE2B 00361c193fbc8295bf7be2a2c9b54f0f4ea106ef4e70080e76ddb4e62b27ea3d5a1977c36def6fff3d809514bbf92195f3726b42c3468ca88589e0f4eeddf6af SHA512 7ae586f12ec7107f6d7de8a12a20fc2a661164222f2af85ce93ae5916c326f1e4b40f665622ab5c9f64e045eba71ca0d3f8dc74018964645f0ad4dd21a61d72c
+EBUILD open-sans-1.ebuild 471 BLAKE2B 61970154edd4ccbd58f51c4b0a016d414d79bc33845f595a4458fd29b61dfe44030f1205838ecb13671bcf5c1c1e89b17dfbc5f989088fbb03c3beb3d3b506e9 SHA512 6a301f8a5f0360f95671250a1577a4eaabd887382c9d8398cc66de5766669de5e9d8ef51f056455353e7f7fd5686319350a75ef363c8c9a0190e648aa7b5878d
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
new file mode 100644
index 000000000000..bea7db905f90
--- /dev/null
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit font
+
+DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
+HOMEPAGE="http://www.opensans.com/"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
+# renamed from unversioned google zip
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+S=${WORKDIR}
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/open-sans-1.ebuild b/media-fonts/open-sans/open-sans-1.ebuild
index 86cf721800e8..7cc5b44431ec 100644
--- a/media-fonts/open-sans/open-sans-1.ebuild
+++ b/media-fonts/open-sans/open-sans-1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit font
 
-DESCRIPTION="A clean and modern sans-serif typeface designed for legibility across interfaces"
+DESCRIPTION="Clean and modern sans-serif typeface designed for legibility across interfaces"
 HOMEPAGE="http://www.opensans.com/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.zip"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 # renamed from unversioned google zip
 
 LICENSE="Apache-2.0"
diff --git a/media-fonts/proggy-fonts/Manifest b/media-fonts/proggy-fonts/Manifest
index 5e7c5093f9a9..65e1764af4f3 100644
--- a/media-fonts/proggy-fonts/Manifest
+++ b/media-fonts/proggy-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST proggy-fonts-1.tar.bz2 46338 BLAKE2B 4ac61bc492443be4fbb7bf8a8e4ca90f3e028753406b2fe99bfd27a5cd4e53cfc3426fc2789f75cbb7693278dd53d5e8886993018d5baa967162c4529291a362 SHA512 b0641fb416b582b1a8164630de176f2412063c78723f57ff307a41d54e95b00291975dfe13b518dd848f7902ca5c9cc19b5674036505f5a1f3015b9ae1208ba9
-EBUILD proggy-fonts-1.ebuild 397 BLAKE2B 41b9f9c61bcb191f0e8170230d359e013b3fe568e5af46d7961f2c5ce25ac0945d4761677d9a071ac574a6f612372e6c3e008db24fd44fd96d5eb81966018bc7 SHA512 7098ec5b2645e75658765701b6bedf0b148c46b03990fe12ec0d22ddb826a3c3da3a383305a766ae7323c8bd9950072a074499ead9360b8dababa1fc8c2c2ccf
-MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
+EBUILD proggy-fonts-1.ebuild 426 BLAKE2B 31b4887392b72fde3ec480c16589fc4270ebc77c921c7fafed72e7fa00fa0daf08e53ba5d8e398fd95fb5d8738b4d033de4dbec23b221171f24f7a558f02fc3f SHA512 26703abcc662e137f4c6304f11563cf918e3c32547afd93671c9f15f56a849a62dd550231c279134a3b65d5d629fa69f92010f6720c708a29b89724785d8e609
+MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/proggy-fonts/metadata.xml b/media-fonts/proggy-fonts/metadata.xml
index d0f1df7c94c0..cc081897d48c 100644
--- a/media-fonts/proggy-fonts/metadata.xml
+++ b/media-fonts/proggy-fonts/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>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
index fc68de139913..defe5f55c711 100644
--- a/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
+++ b/media-fonts/proggy-fonts/proggy-fonts-1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit font
 
 DESCRIPTION="A set of monospaced bitmap programming fonts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://upperbounds.net/ https://proggyfonts.net/"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.bz2"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
diff --git a/media-fonts/viga/Manifest b/media-fonts/viga/Manifest
index cd9136c65d73..5bc620cf4eb7 100644
--- a/media-fonts/viga/Manifest
+++ b/media-fonts/viga/Manifest
@@ -1,3 +1,3 @@
 DIST viga-1.tar.xz 18584 BLAKE2B 25ba19e324ab3d39ebb376e4511a61df46307281c09241eb30f3c6a2399c0ed0e459848e5cb76ecd2a00336d57e3793f7412e075aa5cb6c99428587b01430502 SHA512 cff4b5e1dd8035238b5a83878789ebfb490f61ffdd0c20d752b25985346de2c4ba88747ba11a196ead03460ee8b70fbbb68154f7415a63e82a2bf16847947dc6
-EBUILD viga-1.ebuild 411 BLAKE2B 9548614f8890d91cc0d9074cadb0369333269ead7fdfa9a43eb8f75d1f724f0a8adf83bd451bbbab0034275b3637ecaac47fc3e62ba2f7ed5536a3e8d295851e SHA512 97dd01dfa13658b8026e34db0606a6b10d570fa1b3030ccb03e42f63e65b1a9a724571bbce93bac3488ad938b0dc52e11a8f5bb9b62775a336bce67e04bb0d54
+EBUILD viga-1.ebuild 406 BLAKE2B 8cd1f685fbec4b178d640f91fcd0209946ba53cc0f993c159a42568a1b72afcc0a446b4e8046786eb759f57d4a28cfe28f674842575a15b7b47a5310537f492b SHA512 b0aed5f89a4b7df42f38cfe830be18a0f2343d2b482f31f5b4fc962219b6484f0b674b05b5e1f03da4fdc24f49991b9f11246dadace19492f3aec78bd4ac2f8f
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/viga/viga-1.ebuild b/media-fonts/viga/viga-1.ebuild
index 854724981e4a..d2d8dc1298c1 100644
--- a/media-fonts/viga/viga-1.ebuild
+++ b/media-fonts/viga/viga-1.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
@@ -6,7 +6,7 @@ inherit font
 
 DESCRIPTION="A sans-serif font with great personality and good on-screen performance"
 HOMEPAGE="http://www.fontsquirrel.com/fonts/viga"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ba2e11a000fb..38b3282305b1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 3aff301b0e62..af53df304f7d 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -6,6 +6,7 @@ DIST feh-2.21.tar.bz2 2129718 BLAKE2B 6d0e60ba5f51aef6dec6df59ce3cff24f9947e2359
 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.2.tar.bz2 2130360 BLAKE2B 6df5c19621f2adf2319d5543e495238776856a459326feb0c2b22e4f6188d4473b0df4d77814e4096e9e82f5a2cdd3a98db012410e78b3885c1bd8bd333a1959 SHA512 7dd487cef3e3b5405b8888ff3774e3b68258dbe3c50512a7196dae8506110ef7a3752d50a87240ccebe6c9b8eece577ed5de52c0bca567ec5638fd6cce2a2cd1
 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
@@ -14,5 +15,6 @@ EBUILD feh-2.21.ebuild 1195 BLAKE2B 0b9713a7b41ecc2e96b520c22daabcd8504d82461833
 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.2.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.2.ebuild b/media-gfx/feh/feh-2.23.2.ebuild
new file mode 100644
index 000000000000..97faff3af810
--- /dev/null
+++ b/media-gfx/feh/feh-2.23.2.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/figurine/Manifest b/media-gfx/figurine/Manifest
index b6203a4357a7..b363c5cb9913 100644
--- a/media-gfx/figurine/Manifest
+++ b/media-gfx/figurine/Manifest
@@ -1,4 +1,4 @@
 DIST figurine-1.0.5.tar.gz 293105 BLAKE2B 1530ee872cb80e4aa629ec4901c48b49a4aee77667286563da50c037a820ea028defb135e47c1b1b6363b7a59d55d633b30dc516f3b43819b3cc4e61439a6cba SHA512 e3b6a2d0d4b8a4837f27eb40ff158444ff59ac7d826cc780c6c13760e0d6e72844a7b6de69e482dfee12c020600e40c58fb5b4b9efa935342ada6fe62b57eff6
-EBUILD figurine-1.0.5-r1.ebuild 568 BLAKE2B e728287c0a73a4a20e2f47d24e2ea2cf1f75370d3dda48019c8a650e0c55684119b4377361801b31641605156fb24df4f29ab23b33109b112137956af720e6a3 SHA512 30901689590a7f10b548893d13865bd467b9081b078ddb0210ea99dd5eb61c56141a2a394f03a6cdb5a629e48bd3d83bdef99442dcf4c304144ab5ebabea52f6
+EBUILD figurine-1.0.5-r1.ebuild 567 BLAKE2B 45cf9c04938ffa6218cfe1c5c6dd91cec9568a6a9d1e7e4f2e6c83117e42eb2182b0877ad8a5964d2aa2f5e12f0b6cf049672d85935aa70bea1a301573f17135 SHA512 f6a85ade1f346be6958a9bbdaa6d68fec6a1868594b36fee183b8e33b9a543d4e2db6691d9286e574cf99eafbf8f922222491a3878424d45b33502a57154271f
 EBUILD figurine-1.0.5.ebuild 598 BLAKE2B 657f9f2f940db245fba418896fa399cef1f10dd16005321dccdfbe634578f6a6695ee94388f7cce586942d17bff821db4206e5611ffac25e8473abf56b3a6a80 SHA512 15fcb3b83492e9cbd70d44a76211fbab3eb39523cdd865560dd9baf33fde631e1adebb793978da837d9918e43d190ce387efd177fe6bf458ee295e614ae7fd93
 MISC metadata.xml 245 BLAKE2B 0d2e3e7b0bbd5f0c960bf5de591a6729a33552e5e32a4f19f2b7ab79e849dad285bf7e8c88134f213d99d9c83cee8672b37250ed84ad6c6f480bab5fdab368f1 SHA512 122e29d489968047e70dd824a49ffc4dede2a4c632e203a820abe03ea2478cb94b7aad94409ca235f227a034e16141c556fbe462833edfa802f03169215d4c0d
diff --git a/media-gfx/figurine/figurine-1.0.5-r1.ebuild b/media-gfx/figurine/figurine-1.0.5-r1.ebuild
index 23b4be50572f..9875ba79005f 100644
--- a/media-gfx/figurine/figurine-1.0.5-r1.ebuild
+++ b/media-gfx/figurine/figurine-1.0.5-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/figurine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 4aae549c9516..2b835fb031bd 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,6 +2,6 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 871 BLAKE2B 8fd8f023bb4c97e8c87bc81d79c2d704102e284a7bcf250a6b5cb23e4a89997e333f239b3902fc51864a35d806c684e07c0e652a340d929fad405d17754a2422 SHA512 a40bd067165528ca7a0541faeccff8db2d0220969019e16925b299635297e9a5cc9325c41bdf0f69eaa491ece9542e1bfa8bcab566b9227cb3b3f1223dce93ab
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 876 BLAKE2B 42364830bf37f557b0b7d6cfe029eed7abaee0bf7d4b22c45cbdb3ea3ee99e9e07e6e60aa536d6713c2d5503075daa3e9407c13246b95d7da869938d47163338 SHA512 6513012aba74330837075f20325a2763ad71e8d9c7bf21b5bbd8c7a78f463cabaac1ded93097ead3f6551cedd7ad91fd535f6b2466698ce38d8289ebc7d785ef
 EBUILD gnome-raw-thumbnailer-3.0.0.ebuild 648 BLAKE2B 60b014ff0392ef596738db5a9abd2bbd434f03b8389cedd0cefaf08c874eda4525e80ca84cf89b81c150937ecf00282ab79bbb5600c1a6dcda0fd815adf90577 SHA512 c129fee26c644d9f1577aa53c0bca841047cf93a0c5d65442ae141b21bd82ce4097e932969a745df528a1703ceee65a0d9c667c7888321e3347997fd156787b8
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index 973602d4e11c..87279ffbf891 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ia64 ~x86"
+KEYWORDS="~amd64 ia64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 874b43efc289..08f63195def5 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -2,6 +2,8 @@ AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
 DIST icoutils-0.32.0.tar.bz2 593699 BLAKE2B 5a2dbe67468c1bc0380b94f4ecf707c5e1019539e959c0692d195599ff402c4e5496f46883cdd898abb319d8545b76afe32b172d3f74f674c008c69de5a93463 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
 DIST icoutils-0.32.1.tar.bz2 594036 BLAKE2B cc3e9071ed6b4e4d783831a180eeae60cadac53e7cfc4cc3c2b5db842680500f04a42f9610e71fd52bbaf3b9d8dc0aacfe16ea0605b809df566fa65328abb32c SHA512 e235cbf0e30f7833babd3aba182cf32b8b76ee757d0d44597c21567a6f960943ec187423727cc33016f6b4d4b0367b9bee7da9dc12807551b38bb4fbe14c37f6
+DIST icoutils-0.32.2.tar.bz2 593980 BLAKE2B 1e9fa8ee3fd8e90b4029990508ce6ef405dd01a4e357a73f72980033dd54df1c6d714351cf1b79ce32840941da06bb0d1154e310191798ae31687dad6e828d6a SHA512 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8
 EBUILD icoutils-0.32.0.ebuild 1023 BLAKE2B bd59b621178f0a056a360ef55359ffe0e1cb7c85164382333b5527661ea33646536a9a53bc572aa3f5bf7ab58fb197e090286631a08ef2d8fb50be54212b31a6 SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2
 EBUILD icoutils-0.32.1.ebuild 1026 BLAKE2B 98d0e225dd1e91554a16004fcc184fd558ea56e9920dcce878c924f375e1a89679560f460e1631dee16445c3c93abb8744464e2ec97b538124ba47ec1041af87 SHA512 57f6adc89ece356040261ca24dea89b79e5c11489f901547e12a0f7c9e4939e6a082d903e86da3aa3ec6f6a0a464fec9c3f9276eef48003d186a3c3f7e274b96
+EBUILD icoutils-0.32.2.ebuild 1025 BLAKE2B 0ec51b684fc3a36a861dae470c879824fc5df518033e53876bd26b50ea6a17f0c998ed7814560754e0c77e2dbdc7857f520d1c8ac3a3c9d105298500febe0b1e SHA512 f0bf50f41d4c010d6c0ee116376e276eca563984b41709e234e47e6a373b494a326d03d2587a16c5ee63c4b4b6535601a6f1bdf4e989b270677c173ec272635d
 MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.32.2.ebuild b/media-gfx/icoutils/icoutils-0.32.2.ebuild
new file mode 100644
index 000000000000..a0c5388a704c
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.32.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools flag-o-matic
+
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=dev-perl/libwww-perl-5.64
+	media-libs/libpng:0
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
+)
+
+src_prepare() {
+	default
+	rm m4/po.m4* || die
+	cp /usr/share/aclocal/po.m4 m4/
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
+	einstalldocs
+}
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index f6bf69efdc45..9b03748d7835 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,8 +1,3 @@
-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/files/kxstitch-2.0.0-imagemagick-7.patch b/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
deleted file mode 100644
index fe53efba3027..000000000000
--- a/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 295773f44bfda1227d85edf065a8de14dc889159 Mon Sep 17 00:00:00 2001
-From: Steve Allewell <steve.allewell@gmail.com>
-Date: Wed, 25 Oct 2017 20:57:22 +0100
-Subject: Fix for changes to ImageMagick API for importing images
-
----
- src/FlossScheme.cpp    |  4 ++--
- src/ImportImageDlg.cpp |  9 ++++++---
- src/MainWindow.cpp     | 10 ++++++----
- 3 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/src/FlossScheme.cpp b/src/FlossScheme.cpp
-index 4c59973..e4cd117 100644
---- a/src/FlossScheme.cpp
-+++ b/src/FlossScheme.cpp
-@@ -38,8 +38,8 @@ Floss *FlossScheme::convert(const QColor &color)
-     Magick::Image image = Magick::Image(1, 1, "RGB", MagickLib::CharPixel, c);
- #endif
-     image.map(*m_map);
--    const Magick::PixelPacket *pixels = image.getConstPixels(0, 0, 1, 1);
--    const Magick::ColorRGB rgb = Magick::Color(*pixels);
-+
-+    const Magick::ColorRGB rgb = image.pixelColor(0,0);
- 
-     return find(QColor((int)(255*rgb.red()), (int)(255*rgb.green()), (int)(255*rgb.blue())));
- }
-diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
-index d12ca34..79e8c38 100644
---- a/src/ImportImageDlg.cpp
-+++ b/src/ImportImageDlg.cpp
-@@ -305,9 +305,12 @@ void ImportImageDlg::renderPixmap()
-     QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, pixelCount, this);
-     progress.setWindowModality(Qt::WindowModal);
- 
-+#if MagickLibVersion < 0x700
-     bool hasTransparency = m_convertedImage.matte();
--    const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, width, height);
--
-+#else
-+    bool hasTransparency = m_convertedImage.alpha();
-+#endif
-+    
-     for (int dy = 0 ; dy < height ; dy++) {
-         QApplication::processEvents();
-         progress.setValue(dy * width);
-@@ -317,7 +320,7 @@ void ImportImageDlg::renderPixmap()
-         }
- 
-         for (int dx = 0 ; dx < width ; dx++) {
--            Magick::ColorRGB rgb = Magick::Color(*pixels++);
-+            Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
- 
-             if (hasTransparency && (rgb.alpha() == 1)) {
-                 //ignore this pixel as it is transparent
-diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
-index 9713293..1d22e63 100644
---- a/src/MainWindow.cpp
-+++ b/src/MainWindow.cpp
-@@ -543,7 +543,11 @@ void MainWindow::convertImage(const QString &source)
- 
-         bool useFractionals = importImageDlg->useFractionals();
- 
-+#if MagickLibVersion < 0x700
-         bool hasTransparency = convertedImage.matte();
-+#else
-+        bool hasTransparency = convertedImage.alpha();
-+#endif
-         bool ignoreColor = importImageDlg->ignoreColor();
-         Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue();
- 
-@@ -564,8 +568,6 @@ void MainWindow::convertImage(const QString &source)
-         QProgressDialog progress(i18n("Converting to stitches"), i18n("Cancel"), 0, pixelCount, this);
-         progress.setWindowModality(Qt::WindowModal);
- 
--        const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 0, imageWidth, imageHeight);
--
-         for (int dy = 0 ; dy < imageHeight ; dy++) {
-             progress.setValue(dy * imageWidth);
-             QApplication::processEvents();
-@@ -577,8 +579,8 @@ void MainWindow::convertImage(const QString &source)
-             }
- 
-             for (int dx = 0 ; dx < imageWidth ; dx++) {
--                Magick::ColorRGB rgb = Magick::Color(*pixels++);
--
-+                Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy);
-+                
-                 if (hasTransparency && (rgb.alpha() == 1)) {
-                     // ignore this pixel as it is transparent
-                 } else {
--- 
-cgit v0.11.2
-
diff --git a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
deleted file mode 100644
index 02fe8204fac4..000000000000
--- a/media-gfx/kxstitch/kxstitch-2.0.0.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
-
-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}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	$(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
-	!media-gfx/kxstitch:4
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-imagemagick-7.patch" )
diff --git a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
deleted file mode 100644
index 3e24a1c98c3e..000000000000
--- a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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/pictureflow/Manifest b/media-gfx/pictureflow/Manifest
deleted file mode 100644
index 50456dfb2820..000000000000
--- a/media-gfx/pictureflow/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pictureflow-0.1.0.tar.gz 10704 BLAKE2B 478dc9b3decb707da3df2ca8d2b717ed9c3f9b556f09c1b7aa3e7e72a44402ce218db4700a8f8fd25ee542a737fab36801eadb26e49d015904c9ffdfd1a9dc6d SHA512 bf0a6a178d945146885a016926ffa29fa3be19c30ccae9d5862c9ae40dd888b962d66037eef973e0f4fa08658dabab9c751adb0e80fb16979c076239172b88bd
-EBUILD pictureflow-0.1.0.ebuild 580 BLAKE2B bba77788afeb043ff2c3e1ca3187799213466b20f1f3eacabd45f59c94757fed6908999631c6e5b5f624c15390b8aef261152a70c9d35786cea631926456be04 SHA512 5c26467eefad06165dd92ea44779e2597c26bf270b8823cd9703d1fb03b163f25e881e873366e506203b3fbfca35a6d410e64e5e7a890575869bb2929c3c81cd
-MISC metadata.xml 248 BLAKE2B e383f98ba8c3e0b89ea1ff7296445232bd9229ef377b3f432f96d51282fb951b178e403845d283579ee926f1fd410f270a8cf9ac2ded6d12a92634f4d5384749 SHA512 b2a26b2e861162ae41141e3226351e28fc048bb6722e1fd214df535f3711c5700555ff244a672d318de17c10a9aea6b5826417b7a91eed9edda05fc4bad50574
diff --git a/media-gfx/pictureflow/metadata.xml b/media-gfx/pictureflow/metadata.xml
deleted file mode 100644
index 4445882d31bd..000000000000
--- a/media-gfx/pictureflow/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-needed -->
-	<upstream>
-		<remote-id type="google-code">pictureflow</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/pictureflow/pictureflow-0.1.0.ebuild b/media-gfx/pictureflow/pictureflow-0.1.0.ebuild
deleted file mode 100644
index b479972194fc..000000000000
--- a/media-gfx/pictureflow/pictureflow-0.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit qt4-r2
-
-DESCRIPTION="Qt widget to display images with animated transition effect"
-HOMEPAGE="http://www.qt-apps.org/content/show.php/PictureFlow?content=75348"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${P}/${PN}-qt"
-
-src_install() {
-	dobin ${PN} || die "dobin failed"
-	cd ..
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 04f1ca7f413e..c98eb2213282 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,7 +1,5 @@
-DIST potrace-1.13.tar.gz 605931 BLAKE2B 101c5bac1a0feb804c30c7af81a037c9532f59e38d62aa6860a3eacd984ed69973c5eac0033999080d8f64360a08721067d3e5b4b2a5513f5ca542687bf1793c SHA512 d7b1e72bee388aa309a5fbf3944b9409d912f2ed8a089a44dfca597b55d88bdf08778d40fc487e6689a873631c24cd393894ff353442dc778dfd0d3068121484
 DIST potrace-1.14.tar.gz 649685 BLAKE2B be4d7e2556d4aba00d5995a7672ab6349d4e50925dd0602bfd481515091445d7ae57396c13fdf8f9934e033e05dfe0eeae0561bedf17110560bfcd1b42b61fc5 SHA512 ade5e18adfbfccbc1298d0bd416fe3ef49ebe0284b81d43e0dd0040498d0ef6995e6ac9dac0a1eb5c251921bc97c32db3213dbe0ab40365d87f92013dcdc99b5
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
-EBUILD potrace-1.13.ebuild 830 BLAKE2B 36427cb342bd043a474a5430a61903521f94d805020b5029c43ccf3feac1be9a69f5e432ea65ae34f55754e2df148268a39984dfe0edb56fe0650aa038f0cab5 SHA512 50d4a9ae0d69dd85cbc22aed2a862e649b2bc17883e1bd782e9d4976d97807dbb7e69b67c073c800bd14bd92eb024af2f42b58e58c57f1d156e1ec72403fc268
 EBUILD potrace-1.14.ebuild 837 BLAKE2B e1e1f18b0c2082da4cedd7730b65e6c3a850d74e7765c2059976abfe30424f6adb154cee64744bd9fa9522de9dc08009b9777e66427b29c8a541e046468f19b7 SHA512 93cecd52cab437f70eed160a7b8f12789aaf98e3c9d9adf4615b64924806dfa16a80747678d97d9343eefdeaae30e6c1d951f562f6911a0ea45f28a571132c08
 EBUILD potrace-1.15.ebuild 825 BLAKE2B 9fa93112916b53c9f29cd5488b26ac3e8e77f0b3a85a19f84396898d0b23839544fd2c50e5e58882f16c6378f9ae5a214e9068fa904ed5042997c5813a58dfdc SHA512 3d4f1486e07d00ed5f1624617a7c3632cf4d64fdeb38e5d10fd6cb554148128eef2e02091e4b1387f5f619b8b4e27061fe21bc5ec3e3e8f1590b29b2a9f3929c
 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.13.ebuild b/media-gfx/potrace/potrace-1.13.ebuild
deleted file mode 100644
index 87359f05c2ef..000000000000
--- a/media-gfx/potrace/potrace-1.13.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"
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="Transforming bitmaps into vector graphics"
-HOMEPAGE="http://potrace.sourceforge.net/"
-SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="metric static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	tc-export CC # bug 610098
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--enable-zlib
-		--with-libpotrace
-		$(use_enable metric a4)
-		$(use_enable metric)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-gfx/quat/Manifest b/media-gfx/quat/Manifest
index 89bcf8bb75da..f15631bfff58 100644
--- a/media-gfx/quat/Manifest
+++ b/media-gfx/quat/Manifest
@@ -1,4 +1,4 @@
 DIST quat-1.20.tar.gz 474448 BLAKE2B 52a06460be261c622f0c30f8991762e91688da53ba2a9854cc5c94a6de7fa9c7d8028fc3f36608bf11f56c7bee8ca192a37c91ac993b3866ad7b630da3bee5ad SHA512 eb77d628ea0e329e8bda11124bfa57e4005f06ad4d54d8bdc31eaab09fc0cf7ebf1873e7dd47624781e8ee75c7644bfc75819ce5aeb5c150644f8b7a7c81e85b
-EBUILD quat-1.20-r1.ebuild 783 BLAKE2B a24765792e6434f7eddb8dd99067cf79a5554b8c0b1a9a5effd2c3cabefab697bbd94d0e93951c5eb10f159c27da30cc6325c652262adc16e3736ef5176521b6 SHA512 a11b1ba94f2241f93d489c136967f9d0a6a5a610f523c051c32265bbbc8352615ca90403d4e1190794873e8b82a7f2c19b53a1962691161946b3ccba61ee6bec
+EBUILD quat-1.20-r1.ebuild 782 BLAKE2B c412bae65ea941fc5a0f8960c09c27b6db8fb64355e7f8dc2d831e73716e2520873bf4df97845459f484f2cd0bd53380ca54f4106bcd6f06ecfbb03392cae40f SHA512 6a93386ec3fd4c4d1c7b6391e97cbbf99be7dc301bf9e63c96c20406e77918f624bc080e1da0ba10f1d028dc7ece7c165f2f833a8ff21630ad78e89ffd8e3620
 EBUILD quat-1.20.ebuild 859 BLAKE2B d524d9af4c5e18d9371fc61d3e9116ca6b043ca16da08de36bb1de2ccf6f746477f4c1cfeed4f5df0b32af98f349d85a0fbe69328806e1a70068d95ee2015f46 SHA512 82e50cb8a8de385b6ab415482c600069ce601898e75d3cef46078fff5d9c2cd2f81511b79600ff597dd1e08440118fd745e0a47cd0b30361bd08b67bf21dcc7f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/quat/quat-1.20-r1.ebuild b/media-gfx/quat/quat-1.20-r1.ebuild
index 9769ad572424..c8539486c8e1 100644
--- a/media-gfx/quat/quat-1.20-r1.ebuild
+++ b/media-gfx/quat/quat-1.20-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
@@ -9,7 +9,7 @@ SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="X debug"
 
 DEPEND="X? ( =x11-libs/fltk-1*
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 37c21e5048d3..9bb16d526774 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,5 +1,5 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 672 BLAKE2B 5bed28827654af33af9909dde82a4d977966680bb30686968a51a9936e163275230e5fa5de167597de521982ac85b6600aeb8fd88f59a92bea506acc3db1432e SHA512 2a5dbc2b8a9b0796f540d03fec695a364838e4bd69300e09dadb07c9eef4218595b90c15e24fd5697420f137054ace4fab42beaaf2fb4886ccc2d3ea3060a854
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 670 BLAKE2B 81b9fe7ad1e38560a845c9b14a133665079e3d0873cda4b326a1705fc3368f98a36e35511eca733229b905a1626a1c2904e90daee8013294eeb370217a261cfe SHA512 ef37e62ea60740ee53ef1ae84bffb973ac73f00e9f093fe54795eaad390d159826a910b74bfe63b83853df64dbd5bd2c3855b6755ec711d65cfec645811f2163
 EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index 7affd0c6df8a..f2522d741ac6 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ea4a6193b402..5271147ccbf0 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -16,7 +16,7 @@ EBUILD shotwell-0.26.0.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af
 EBUILD shotwell-0.26.1.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af4065552d3fc100a55d1765677af6ba524bd9225e8b385477c016aa692bb0e4ccddb3911558771d4b8b9e36bc966 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521
 EBUILD shotwell-0.26.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
 EBUILD shotwell-0.26.3.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
-EBUILD shotwell-0.26.4.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
+EBUILD shotwell-0.26.4.ebuild 1489 BLAKE2B 67f17dc26b947576b61d7cf2e8456f740ef3c67a5e93a973b20b394b4145305b0b7a4c93123a8f915a009377380c7a5a00ee94bb523e1718fbe79dc72f4d3bf0 SHA512 c36caaf68673a461b8dcb1e3b4ec3dca0a734b263158707cc81f308fe43088c9ea638fdbaee76c3927e4804e220ecf4962fe35c3276578887bf18a098ac84726
 EBUILD shotwell-0.27.0.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
 EBUILD shotwell-0.27.1.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
 EBUILD shotwell-0.27.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6
diff --git a/media-gfx/shotwell/shotwell-0.26.4.ebuild b/media-gfx/shotwell/shotwell-0.26.4.ebuild
index 0cafa2080fcf..5cb74b6dd245 100644
--- a/media-gfx/shotwell/shotwell-0.26.4.ebuild
+++ b/media-gfx/shotwell/shotwell-0.26.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
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c6509129b5fa..f2165363386a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/blib/Manifest b/media-libs/blib/Manifest
index 1bcf29c3a05d..a823a49eb204 100644
--- a/media-libs/blib/Manifest
+++ b/media-libs/blib/Manifest
@@ -1,3 +1,4 @@
 DIST blib-1.1.7.tar.gz 570809 BLAKE2B 4b6c6738dd67a81b09ff0a280d3522d8cd41046b6eebe0ff4d6bf78df49fa3aa20382e0b02b3ee17c8c536fe34445a85a80433a39a87c2f0f650612fcd37914a SHA512 060fe2ff453c1dd073ff6105217618157da54416243b0f086a4f1324028b2fc222f6f732de1914d0e2e82df3565801b68d1ff49df4e6b89cd409bad73eb01ad6
 EBUILD blib-1.1.7-r1.ebuild 1063 BLAKE2B 00050dcd2186d9334be96ba994216d99de33c2d36f5ac9170d0ba4e11d3ef12a3d6813ee8c4773a1d09a727e86ed6fc445856238b1b13c05ada3507805efdf39 SHA512 99fd0781550e7629cffc0ef85b23612885f35fead40aa224cbb4c9e3f5b0eaed2a4a38ef6d5458446d21a6a94d40ef1de10fa8ab4ee06923eb8ef5a6460bb420
+EBUILD blib-1.1.7-r2.ebuild 996 BLAKE2B e95d0ad85bf327008ea1e17599bf8db05a77f6d9d6b3887ae15d92d4298b1b227f5f945aca1571732119cca6629a46c1855e8bbff34a8e1b14c4a20ef4299945 SHA512 dde64551463ee3be8993080f4737cd4d4f402b7336a7c16ffdd49953ef917af4efeea1925e495766099c21c0a33bedb01147271b1b6bf596bd84acd7b141b556
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild b/media-libs/blib/blib-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..43c49ee5e869
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# Drop DEPRECATED flags, bug #391105
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		blib/Makefile.am blib/Makefile.in \
+		gfx/Makefile.am gfx/Makefile.in \
+		modules/Makefile.am modules/Makefile.in \
+		test/modules/Makefile.am test/modules/Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-directfb \
+		--disable-static \
+		$(use_enable aalib) \
+		$(use_enable gtk gtk2)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/fontconfig-infinality/Manifest b/media-libs/fontconfig-infinality/Manifest
index 48a592f7e65f..0856af8540f1 100644
--- a/media-libs/fontconfig-infinality/Manifest
+++ b/media-libs/fontconfig-infinality/Manifest
@@ -3,6 +3,6 @@ DIST fontconfig-infinality-20120619.tar.xz 18956 BLAKE2B ca1f698ccade1ed7744864d
 DIST fontconfig-infinality-20130404.tar.xz 23344 BLAKE2B 8531a8cab3ab37c7d8c23c992ad9ecb3473e92918569c1f77b0345be61d9f0bec968447bdd63898ca6197f210a5c79117433a1aa9e7eb4ff4f7b479a4817476a SHA512 742206795523509a7d195f194394ef3f67a9022b46f194ea369f7388c0c59842d29573fd2719f616dcc2378a4b527b93cdd3cf787b7a1728c875c7e1aa5a5417
 DIST fontconfig-nyx-1.tar.xz 1344 BLAKE2B 5ac550757c1ba96a6fc8830bc64c09da60e06fd9dadd4bb4f11354c9b2335df89e0a003ecc20a87e865934ea413b9267cd367294c2cf66442121aeee70732253 SHA512 d4959b0e81f9dc3529f5ee043dd5e0c45dc66848f4685daa1ef02aa8a40ed8e229f1da3f20a1ff9e315b15daddf9fb37c6ec1396eb9965fdbe3faf22c1cc70c8
 DIST fontconfig-nyx-2.tar.xz 1376 BLAKE2B 35853d469bc1e38d7ccbc0346e26e8c1d885db86d4b81f7c341b64a2914fc0b8fdc5f7e449800e8b305163e7dca1bc60f7ed912674f5a4acd2e6e79cdb0c939b SHA512 7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d
-EBUILD fontconfig-infinality-20120619.ebuild 1379 BLAKE2B 9d607444b25dc1394114400f952b397fb3cba6640fb0f7336bc6020b3a639c13c49779b639bcf6fb867b55ec75080c2a4423b7e3e834bb92c8fc8ddfe7efeb12 SHA512 e198ac3caf4d4a3adec3dd8fdebf543c0e8f0996fce67b6abedfafc536a0f56b64df929f292ecd32f7148ed883cc73d01332b19d314157205202969d7433d963
-EBUILD fontconfig-infinality-20130404.ebuild 1562 BLAKE2B 6337c3ec9de186ce97ac11752e1d3b031337dbdb4c1d9168a6c0c22bf9921bd87a8b10aec6f491b07d19deef9615035b44ba41df56d2f617d4ea7226c2f7d102 SHA512 d8354496a71b54d45575d243caa2d89df8cbe8a9c17f2fd3a5ef9a75e40650bcfb2afd9d1843eaa2aeffc441f92b8d7c27ed8eed45394dcd6bd29393b79102f7
+EBUILD fontconfig-infinality-20120619.ebuild 1338 BLAKE2B 5553ce251432f9f7a851adfd51a9e63b7f58a167690e2e05c25fb1312d1e0516d945e2b753feb37f79dc34b5e2c7c492b8481b26306c89f1c0a19cf14434356f SHA512 9900161d45f910fddf1bd82a8792034d4f53132c86cf47fdc41a420a3eaf47c22d1dc6c696f4ee24a998404640604cd6bad250136af65a0be67aea3ba8ff39d0
+EBUILD fontconfig-infinality-20130404.ebuild 1521 BLAKE2B 80bf72042abb01fc978088e5e5886c99492e754eaff564f3f1f8ffecd0458d896d2258f1bca57e6fbe1a404c25cf6a98024a6bb5cc2d0a2e2780a75c84a86d27 SHA512 e03dbb7e4b594470d087eed27b8927fc07b0da74ae99f61268c332e6b2e7a8f8518b3ad97614890a04751aedc90eac9471fca8ed5afddae9a3a5320f29a6cce4
 MISC metadata.xml 326 BLAKE2B dd093b07465ecce80ed78966217960f47725a0737737af4a5c0d140b542e51f6f9705b49f46000ef5d28f1c9f602ff20e0dc71072874203580558ad0863049f2 SHA512 272fe9c2e8befa218cd456c34c82e11ad47149da9735b3d7c5a9073f4993d04127f8b23224a910c40d339da6745ec504724b29438fda5f019915cdd6e3d1fada
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
index fdfb057b80bd..abd7c399e578 100644
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
+++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
-DESCRIPTION="Configuration to be used in conjunction with the freetype-infinality subpixel hinting"
+DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
 HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz
-	nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-1.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
+	nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-1.tar.xz )"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
index 6c58f2588df3..044748c76069 100644
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
+++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit readme.gentoo
 
-DESCRIPTION="Configuration to be used in conjunction with the freetype-infinality subpixel hinting"
+DESCRIPTION="Configuration for freetype-infinality subpixel hinting"
 HOMEPAGE="http://www.infinality.net/blog/infinality-freetype-patches/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz
-	nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-2.tar.xz )"
+SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz
+	nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index e972e9826d8a..a8b6e059c546 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,9 +6,9 @@ AUX fontconfig-2.7.1-latin-reorder.patch 1701 BLAKE2B 9ac50adca6b257ebd12848ac09
 DIST fontconfig-2.11.1.tar.bz2 1516095 BLAKE2B 4f78c606d198c4d721dd7fe61181f4433a562fee7f69372e64b661e4aac7750928bc158691fdbaf5ae932bda373d007f95a6d0089cda2eb50f15f599c4eb9d6f SHA512 acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
 DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33c1b38d6c55e02e18aee875a1bef4162a5bba0b9bf8f09c0f94d63c64c3f6bf6f3c5d993f210f74076f861c696f5262c SHA512 f336e9220afe738e0bf7186d87a5eb09842342ad99ca2102c69820a1f0b232e15c61ef72ae3f5d56503f5be32557d09180a80e05690e85b4eb13ed88f5cece81
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
-DIST fontconfig-2.12.91.tar.bz2 1678752 BLAKE2B bb34ec8559a372696e72629aaac517c24ee5a9503ba6f8c20fdda22f5e2eac49b94323c18e6d90cbcba72fd00b0ad8a88c12c9954b55c90f78e7888129773abc SHA512 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
+DIST fontconfig-2.12.92.tar.bz2 1691287 BLAKE2B fea26d468e89d27b186763b175f9e3eb5674ca4771ec5462dfe280214bcde863bb032610a9f943f4afc0139f5042324ae220596698a25e6825cc7f0e1500be02 SHA512 4925cde8c988f25f40786b32937df68a9152a9a1e5645d3894aa5b9d70cffb7fd1a7b3e1480d716b93618ad7414bac752be6a77c71f1065dcee57368064030ab
 EBUILD fontconfig-2.11.1-r2.ebuild 4770 BLAKE2B f1cc240f9fd3631a484c33cc078c505d4b4af5e8c60baa63b9bb1112bf355e82774372ee26e85b13863c043d64e583d1c26af75fd0948f24b9f8eb6fb88a79ef SHA512 597cbd513b3407a49c40bca4ab879777f761d1ac3bf3091efdf504ce854dfc672d1721e16acc9bf8fce557ffe7f911105ae1dedcbf2ab082848b331e60ccef81
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 5008 BLAKE2B 681b60673d02536732261e444b8f00b8178f43a6408dc2990644152b2d3d9971f2d7cca9c88ce7b5fe1aa356cca6c1f47b6a2425af0668aba1d0bdfbda0b3c08 SHA512 2aef38239990fa98e967696681f68fed5644ff3acb43d14810ee61505907de091491ea53a7b311ca2c28452eac60a1227b3196f15d0d58aa14c86b618980ee1b
-EBUILD fontconfig-2.12.91.ebuild 5009 BLAKE2B 316c388b65625ae9be41c8a79f48dfcd94cfeabf3fa962edd5aa2ed32d3e9489fc420b2dfdb17b061b64536a90651b6698e23957758a31d55ff82e01315f4682 SHA512 c2b552485c90827698bc12a2b32fff0703262d65360e8cabee78dce071b6fca9cbdf8360d2814ceee760d0195fa0ba252442dd7176f8856cd5e77bc0adb274f9
+EBUILD fontconfig-2.12.6.ebuild 5007 BLAKE2B 39a5c9e988609ce183ce3e51b57fa5e6481a9e41e120ec8cc24bf731b927322c6d7e5882f294351106ed0c91a5e0618bef34a5ee106ac6cac15ee8ca228441e3 SHA512 20eb9465e4dc39af53a53ddb2fee02746a8466b2705258b54161d426d1f473d86d68a9de97c2fccd96ba31c3bb3593b92b4627f40b3aee118e509e35c8e85121
+EBUILD fontconfig-2.12.92.ebuild 5073 BLAKE2B f2826657bf7ba5a8319c34bce4c05f85575c41bad341b2b8725ecfaf51b30929e159ea83fd3aff68a1f501a0a9aae4b870a8b07a60d12b8df2f1fd10c2857a0a SHA512 5481e6a6acbdb1a1a50354a2fa34b6f01acc93a6a2ffcc344f94548fe48246c82411a13455fc3f7ba389d1d9f6b5cc1e6f94e7a38ef240a8d4948f29f8c3d1ff
 MISC metadata.xml 729 BLAKE2B 3af0a9c7963c02bf886eb9d7522c2f1776b9b241afc05ae8e71f93ed08bfc937061f5ee9402232f317a207db84e4ee0ad0f9b7c8ba4b72b8600ab30c90822197 SHA512 997967959d02a36cf5187ab42649e7fb581331141fb92aa0aeee622a996959553824424837c56ea0a3abd44cc0abc40cca04abe819c0a4261944072f681260bb
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 65dbef6a92cd..646c4e88f958 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/fontconfig/fontconfig-2.12.91.ebuild b/media-libs/fontconfig/fontconfig-2.12.91.ebuild
deleted file mode 100644
index 59f25375fa73..000000000000
--- a/media-libs/fontconfig/fontconfig-2.12.91.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal readme.gentoo-r1
-
-DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
-SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1.0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
-# default and used by every distro.  See bug #283191.
-RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( =app-text/docbook-sgml-dtd-3.1*
-		app-text/docbook-sgml-utils[jadetex] )"
-PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
-	virtual/ttf-fonts"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
-	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
-)
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
-
-pkg_setup() {
-	DOC_CONTENTS="Please make fontconfig configuration changes using
-	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
-	overwritten. If you need to reset your configuration to upstream defaults,
-	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
-}
-
-src_prepare() {
-	default
-	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
-	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
-		configure.ac || die # rest of gperf dependency fix, #631920
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local addfonts
-	# harvest some font locations, such that users can benefit from the
-	# host OS's installed fonts
-	case ${CHOST} in
-		*-darwin*)
-			addfonts=",/Library/Fonts,/System/Library/Fonts"
-		;;
-		*-solaris*)
-			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
-				addfonts=",/usr/X/lib/X11/fonts/TrueType"
-			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
-				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
-		;;
-		*-linux-gnu)
-			use prefix && [[ -d /usr/share/fonts ]] && \
-				addfonts=",/usr/share/fonts"
-		;;
-	esac
-
-	local myeconfargs=(
-		$(use_enable doc docbook)
-		$(use_enable static-libs static)
-		--enable-docs
-		--localstatedir="${EPREFIX}"/var
-		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
-		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	# avoid calling this multiple times, bug #459210
-	if multilib_is_native_abi; then
-		# stuff installed from build-dir
-		emake -C doc DESTDIR="${D}" install-man
-
-		insinto /etc/fonts
-		doins fonts.conf
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-
-	# fc-lang directory contains language coverage datafiles
-	# which are needed to test the coverage of fonts.
-	insinto /usr/share/fc-lang
-	doins fc-lang/*.orth
-
-	dodoc doc/fontconfig-user.{txt,pdf}
-
-	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
-		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
-		rm -rf "${ED}"usr/share/doc/fontconfig
-	fi
-
-	# Changes should be made to /etc/fonts/local.conf, and as we had
-	# too much problems with broken fonts.conf we force update it ...
-	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
-	doenvd "${T}"/37fontconfig
-
-	# As of fontconfig 2.7, everything sticks their noses in here.
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Bug #193476
-	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
-	# config files.  If we install as-is, we'll blow away user settings.
-	ebegin "Syncing fontconfig configuration to system"
-	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
-		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
-			f=${file##*/}
-			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
-			else
-				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
-					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
-			fi
-		done
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
-	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
-
-	readme.gentoo_print_elog
-
-	if [[ ${ROOT} = / ]]; then
-		multilib_pkg_postinst() {
-			ebegin "Creating global font cache for ${ABI}"
-			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
-			eend $?
-		}
-
-		multilib_parallel_foreach_abi multilib_pkg_postinst
-	fi
-}
diff --git a/media-libs/fontconfig/fontconfig-2.12.92.ebuild b/media-libs/fontconfig/fontconfig-2.12.92.ebuild
new file mode 100644
index 000000000000..c305817adbd0
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.12.92.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal readme.gentoo-r1 versionator
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1.0"
+[[ "$(get_version_component_range 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( =app-text/docbook-sgml-dtd-3.1*
+		app-text/docbook-sgml-utils[jadetex] )"
+PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
+	virtual/ttf-fonts"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
+	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
+)
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+pkg_setup() {
+	DOC_CONTENTS="Please make fontconfig configuration changes using
+	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+	overwritten. If you need to reset your configuration to upstream defaults,
+	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_prepare() {
+	default
+	export GPERF=$(type -P true)  # avoid dependency on gperf, #631980
+	sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \
+		configure.ac || die # rest of gperf dependency fix, #631920
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local addfonts
+	# harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts=",/Library/Fonts,/System/Library/Fonts"
+		;;
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts=",/usr/X/lib/X11/fonts/TrueType"
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
+				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
+		;;
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts=",/usr/share/fonts"
+		;;
+	esac
+
+	local myeconfargs=(
+		$(use_enable doc docbook)
+		$(use_enable static-libs static)
+		--enable-docs
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}"
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# avoid calling this multiple times, bug #459210
+	if multilib_is_native_abi; then
+		# stuff installed from build-dir
+		emake -C doc DESTDIR="${D}" install-man
+
+		insinto /etc/fonts
+		doins fonts.conf
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+
+	# fc-lang directory contains language coverage datafiles
+	# which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
+		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
+		rm -rf "${ED}"usr/share/doc/fontconfig
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# Bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
+	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ ${ROOT} = / ]]; then
+		multilib_pkg_postinst() {
+			ebegin "Creating global font cache for ${ABI}"
+			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+			eend $?
+		}
+
+		multilib_parallel_foreach_abi multilib_pkg_postinst
+	fi
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index a6715bc13d30..044553d8a58d 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -4,8 +4,9 @@ DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e78
 DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
 DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
+EBUILD gexiv2-0.10.3-r1.ebuild 1302 BLAKE2B 43e272b98068e32d329e71766eadde4dd3b3ae9da04fbc4ac6a06d5fdffa4a0daca322f898e80a52209c4510a6657eb07d6a2fded3b8d52f54ce6896f7c3b199 SHA512 0d1c228ed35c68803b4c6b93f263b00667e6affe60b1e1066290f4a095de558e8c88e049f1f7450feac5f6e6810c233367f4a88ed96b35ac5a8812d7f0b3df25
 EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
 EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
-EBUILD gexiv2-0.10.6.ebuild 1287 BLAKE2B 105b3830f92130d6a0f80de4d851722578540a2a4203eeaa7ee630d2d84ee9bdf69a08e5aac58571a4f02f0a7141f336d1765b1d63fd07cb33b32e67be8fbbff SHA512 e63a5e7c7928913f8ee1ad51c2a48133fedb6d78e784c02ad21135f657fed85135e290a09a28955e89fc4ed7bba19d54f97e7ec0be84d03661a14b7923c306dd
-EBUILD gexiv2-0.10.8.ebuild 1402 BLAKE2B 9bd3d8681eb074f05890202ec3a29f6e29c7ce8ef93faa075062afff72f893fac913c55af3020bdca8ec00ce77275d23711ecd20baa7d1ec92ffccdb2fa49441 SHA512 f3679506189cf3bb8eab1561212a0ad34a6f4ae77b564cc7e93c3b38dea9ba630bb87dd1fe8b51a51cff4768e4dc17fe1c594b220cc3010e4df7beb28e60b4e9
+EBUILD gexiv2-0.10.6.ebuild 1326 BLAKE2B 2a08ca7e489a0b8751a253c9e53ad2379b5d1d989afbdb450e2e0413c9e4bb609e24acbe9e6d83924e3894e8ac15793f39cdf0bf0fc9e632e58f2fb56ff67e5a SHA512 ee6ff6a1d9162d0c8e5001770b8f22c5b53699b49fb78628e92f0463d1fa441d35b87d6476094ff2f3670b1e797986573219e16ea9c538d859980b2987069afe
+EBUILD gexiv2-0.10.8.ebuild 1512 BLAKE2B 726883a9f1882136c6bf1a476c0ed79959746b142d5b2cf45cfae43305e6b1f2465377a76c933fe2294f84279446f01c3d25018a2a869bcbbfb9552193b62999 SHA512 ce0021f2cc5ac31969d8089af4c5eebb63651fdf48d994a5072ae35000050e6f01791b082713de4044245cc445ce17a035e1da9a6568a8805be32605be312e2b
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..fc6047cfb1f1
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="introspection python static-libs"
+
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.1:2
+	>=media-gfx/exiv2-0.21:0=
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_environment_reset
+	tc-export CXX
+	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install
+	dodoc AUTHORS NEWS README THANKS
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+
+	use static-libs || prune_libtool_files --modules
+}
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
index 73d79469fb5b..4adf9967d4d8 100644
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.6.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,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=media-gfx/exiv2-0.21:0=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index 1ace566e3332..268944a20166 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python )
+	test? ( python introspection )
 	vala? ( introspection )
 "
 
@@ -31,6 +31,11 @@ RDEPEND="${PYTHON_DEPS}
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	test? (
+		dev-python/pygobject
+		media-gfx/exiv2[xmp]
+	)
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 45bd9c38d67d..a491f2a39651 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,6 +2,8 @@ AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e1
 DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
 EBUILD gst-plugins-bad-1.12.3.ebuild 2812 BLAKE2B f6ea1539d722daf9296ea0c1ce99653f709e36297e0c04ccb1ae45705ae3ee11325036e892aeffedba002632f2379f0c7486cfc92b67fae76b69036ed58b1ac4 SHA512 27e72cde6700f40d738abe14e709072326ca2af3e556b65acd09604b472168f7e705808c8756edc8d14a1992c8091a6065c2500cec6aa9cbbdda137a229a0bc4
+EBUILD gst-plugins-bad-1.12.4.ebuild 2820 BLAKE2B aee1cc3a7300311f8b38b871a008da579e09a191314c5b67b8fb2f693b55b741c8ca1553a02db87f41146e2968c933d6eebcf8b974814e4c626feb1fa28ee432 SHA512 9bac5af30497f909d88de86c48eb60e1dbec0bc1941e1c2a347a2ae164c725d418c4530ef9b1815e863969a08a9eca57555b3b2c81859d00389ca35ce5ef088d
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
new file mode 100644
index 000000000000..8475f11a84de
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit eutils flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
+REQUIRED_USE="
+	gles2? ( !opengl )
+	opengl? ( X )
+	wayland? ( egl )
+	egl? ( || ( opengl gles2 ) )
+"
+
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	opengl? (
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
+		virtual/glu[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2 ; then
+		# Actually enable the gl element, not just libs
+		myconf+=( --enable-gl )
+	fi
+
+	# Always enable gsettings (no extra dependency)
+	# and shm (need a switch for winnt ?)
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable egl) \
+		$(use_enable gles2) \
+		$(use_enable gtk gtk3) \
+		$(use_enable opengl) \
+		$(use_enable opengl glx) \
+		$(use_enable orc) \
+		$(use_enable vcd) \
+		$(use_enable vnc librfb) \
+		$(use_enable wayland) \
+		$(use_enable X x11) \
+		--disable-examples \
+		--disable-debug \
+		--disable-cocoa \
+		--without-player-tests \
+		--disable-wgl \
+		--enable-shm \
+		${myconf[$@]}
+		# not ported
+		# --enable-gsettings
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Tests are slower than upstream expects
+	virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 94ead838434f..f8f07de24ff2 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,5 +1,7 @@
 DIST gst-rtsp-0.10.8.tar.bz2 567670 BLAKE2B 10c01001a53daa039b1c48917fcd31ac0f6437d365bac2aa6b70d0b43cb94df89ab1d2a55b8fc89f5e04efffca142f99fe0f96a1c2708acc9a062f4f3a01cd8d SHA512 c5020cffa9334b7d9c6b9dbe6f32bd4580eeee1c67689269d232e954ef9d96d8b988e3fb19da89701eae26419df0bf6de5796f7780cfbedda4c07154b1c1ebd7
 DIST gst-rtsp-server-1.12.3.tar.xz 631392 BLAKE2B 97d401cf79dd99e0b8869c454b9f4de8d9c87b2ab2382e627f60759f69b1b25a8b071ed5a7a53bd5641482390e8dfc691512bf367efce57d3fa9223e7af1cb4e SHA512 cab130bf57692852827864ac9156bdf76dbcf0691f6ce6fe04a7176123b2e3ff4637edbffb3c5b14ec1db6d5c2c4f3460ed54a5ccae98aee9547af45d0bc82a7
+DIST gst-rtsp-server-1.12.4.tar.xz 632488 BLAKE2B 86c9734128a34f3c3bb983133475ab0fd43a2ac79a76dcb1470a97165feca4a6b9b0c9dbf9177fe47a263eb2a192e57992eb767ffc938f7b0a026a252181dd2d SHA512 295c27803b22ba58fcbc2e2509246d64bb6bc038d8ad8b9fe5b82c75346cccff49c61157fb05e9557e45bcf791cc7b7720aea6dd2e23e9922a345da426f291f1
 EBUILD gst-rtsp-server-0.10.8-r1.ebuild 2664 BLAKE2B 1bfce81aa8708ae23b01096abd90c08e92c58a55c1126d0df3dbd9c50a78e09915c599ac7a32f3fcbe6ab3793521e3b74a6ec20add132fd7640d157a2267e900 SHA512 2c521e305cc9d6d759011fc85e51d9ea861d378aff73683b40a43af995481829d3c3e2d19fe2caf066b1f1d9e852b0f992b6f9289ef34b4b050ad22f33b5e464
 EBUILD gst-rtsp-server-1.12.3.ebuild 1965 BLAKE2B 23bf4e165f9ac43d23e6b899a1a3cdcc4c5af43550591f2a2db05b38f016a32658e15e53cf6bddbc6171552b2fe684cf85d119f10980c3d75f407d121f980b45 SHA512 edafc2800223827f6463ba67434ed751c053a2e8a0b83e7f53c837973399eeff216f4a067e987099c6a10e19e6673dee7776e058d648b14b44aaa55d54663aa6
+EBUILD gst-rtsp-server-1.12.4.ebuild 1967 BLAKE2B a1af7b6617bdf0182f02d6575d6aa1f53a29e9defa26a34dc33344c97a25aee5359688c7a48238fa147519af0fde37c0c521bbca7f485a7171f16edf391cdc44 SHA512 b0780eea12375d224bb20a39696d38ba6c69b6e78a1ace5e8e5286a97db66f35b414bdbd4dccf4f11610b320f92c7b14ba3443b3e9eaad07f1a5fd0744d37e9c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild
new file mode 100644
index 000000000000..80836e844b80
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.12.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://people.freedesktop.org/~wtay/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# FIXME: check should depend on USE=test but check is losy
+# configure says good and bad are required by macros forces them to be optional
+# they are only used in unittests anyway.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/check-0.9.2
+	>=dev-util/gtk-doc-am-1.12
+	test? (
+		>=media-libs/gst-plugins-bad-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	)
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-examples \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 2b1ae6ebe28e..6b9a4867bcdc 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-editing-services-1.12.3.tar.xz 1061796 BLAKE2B 250983e470a607f5734a1dde799223521f3918f2c985ddc9995f4a9720e7ce7147a60f9d90b71be65f06f3caf7fe0428d90a7f9395f31930f06fc18b9710ce36 SHA512 18f2ae1e04e5848221f45728b5d4002549aeaaeaa39af58410666fbc6ab01971900fabaa92cc3d17f910c4d4d5dc691689aeb7930164a24a6b9c49709e7fb669
+DIST gstreamer-editing-services-1.12.4.tar.xz 1062972 BLAKE2B e2f401e419e793a37b3deac71696326f6d2c7491d7a138c40de8af46f2bd5ba415b56b9656a9d225d9704e3339b15aee3e587299441c2b75633a7792a954d4b3 SHA512 b845fc897384aaf691a9dcbf26e6ba682c9eca161e0ad227f47fb0865527d05254fd7b08d082e824a026bfe6909efe8069e3205e209a2e6dfce07f5a7d18dfdf
 EBUILD gstreamer-editing-services-1.12.3.ebuild 1585 BLAKE2B 3839f34cab169b1097a8b55dfaca313ee7d32899d65997e02c8f98c6d50718b22259f566cd65039f7b5ad5ede8cbe609f4ae2949ffebcc2152772add714e9e7a SHA512 21c64e866ae08c7a6e3e462202b1c8f6f15036a6e730c88dcf0e3c798fcbaa20b0f5b1475667815c29a86d4371adc7cd1fbb46ccbb1e919eabc3c8b89c58da2c
+EBUILD gstreamer-editing-services-1.12.4.ebuild 1587 BLAKE2B 00212c2e67caaf023042e899a825ff791cf79125bdf70272b2c3f1b023dbf4c17b13a74f40f2d011fc3d66f6ffdce3855456b4443a49cf463d7f204c40576cf0 SHA512 72f2a72a67c3728210dce4963315906a697209991b31bd2d33e12890868cde6daefb9844380d579ab45e9720def816ef92ced385ddc42f6034db78b5dea21365
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild
new file mode 100644
index 000000000000..7d6f89bec6ff
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.12.4.ebuild
@@ -0,0 +1,57 @@
+# 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 bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gnonlin:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 4fdeda916754..cf725ada7f74 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,9 @@
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
+AUX gnuplot-png.patch 1093 BLAKE2B 0f09fb0575c4b35d22b33c0a669e1c5c61bd07e698a44c2b295da37413fb3ae4fc0ac952208b2cee5b20ac374c1f96554c18e7b61b46811b574a2f1ed009f744 SHA512 128602fee63a9ca4b99200dd4c1e3b183f0f1fe6d2109975fc2de0f41476a3ea39c443e6191099a4972d32b7725c08a2e9dbb1bbc1715d73238d85f491c8bf69
 DIST leptonica-1.74.1.tar.gz 11707064 BLAKE2B 8ffc9c2c0f9ffb83a5ab91ed27a17b3fd53ea550719f302ac0447f1768746ed7b14b324a2486061200984905f33df78da82cb2c19173b17fe8a66eeef51a84b1 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
+DIST leptonica-1.75.2.tar.gz 12377982 BLAKE2B d2d52a5237f23a812ccd1439a13f579e5a21db51d5f9a00ba6d7d108bf9ab084aa4a032a6fe092e8f302628357a4e947064647b34496aa7c5b02c89f78497c4d SHA512 b5107673d1b94b936105cf9795e349c89bd58b80f5947f8e041867b052580215f4fb5bc728cd893c11082efdde11158562a1c93ad53387b6ffb33e7b9e089efb
 EBUILD leptonica-1.74.1.ebuild 1668 BLAKE2B d90ab773cef1d51ca2bbe38c13ebe0c412ee15dd265b38f3fa3ed2b57e18d12766928445b1ce9fb714965908b36513be995c8a97fca74a2e2879bcfd19be899b SHA512 4b114487e1b52877be9d4d85aa06b0340231565f4696682144d20b12403b78f086d7067ac0d1c388951c3ed99b8a5541764892391da8c9b0dc2c3dc256964815
 EBUILD leptonica-1.74.4.ebuild 1715 BLAKE2B a37760d4318cb5579447ef37f76391e7c3cb29bcac946b27421cc2ac67d287b496e231efeea5311fd5abe79981d7f4029acc949e0589412c365154c43ea5c2c2 SHA512 0beb0bdc9dd6736d2092b4cbd2cf00cd8454778ec9042d338f2abcc2b8a58fc9e721483e689eb34dede11144c3c7f3aed234ab3480210b946575208ff20f4784
+EBUILD leptonica-1.75.2.ebuild 1955 BLAKE2B 7dc81a47fc99dfc89fa388ed44a032659193969d3dcf4251130a0f23e39e9fd3f3afb20428142bfbc5289fde9a70b690ba21afa6842f745eadf4e115f1788ae6 SHA512 cf52396e2f12d8baa8e8642e8530cd2e2d84f4233ee24260cb12472fcb055c1854298224d061a178c2932ced0f45e669e54e0825fd10ac5d8bd232020c456d14
 MISC metadata.xml 584 BLAKE2B 577358c352b0d57e1c73e93ec313eb799a577af32893be3d77b2f68769493e5db075af57a2951541036f0a43b19933e9580fcc147d259462e78fb850bbf90a55 SHA512 be7f1725bd6c5807b12b4ef4f1d602e80e79637262c442d98f828fe8f1615092bdf603b56d72203c23bc32c847a7a35fbf7c331787c1afd86b3cbe051d5bf55b
diff --git a/media-libs/leptonica/files/gnuplot-png.patch b/media-libs/leptonica/files/gnuplot-png.patch
new file mode 100644
index 000000000000..4e87fca73b3c
--- /dev/null
+++ b/media-libs/leptonica/files/gnuplot-png.patch
@@ -0,0 +1,29 @@
+From 1b3c9b64ee204b3f9371cea624c959b3177c9c1d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Tue, 13 Feb 2018 14:37:32 +0000
+Subject: [PATCH] Skip gnuplot tests if it is missing PNG support
+
+---
+ prog/reg_wrapper.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index bc60c82..4afdc08 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -32,7 +32,11 @@ TEST_NAME="${TEST_NAME%_reg*}"
+ 
+ case "${TEST_NAME}" in
+     baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
+-        which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
++        GNUPLOT=$(type -P gnuplot wgnuplot)
++
++        if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
++            exec ${@%${TEST}} /bin/sh -c "exit 77"
++        fi
+ esac
+ 
+ exec ${@%${TEST}} /bin/sh -c "cd \"${srcdir}\" && \"${PWD}/\"${TEST} generate && \"${PWD}/\"${TEST} compare"
+-- 
+2.16.1
+
diff --git a/media-libs/leptonica/leptonica-1.75.2.ebuild b/media-libs/leptonica/leptonica-1.75.2.ebuild
new file mode 100644
index 000000000000..d72072546d55
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.75.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+
+RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	test? ( media-libs/tiff:0[zlib] )"
+
+PATCHES=( "${FILESDIR}"/gnuplot-png.patch )
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+	default
+
+	# unhtmlize docs
+	local X
+	for X in ${DOCS[@]}; do
+		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+			"${X}.html" > "${X}" || die 'awk failed'
+		rm -f -- "${X}.html"
+	done
+}
+
+multilib_src_configure() {
+	econf \
+		--enable-shared \
+		$(use_with gif giflib) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k libopenjpeg) \
+		$(use_with png libpng) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with zlib) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+	default
+
+	# ${TMPDIR} is not respected. It used to be but it lead to issues
+	# and there have been long debates with upstream about it. :(
+	rm -rf /tmp/lept/ || die
+}
+
+src_install() {
+	multilib-minimal_src_install
+	prune_libtool_files
+}
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index a67cdf9b41ae..b056acceaff3 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -14,5 +14,5 @@ EBUILD libebur128-1.0.3.ebuild 1159 BLAKE2B a284d1752c4c0d780c24d8c4ef6a291f824c
 EBUILD libebur128-1.1.0.ebuild 1069 BLAKE2B 44f6662374f5799fe69bc3a301b78b78f30eb02746e08395a5a4f755a1cb460989120981824a3eb9a582488a88d972604648b7a0f8767262951c588a9a8dc491 SHA512 897b218e80356300bcf6494816db7dc487591a21ca35764b34ee7237377b4f9c37b4e3c2eef522ac4469061fc2429db07a016e30ca498b3ffe92763ee85cf5d0
 EBUILD libebur128-1.2.0-r1.ebuild 953 BLAKE2B b25cb6ba208c8db3e762982e16b661e1d4ed82299065be01a59a82dfc1d149b64275290ee630b4cac80ff46173511f3c9cacea8d3f0c1cc8a92d602e16bb6d40 SHA512 a7b1ae3173dd6ce3ced5f947750b4fe223f4d468746f77df471a20753439534269ec3b8b6fc9288cffb80f60d15e84debe165a9a3f8fb7d631d3ce4e7e73889b
 EBUILD libebur128-1.2.2.ebuild 1042 BLAKE2B 134d30fcf7c5df32823c76d719fd0ee6ed74529c87461fc662110c705ddbb572132d0757ca5b5db8a9e5cbb0cadbff0230213212e1a41a50fb0b12bc4c1266d7 SHA512 306c3e3fc377c252b347a9acc2a3376bc1e7ad152272863dba45b508fb32a1dcb9faf9cbbe3e482cfd174ed4e71cf990499d8b277321d53287be9bdbb74c4d57
-EBUILD libebur128-1.2.3.ebuild 967 BLAKE2B 750a7b1895b30d4de47821d9dc4a7245293df55c3a78cb03397b2843a7e76dd91db85dd2953c16be811c78347a9cf78840da23c29c4a05556bd400ce61db7f87 SHA512 fb2f4f70264a495e17d8808d062750ab6f0bd5287a6be69aa1e7afa00eb20c47124430f214ce7eab863b3fdcf46f8f32931f6f76e51a840b2ce15821b37d9682
+EBUILD libebur128-1.2.3.ebuild 965 BLAKE2B cf2045646b33cb02412db82096346b63f266f2b47ec43a712055a9086181c4c9262d02be1b14434222b6aad03d50b6d1607c96f87ebc958f2005ecfa8607dd49 SHA512 717bd127e7813297823d1ae48ae1a63a2f3c7eb33f576ca9256bbf81a1d9ac27f23ba42273e7cf6807ddff238019242e592e7a1eee871036ec97e972bd44b476
 MISC metadata.xml 752 BLAKE2B fd4288cd3e104741b109ce1bfaa4562ec9258940a3b43d58d6a6427a6ded2a762c56907012811e2fd9de363ba87f3978aed62c0b1c9c79e1f9eac4134d1c6552 SHA512 d0117447e87d367f45438b1b2ebd3f238b8ddf97491d8d742bb0f6609e6da4cb155249f86f95a330545c89b6433badd93ff2d26b55a3417990d63612e26b6218
diff --git a/media-libs/libebur128/libebur128-1.2.3.ebuild b/media-libs/libebur128/libebur128-1.2.3.ebuild
index 77ae54e811ee..70f56a616b9f 100644
--- a/media-libs/libebur128/libebur128-1.2.3.ebuild
+++ b/media-libs/libebur128/libebur128-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jiixyj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
 IUSE="static-libs test"
 
 DEPEND="test? ( app-arch/unzip
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 68a5c2871ec8..9098f3cbbab3 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -7,5 +7,5 @@ DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c6230
 EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 6548945f67fed5f9ed96341a1e6f37af9d3e61655a95f23dbe5fdc68fa35c92e913e2e5cb51c744e1ca8dccc7efed3e7cd7776f65e58056349f67fa8854fc755 SHA512 8ed478f8438c0d278b40aaed32831e0b70a591ff426d48fd82015838f1a3cb1bea5cc153d85c36d81d3605069e11812487821a9afb084c36b3f3c41235adc03d
 EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986
 EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6
-EBUILD libopenraw-0.1.2.ebuild 1112 BLAKE2B 529912efa1a990147cf2b8756375a51cc962852342f50f34e9243562f17de88c479dc674a8f09141e7624534647fb08cf88de71c1dc4ef87e4815554f79f3a0f SHA512 c72b8e3823781b0dc818da24181570d2bc71efdd29e0e9040abd726ea806f02d1e058364599e5fc0129b0627b2732e6f7e3bec906c47a7b6ea6e9927eb2f07de
+EBUILD libopenraw-0.1.2.ebuild 1110 BLAKE2B a60bfde4ea5a33767622601b3b0f93b43b7631a4f455d587314739ed3fdc6fe63560bc9a8c532ecc3d972cfe29c8e483e0ff77cb8dfb82cc87700d4554052255 SHA512 7c6e40ebb83265b7bc1d6726683c484a2ca4ecf5c023de57acd5ff54cedb7a4ad55a0092eafaf5a09fd8a7d47182f6321b49c36b482a97393ed503195e89b8db
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 9d86a2868956..557087a3a2cc 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 44d40886aa70..ca79c028e818 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -8,5 +8,5 @@ AUX mlt-6.4.1-qtopengl-2.patch 2573 BLAKE2B 3a313c170a079b8c036a75773b2e9f8b047b
 DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
 EBUILD mlt-6.4.1-r2.ebuild 5611 BLAKE2B afd7fbeea301840cda11ac7c8855c15f94fe22d8701fe35efe520ec9efae68e6e9342d8c23bf754a48ab150b5f97ed8187480aef4b3334c63c382a38b065246c SHA512 dc24d3812d5452b056ee7e7192f22712177aec8cdf5470e76314a7335f7a8ba849f5dd629b9d6f5c9f873a4b03181cb00914398406106b1aec682b8e8f0bed20
 EBUILD mlt-6.4.1-r4.ebuild 5814 BLAKE2B ba612ea2de197a01ce80ff6a6a618995e44a0abfab61d552a4f06915df3adff9a1d8b00b49cf9480acd39b0550305c18a897355cdb37b8488c36a12645a72aad SHA512 a9dad9ccaf640182da4f94bcdc5f9ce1a7a8cb0462a98b1a01dcaf8781c50b734ba74d0c4f597f6c41b2d1fe2de29f3ad0e73def1562768d30fc2f16fb880064
-EBUILD mlt-6.4.1-r6.ebuild 5687 BLAKE2B 00fdbefaa9c1c8f2609b1ad6d72d5d43f446cf5c3353bb0a03bfe4d8a727eccb7139f8b289be338ec847ec8cc3d0fac49a26fcbc5aeb7feee54fb9bbce27db0b SHA512 4a7046100abe253d3afd9ad5943a3a32f0d417d68197889e326ad56ac42d28b32a484a41e42fa32ae4857c4f3cf74cf211c382611c5387a9b17b15e69d9f6979
+EBUILD mlt-6.4.1-r6.ebuild 5686 BLAKE2B 08fa51de7e7f2f026d47b8d82e519e180a4e40ecb808ffead7d6e15a5ba781f8d9b70de777e66f16582de38c4cea1846dcb8460108d607e77b0e22c4d2b882cf SHA512 aaac36678fd887ac956be2429e2ab674d607990e2be7e3bb88ab606101562309d2711f0d97ccef81dd67b719781041afb0738f79729f85b1584836d836b33a1c
 MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.4.1-r6.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild
index 1d9f408817c2..b19c9bea7a94 100644
--- a/media-libs/mlt/mlt-6.4.1-r6.ebuild
+++ b/media-libs/mlt/mlt-6.4.1-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
 gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
 # java perl php tcl vidstab
diff --git a/media-libs/phat/Manifest b/media-libs/phat/Manifest
index 63d640819265..4f8e0ff8b540 100644
--- a/media-libs/phat/Manifest
+++ b/media-libs/phat/Manifest
@@ -1,5 +1,5 @@
 AUX phat-0.4.1-underlinking.patch 859 BLAKE2B cd3f794f3dec133d493d295f3986f22bc4ca4c3af8393e5d405e18bd2a2cc22692fa6891bc9c59e9aab55135ba72539407d078815b5eef8765d8c0a2765af4eb SHA512 814cf8d980d61e4729db095c2b440a5811dff626f28963d24fa6e37316fc13716da2d63861f796ba2b8e4d5c2141be2bd919f01d5d6fb4cb4cd445ace9f5d0a6
 DIST phat-0.4.1.tar.gz 550910 BLAKE2B ab95b5ed5c0d9d37ff9e12b733368b3b1c3ad90fecec07ca4ae2a803094b2c1b2b743986e9983a95a5be30b8fe3a0e2080e201e6ce6d9567bc02f1c303031332 SHA512 c2d25d4cf2f291a447229ab3c1c779e5a8872d8b0c88a759b7dee437b8ad355eea6211b7d257af96cd3e719098a0da3cff7ffc916281af29bf55eb9c077ff333
-EBUILD phat-0.4.1-r1.ebuild 759 BLAKE2B 4da6ee3b279d2a20b8b33604cac986764ec5777f7a3fa2f2ed531bb1d38d8beb1fb163ee24c97275fc664b4082e709dc901dca2c726a01f6e1b268dc5f27a4b4 SHA512 888aefe9e7803c0474e4250f854bcf66aa7890c4ea88a6f9ceaa33a377ebf16469eebbc04bc1741c06d8d6ba2b07f2d3e47f4e06d4bde1118c2a44a6480abfce
+EBUILD phat-0.4.1-r1.ebuild 758 BLAKE2B 3ce17f008758e93fe76e7856d42bb1c5c1ed711540f78cc8e328e1b10af5e35c1512c6fe89dcd65033d4d81fcea2fd2d766c9907a7a308e5b8c286141944cb90 SHA512 935255f9f66b2c82844f6fc0391d2f7f4f1a8b72543672383eb827ca53ffcc929d86156625a2a65fb924f8ef4cdbc66290f3313baecec958d8ccdb604fff9bb9
 EBUILD phat-0.4.1.ebuild 757 BLAKE2B 0de898f65a1be98c0a1d11d94290e2cbc3e0e3908047928ed8ee2ca05f986556aaa042e1c05e9c35bb93cb0a0692e61891bb6d051daf92a237b07bad6733099c SHA512 fdbfc61ee8fc81680eb9e813ed8a0651b9ea65ccf9173379d671cc1cfa0ceaba8c17b405f5ed2d0f38a08a99ee37f38235b82374e1dabf351d4a68ce4599633e
 MISC metadata.xml 335 BLAKE2B 1660913c7b57ba6458607889251f8459e48444ccf4c62786ab8525e12df434fd684c57663326a7bf028ba398582087777e981afecd54d104b765a990a8eb2f0d SHA512 699f64a5b2b97448646e5fb9562e653dd2996eb419bbedde43c2ba9fdb17a60c6b8b57883a18752a0838d06ca054f724a243dd10d3ea35f8da8db8774f01a587
diff --git a/media-libs/phat/phat-0.4.1-r1.ebuild b/media-libs/phat/phat-0.4.1-r1.ebuild
index 5c9cb0ec0574..c12ef911dd53 100644
--- a/media-libs/phat/phat-0.4.1-r1.ebuild
+++ b/media-libs/phat/phat-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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="mirror://sourceforge/phat.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="debug"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 5fe06a384ec8..f88b0354f3dd 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -7,6 +7,7 @@ DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65c
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
 EBUILD xine-lib-1.2.8.ebuild 5696 BLAKE2B 7560e459258e066d5df9bd939e559845e22f86a63213bababdd6f98febbd26c616c1659ac06dc79bcad3e10d670b539ec735170d257ffa96c57c6123d3164be2 SHA512 4e84e6312fb3df90291680cd338ef336dae7a7835c282c16fd792b33b4112782c8ea77dbca2f72ca42ee9aaa2f4f0940e50184d4e77be2b3e4ff5f33fe58df45
+EBUILD xine-lib-1.2.9-r1.ebuild 5501 BLAKE2B dcbff06850812fe03ceb4ca4eabc8e05821ae671d1e53e06418d531fbf46a8c8c5f5a4f8170a047409c86da3d063112aac64c107459645e35452c2c07bbf81cb SHA512 03c902b800fe65a2e0abdade525dfbe110a662499f38a97d8a4aa32b0e9a91ffb349da51334d8e6aa2f0fb3bf196efe5fde294cfab603e77ed6609df88a505da
 EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
-EBUILD xine-lib-1.2.9999.ebuild 5449 BLAKE2B 03d41975b7a68c73c3331f5be5086042f514a55f28eb16b62117afdab1657909281af440b4ff9a87e950ef6cd7e0f9b9e0bc8b7e29acc0b1a3e44cf37e69cd15 SHA512 7996e99e79a9bd761ce4fe8e0694ab53e8f9c3ea394953489ee0f64906b374a6883d8487e9b0f3229e2f3e1dfd9c6a6663b574ae64475b75023e84c3e4fd993c
+EBUILD xine-lib-1.2.9999.ebuild 5385 BLAKE2B 5be07886ffa9a495a74ecb5c8ba77ac1fb833260a22b17423651ad84ab560111cf9959e67b4e8e5a349e8724cbc51de9bea444e62ac1303b6eced26eee742bbf SHA512 312298cf43fe939a7cdfa489677445dcd04b8be19c94d8ac35132f82c450ca679c3b4a3369ea32937a15c68f21d6de4e38f858b5fd015308fd4c3feed3a708c2
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..1b7e31b6ffc2
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg:0 )
+	!libav? ( media-video/ffmpeg:0= )
+	libav? (
+		media-libs/libpostproc:0=
+		media-video/libav:0=
+		)
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:0=[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	vpx? ( media-libs/libvpx:0= )
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
+	fi
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with fusionsound)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
+		myconf+=( --enable-avformat ) #507474
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 8e2f4aec7966..7938ae7f0b18 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -37,7 +37,6 @@ RDEPEND="${NLS_RDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	bluray? ( >=media-libs/libbluray-0.2.1:= )
 	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
@@ -76,7 +75,7 @@ RDEPEND="${NLS_RDEPEND}
 		media-libs/freetype:2
 		)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
+	vaapi? ( x11-libs/libva:0=[X,opengl] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:0=[-minimal]
@@ -143,6 +142,7 @@ src_configure() {
 	fi
 
 	local myconf=(
+		--disable-directfb
 		--disable-gnomevfs
 		--disable-optimizations
 		--disable-real-codecs
@@ -158,7 +158,6 @@ src_configure() {
 		$(use_enable aalib)
 		$(use_enable altivec)
 		$(use_enable bluray)
-		$(use_enable directfb)
 		$(use_enable dts)
 		$(use_enable dvb)
 		$(use_enable dxr3)
@@ -218,9 +217,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f \
-		"${ED%/}"usr/lib*/libxine*.la \
-		"${ED%/}"usr/share/doc/${PF}/COPYING
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"usr/share/doc/${PF}/COPYING
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index fec7461d3fcb..cf3d2ec8f0db 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index f69cf7b229c3..73d4a86baf69 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 BLAKE2B a37da2f3411bf8a65a65bab2c0acdb246feeda44f7bf843f6fb20a39c9835e2dc9c332683831d628fc861c08c03303768eb728725462abaff417deed43ae2e1f SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6
 EBUILD gst-plugins-assrender-1.12.3.ebuild 405 BLAKE2B 3f29d673d85bfd487956f053d08580298e7c60b9b9847aaaf795dee5ee398b5387ec997d297018a0dc0e2daa8e37bb73f41716548c8dbaa1da5c75db2f9c4de4 SHA512 a277e58ef2ff5d1f0bf83f6a925e606413ee6b32e9f9cf81c1877502dd7bf9201511cea235c2d280148f9cb88c850b6bc73bcc53171fd97f8c87ea072ff1788e
+EBUILD gst-plugins-assrender-1.12.4.ebuild 413 BLAKE2B 6fedf2876d6e4b6be65af3755a3f71281b3f17b18d1bf731e7fc3b8c2ee239cdf8cb4308bccc232bb493497d904812eb05b8f5d9feaf64ec02949496c6b5f695 SHA512 c34980ae2d80729102fa2afe081fcfb2390767ad5d08819e1eb5044e41e4dffc186fe98db7251578922fe31aa4e7ed05851afbc6452ea2076039c1676e365b26
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild
new file mode 100644
index 000000000000..f3e4737a17d6
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 4580763c1814..94750c560e78 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-bluez-1.12.3.ebuild 364 BLAKE2B 2bc231f672959de2fa38605eba27c8cb0ded13593c36f519a01a0502fa0bc10c83da56fe10423b86d755bb5b4fa33ea99a5c8d5a61f5202387b451e4d37d4aa5 SHA512 3af75da1d7c6e85d62062056ff8f6a060a7f7b0ee3928deed2697543b8a521fc15bc3b4c28384a4bf4564e9cf81fb2e5e0d5e86bc6a79a8d3502f781ca90d59b
+EBUILD gst-plugins-bluez-1.12.4.ebuild 366 BLAKE2B fc6aa8561a5d91359be878166aded2272f67b2a406bd4e319ea4a8e4867949a1af01cfdda89e7669f7cbd866da51ef6c574f0a1d132c6d92cce93b6b08f79792 SHA512 b5191160bea35ae7c7445fc754dd5c819bc8e014f1e4251716d315a83b1f507a93ea87fa313d61914772addd3d3f92e47acd8c3423f40ec2fe8c0e46bf621fc4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.12.4.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.12.4.ebuild
new file mode 100644
index 000000000000..7f9ff994bb39
--- /dev/null
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.12.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index 8791f90cf8aa..ba516a50423e 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-bs2b-1.12.3.ebuild 312 BLAKE2B 0cb5f22addb879606df5d3c00b3721db0fd0d820fa3b852a8ed260226554a00e396a5e2d82c5095bcb2bb670590cede91f4a9cd4353f48cc8b141f0190ffd032 SHA512 c7c16c3424de516ecaa9b6da1ba1b4483a0f057aca9479476d0d2a1dda617de56f1965c75d5ba12909f61abf5bdeb0641de4d1cdd8fb9a8e9e4cc20e143ea909
+EBUILD gst-plugins-bs2b-1.12.4.ebuild 312 BLAKE2B 0cb5f22addb879606df5d3c00b3721db0fd0d820fa3b852a8ed260226554a00e396a5e2d82c5095bcb2bb670590cede91f4a9cd4353f48cc8b141f0190ffd032 SHA512 c7c16c3424de516ecaa9b6da1ba1b4483a0f057aca9479476d0d2a1dda617de56f1965c75d5ba12909f61abf5bdeb0641de4d1cdd8fb9a8e9e4cc20e143ea909
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.12.4.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.12.4.ebuild
new file mode 100644
index 000000000000..2e93bd8ed590
--- /dev/null
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="bs2b elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libbs2b[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index f0e090b0ed23..64b16b9915c8 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-dash-1.12.3.ebuild 1028 BLAKE2B 3f180eb619ecde61db15e6e22149e5d48911f44e929673fa014b136fa43143771e1d6716968f24287efa54cd17cc971b4c8b6e3d07a40a56a726608c1f684529 SHA512 8322bbf84175371a964112aa06cecc78df3710cc729bb72d302617b234c97a931fc435349037e82319e875c9f4a52f7c416caaab8c7d580ba7883319b0840fe9
+EBUILD gst-plugins-dash-1.12.4.ebuild 1030 BLAKE2B f72717f1c83cb33d526dcc129b5c29e5681680b8a06e0cbf7aa9016321d1346c3e7e34625d8f379a36f9108f5f5e3b14b9bbd7fe1e17f01e76e5930a246d5410 SHA512 7b5c2366dce56241c270a2dd70f086c9229d14ffbcb3d2626cdc727ef5ebf96e5ceade9482269432ee30e92228938e5c45d1cf5e7b4367b3f05f23fa85abf733
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.12.4.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.12.4.ebuild
new file mode 100644
index 000000000000..efd76c4a7148
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.12.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-DASH plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 0b577c08007e..3a3b28646e4a 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-dtls-1.12.3.ebuild 429 BLAKE2B 5664e661bca8cf34ac98342a00fa5be78abab865e1b6868d14699f48b1ace5f4e99ea7b5f4f9601dbdbfbda961f10708d5370727168da69ce854d66778f389f0 SHA512 dd4419a171ab74aee86721d974aa0dbd189e7af23b95608fc720af7848352ae859738452b50c7353255bb059f482caeffbc5578109aed0d5eb33b8c6369735ca
+EBUILD gst-plugins-dtls-1.12.4.ebuild 431 BLAKE2B 438e0e7972cb753d061d9c726801fa4b87bf89e68b30829c038d41f60f89177a895b94ea93e851d612839738eb58d1145f7c7747bd6e53da5fcc77a2f0f64860 SHA512 490fe683230eb0d1fee1c433345a6634f4ee1256c6cbdaea11f5a93df7e5733859a3e0389444addb59c7b7a577c1af9fec0583efe191b3e97c7cc85aa86aa9eb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.12.4.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.12.4.ebuild
new file mode 100644
index 000000000000..6d4627c88f1b
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index af28b0c9d85c..be257331ea4e 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-dts-0.10.23-r1.ebuild 429 BLAKE2B 6d3a3b37963e8c5d4c24b67cd054b7b017824706dcf55423c4491b6af1e4b7a6959cd9f10fd3ca95d769cc507823c7dba905983c7ddd0b26c663ab46bce58761 SHA512 3ed3310eb7cea909bf38a75b87f651ce8685e727525c28b4b26fadfd5011cdf57fa72743f6df843b0dffaf9967d66bfc438b626a07782162eafef1b65088e6c5
 EBUILD gst-plugins-dts-1.12.3.ebuild 423 BLAKE2B e91deb0013a50b11d4743df963f7ef636627efbf0ff7fff1e3bcdc33e87e458a465b246371405c36cc0b545820a77730e6764a9b504700c15488077a46a2aad0 SHA512 2ed7c59fca047afe9b7eefbb0a75a503b89ada04dff164db032aa7ab5b7f484f56d38c2824dd2d0944d5be0e8eb7942294b717a1d6be00ced7e148de1689ce80
+EBUILD gst-plugins-dts-1.12.4.ebuild 426 BLAKE2B 637ee4d31c475d2236c803474b6a3f39d4bd17ad6f5b108128b8f367ade5de09a0636ed48d49de72a423d544093e1f49464f366047c075062438462981ecd595 SHA512 e606f05a3b68e8208b990db24f974b871adf62aea8b3f1e2d0895f5989fb7ffc9a25299286c8c849a596654c7bafad0d91edfe92c0a169db830f7bacd5a6283c
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.12.4.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.12.4.ebuild
new file mode 100644
index 000000000000..627738a42860
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTS audio decoder plugin for Gstreamer"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index f60d60d8f3cf..160f7374e35a 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-dvb-0.10.23-r1.ebuild 321 BLAKE2B 5c391b84793fc06dda951b5a779be73cd69489f09e256ef6c801b7110d72da926e0b5eff2f4d9fd122f683ed0e8846775b58fead0956f8049fcaa8600782b8c6 SHA512 2853b009153861de3710fb1facb4b0f08a8b0cca9ead928f7b8dd773d32de9ed373c2884cad48345ae44356fb8ff00d31652d4f9f1a34a9fa5d8e3629bc63def
 EBUILD gst-plugins-dvb-1.12.3.ebuild 407 BLAKE2B cb75baad3aa8269fce581ab60a54295f8dabb901bb0ff1c548895f7e4c1cb2ed960781ffe418ec1292e1b6b68863e58602546f0b39f9445be624dc782fffb7f0 SHA512 f4ede304cc3f3dfa6472c4516ffb0bcda46f8f849b0c7bd3754b3f5f59a84fc08e046ebaf01510e4c7e986a4b1fc94be9a29229b192d3bc6baa2a1dc8e810ba4
+EBUILD gst-plugins-dvb-1.12.4.ebuild 413 BLAKE2B 704c4128adfec4917b2fd7bc6b83a8a82cbff803995186e8d852bb9dd2876aaff2ef4ea0d80d487a577397e8aee4d6cf7be9503a0f7fe43387935f0a58bbff76 SHA512 a6f71777395c52e6d6469ffddc5204ffa914e87e567dfcc5aece3defb5297091617ea0728aaeac0b0a975db6b9e3fa0fdd5d41e9ff27e152b3a97ce3ae1d82dd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild
new file mode 100644
index 000000000000..cc96fb3a8873
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.12.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPION="DVB device capture plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/mpegts:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index d96586986530..05a87a2f2324 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-faac-0.10.23-r1.ebuild 308 BLAKE2B ce6856e16ad97ca843b0f6f0d6184895721c50059747baf672c78506e96e021eaa2f44017881850c0e20a50b2fe27edb7f180f6fb4141968869548654ee11f81 SHA512 f27ed34767f0e948b9bf03baa96359690783610771ee0b6421a30e7997c38f7abcb079060ae5b51c43a6a93b097fedf891a97ac999e1dcb5b1da04cee8148504
 EBUILD gst-plugins-faac-1.12.3.ebuild 359 BLAKE2B a78b366c09ea383b157a1ec537102382de7d804e5fc6e5a79c4342c31917fc30dd0fba150c20954165f9957484b2cc14684c7dbaf19cb4100006706993644406 SHA512 b2077a786f13606f36d48f6091bb0221255df7597b3f47d0e09d04cc8d1939dd5199dadeab5f534cb7f1baee4e6503db74ebdc1b50e4660aa1013836265e6210
+EBUILD gst-plugins-faac-1.12.4.ebuild 364 BLAKE2B a6354f240447883191178b6783f69b77f2583f3dc531501f3c98dc0e2b971533edbed8d8450c17b414c4e9d4ea07ce430e87adccd02dff620208dc8ae9e45875 SHA512 c01156f97efce09e8808686cb14f5805d6265f47a35b2a7c4383a0803ba573bc9f50102e4c53dee99139a85a44f37effe38dab19080fbde1963d2a8142060125
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild
new file mode 100644
index 000000000000..05649df8b58a
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 1c803b786481..ab32c68da818 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,6 +1,8 @@
 AUX gst-plugins-faad-1.4.5-version-check.patch 1428 BLAKE2B 5ac173f28ffa289913c9cb6a92209efb56cd94ee7c43e6ebe9124f821c3b67ab912d1abe2b68f1165a117c5c48a36dcdffc74d5922e2c79079f5a5d34240ee04 SHA512 50d1b170cc8ed01dd8eb10f7bf55d5826ba830be2296767fe050e2e1320b2c4b953db46148d4d257abd911f85b2057d0ca35ecf1f73fd54b6a71ebd3b037c73c
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-faad-0.10.23-r2.ebuild 491 BLAKE2B aa9f09d4174849650d316c19018779d87f078830d9ee5a94f0ef3c8031debf135cf90c06d46b8d4d97ef77d910d80e3496d4e70358d90414326020eb59198335 SHA512 921f66afbb23c737d62338c425952835bd7fad9572d2638a06baddc54596323e7a059b1330001f42a875b5263baa1e9bc591818120b00fec49e216e915664bb0
 EBUILD gst-plugins-faad-1.12.3.ebuild 379 BLAKE2B 65689dede2c7dd876c1173a0bd4dd5b4851bb6895779cc9db47b26559f090da1d0d6245101403f0e5c1a60ab7d9429c5519d1794644753d21572dce86bdd50d0 SHA512 632573a91965364fd267578cfe265478dce689663cc451250f16511bf63f4446cdc98065c2c3089fdd8b93086d13563741e195ebb5fd54fad285a4097e75797c
+EBUILD gst-plugins-faad-1.12.4.ebuild 386 BLAKE2B 73c2dce2a335504997b2616733438c5072232d0026c93c5c930f574f39ca86947fd5adcba6d93edc18046c8e5b16127dba204173944d5d8de7763828acdaa8fb SHA512 fa7e1cd47ddd30299558638efc77e5f9b7b43c6de0d8e331e4a216ed2b8c4a0d5f588132fef8e3bf8e90f5ed38ba54e5ebaa709552b59368b1d8ac75fed9bf0b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild
new file mode 100644
index 000000000000..d9a5f9b06f01
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio decoder plugin."
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 52d5f14b3773..7c86fd0c34c5 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-hls-1.12.3.ebuild 1123 BLAKE2B bb803bc3ac3503cf6a2d63865e25b03f367ff3e24a6e096f088010340904ebf305992a34f2d4a404e769e12382cc5b832a34d1ac5d38f1fd2f75e7eb83c9f868 SHA512 72ac7c5c4f98bbf75b4c9dbc988d624d11f40a51dd391bd63e2b52c3fceddb69157e084119d65354e068e0730252b10513a1b00c3e45a8eb2014b8fe3e29ad86
+EBUILD gst-plugins-hls-1.12.4.ebuild 1125 BLAKE2B 68a392500de7ad8071a9f82cf2c77305dcaa06dc568cd3f2d5887c87f17b03a8241929b0c28b0aa8cb1b75baf0b7eaa817ef3d8728e2430485009ccbf74e5d6a SHA512 0233504d7bdc5b36b1577b137ce2ca5fcf94c661d117d73e7fa33a0ca82f71457448f878a98252ff1eb15f60558a7cc1d5334ec65d936da9e3819315b2a84ef0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.12.4.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.12.4.ebuild
new file mode 100644
index 000000000000..058ae72347cb
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.12.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP live streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-hls-crypto=nettle
+}
diff --git a/media-plugins/gst-plugins-kate/Manifest b/media-plugins/gst-plugins-kate/Manifest
index e6a4a99966ca..b382354f2c0f 100644
--- a/media-plugins/gst-plugins-kate/Manifest
+++ b/media-plugins/gst-plugins-kate/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-kate-1.12.3.ebuild 390 BLAKE2B 48800001f0b2401b6c709fee17ed06fddeffa2920fca3e5a919d0dcfa417a465afa5720d9935d19b1053f29eed4f59a909a2384fd7bdb90fe32a96b890815d7b SHA512 4c011d0ea0e6e4728e36311e23fb9b86a23a1883934e1e9d7f192cf20fd34e868e910c0a53754a2de1cd21d1f84a640af599461fb74ee1742c70dcbe98620283
+EBUILD gst-plugins-kate-1.12.4.ebuild 390 BLAKE2B 8795d832c281c2a40864e3297a037f6f5942f0c25cb67fd01d4612dce9817a6bf961a6d0b93a7c403eb7f647a48f724eebfc727c797e2038de181d2996511738 SHA512 30b6266fb339b27d10267efc8b285fa42646eac68f976cdb730a56dbe7366c1687488b357f716a938b9328b3a7bcee2f33b164ef646a422370cce815a254277d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.12.4.ebuild b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.12.4.ebuild
new file mode 100644
index 000000000000..fc6da4008477
--- /dev/null
+++ b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Kate overlay codec suppport plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libkate-0.1.7[${MULTILIB_USEDEP}]
+	>=media-libs/libtiger-0.3.2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 63d829366e04..d674405550bd 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-ladspa-0.10.23-r1.ebuild 524 BLAKE2B 1dba58d3c37d3a4224c29103380dce11839117d29019a79822d863eaa5ff2c711d703be170ecad8eebe172858d6c048a2d81b795b8262ab44ff2b2518f85e13a SHA512 ce82f70d4c060716dc9fac2ed8c8f32c351f15b99604ffc3fc559ae2017a26dd2d3eab469e0894cba18ab27dc5ffbe01c218db38ca5e5c304deafcc979a735c1
 EBUILD gst-plugins-ladspa-1.12.3.ebuild 324 BLAKE2B c8b0b2943579afac0c688ec2d48df2e956531b0f2c8a10f3f4faeb5ce8c23e60a1929916e8a2d2889c8687a181ce94441ebba430506bcbe2af5ce549f3967b92 SHA512 9238f478409222e8409dacfd4b8db805b5b31063c3661885524d7867fc646368352ed3eb3b394fbb1c09b40feda691a6a3f5767736e75464b019823ee718e159
+EBUILD gst-plugins-ladspa-1.12.4.ebuild 324 BLAKE2B 9bd2c2daf0281660da8495c80cae58061bc49d894f9eebab07cba247e8b7cf6b5e3f6e5918c9fcadbf6c129afbc2f500fe76bc9f75d2442101ac7d327d7eda1c SHA512 b74e837660c17d607527d5f17f1686c532e864e89b17bbe08f6d0b777a103e5e8ebde431a14d0d87b6d626b45663c8ce417aa94be7f7b94172e1234c49216936
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.4.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.4.ebuild
new file mode 100644
index 000000000000..6fef906093fc
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 8b0aa72effc3..be1723520e83 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,5 +1,5 @@
-DIST gst-libav-1.10.5.tar.xz 8545300 BLAKE2B 02a747bc7f75e5757d918f8f5213a47be3bb0eb67558a30973f02f5b964c2de51c8737aa7d7e74b11f91128830c8f004ef8493671ff0d49ce5e098ee8139240c SHA512 a0636a3b32a5c20eba69a0002fc549facebb0211774e13dd526a3a1eb710f3342662179af6275d619d5075ad0f6dc7068b9950cfb0c60e3ad48249475b39216b
 DIST gst-libav-1.12.3.tar.xz 8791724 BLAKE2B 1d69be6a581d00ad939c1d35dd6913f03a816d7daee579a00fa3c39a2d936a3dbecfa576e98243fd2db4d3e76d9fa9b7b3799a00223436621606ba134a90c85e SHA512 33b380b7094afe1db57103eeeca5ae13db98a5bee6785f884a7ec8abb93a94f702eb52f0515f4fa27a0f157ecb0757cf3576df335dc456254f9a82567f5ab7a8
-EBUILD gst-plugins-libav-1.10.5.ebuild 2159 BLAKE2B 1c040941a37425c37a55d9e0264cd1ff5433238deb0a01857f53c8cf9a8bab8d05f56383427586186fc44c931b6c0f3119ca605fabf3718fdb3cf0d2637ee1de SHA512 da0df02502a3434bf9b4a961c86c6f7b6611dcefb74a8a7eca815bb5a08bc21ad557f6f2d38839a0f19d10836a14a043bfa821eb8b75c705a46297106db23f8e
+DIST gst-libav-1.12.4.tar.xz 8792776 BLAKE2B 8feb2b6d6b8b0dd018d7e23718112aa803c054e344b190946e598f5af195a7f16c6b10191ff051d74e521b78fc478fcc62a38c4aa3cb5aac303a5b7a16cbda23 SHA512 80ef9b7e179c081996875e452f66a3c5124cb99b5439e15b6ed4edf43e7ed1821b56639eea0db24050f0d5291d2b67d59e884dd71ab9193b5d1820153976f879
 EBUILD gst-plugins-libav-1.12.3.ebuild 2158 BLAKE2B b11928ea20efcd064a9d8c0a9e076e1b6c6ab716347fe519b68c919e384d692954a65a9a2557f08600e8164bee7147bf18978e1428050d957164a464132e8219 SHA512 1372c442de3915736ed162a3c852dc39b22b5c5cbc86e0ffd5c0e33aeb3f0c462751b3b4dd077cbf7e022001c36aeea0ed891015b0f78c5ddd8cf4c4e048f21f
+EBUILD gst-plugins-libav-1.12.4.ebuild 2047 BLAKE2B dcfcf5072cc70400e0aefb5dab89e6df95dbe78aaa33c2a05cb9eb48ef4ddb1c9c78ccb2b3027a233f8f5eccf8e9276aeea69af69e8f8748b8e037f0af9a00bc SHA512 eeb1daf8d3bf1289712a0132f8275e7def15293a5120cda75eee2a56c4487225bc5ce1f28a2b3f66dc00dcf4b94b82c0a91dd6ecb840b0faac43720edccf28dd
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild
deleted file mode 100644
index fc5a98ddae1f..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-# XXX: bzip2/lzma are automagic
-# Move back to ${PV} deps of gstreamer/gst-plugins-base later; 1.10.4 had it reduced for lone security stabilization
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-1.10.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.10.3:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-3.2.4:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf
-
-	if use libav; then
-		ewarn "Using internal ffmpeg copy as upstream dropped"
-		ewarn "the support for compiling against system libav"
-		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
-	else
-		myconf="--with-system-libav"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
new file mode 100644
index 000000000000..6dd48965e1c9
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+# XXX: bzip2/lzma are automagic
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# Upstream dropped support for system libav and won't work
+	# for preserving its compat anymore, forcing us to rely on internal
+	# ffmpeg copy if we don't want to cause unresolvable blockers for
+	# libav setups.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
+	# Prefer system ffmpeg for -libav
+	local myconf
+
+	if use libav; then
+		ewarn "Using internal ffmpeg copy as upstream dropped"
+		ewarn "the support for compiling against system libav"
+		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
+	else
+		myconf="--with-system-libav"
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		$(use_enable orc) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index 7231dfe9140b..2b1dc7eea64d 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-libde265-1.12.3.ebuild 324 BLAKE2B 33fd585db54535c6e0ff9ccd8bdb8fb049ee9af89596d93041cd510b7cdcd6aa5dd237e36317495ef49947f64c4923c855528557d5f3ca4c54c933cedacb302e SHA512 fb118cdc78e360fd57100c52dd029655c8d1c70a400679c953e704e23da6b5291c6ff9ba093e33b17e0cd1fae56922476e17803a823ec23e2fc0884c0d877c7d
+EBUILD gst-plugins-libde265-1.12.4.ebuild 326 BLAKE2B 487f749f0a91aa22812c84432b9925f78bc76a58fa6344291b01e8d11cc0d320796f24146bf62d95e48ca926665c298c8b4ffa9f2e024db312c37ff297ee3e7d SHA512 04bb8cc7dccdf18364f6060aede2a4ef0e11c89e05a4fea4767ea27b385667c0e6482903cbec55d3151b5b664392ccb9c4cb4f2e77bb2dbad67dcceff9a81b25
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.12.4.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.12.4.ebuild
new file mode 100644
index 000000000000..165812de5a99
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index b3b2125aa320..f99310d0fe17 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-libmms-0.10.23-r1.ebuild 327 BLAKE2B ab473b2e83c130d09803f4f420abeff558bec080dddf0a9de6e262ffe4bea9dd3dd56147d84b12318910045c4a6e66ffd026a7d4aab28090265ec93c56443844 SHA512 634932db7bd44c120212219a943533789973660699f488110c2d52722ac4d63e295723b7c1a7b701544e5d04f3a28253cc18c3841ad757235ab98293bb5800d4
 EBUILD gst-plugins-libmms-1.12.3.ebuild 404 BLAKE2B 163bf98d799063327e726a0b5b3c2e04f33b8c7b54be6e4aa3d4d5ba59387df05789ade4ede4716844b082bf5a2f3df3082aeb87b3d13eb06f271e4ca4116ed7 SHA512 b5066fa3a6e522cd371e604979ec828de304124fc99fadc959f8d71de6e8072b4df5f4faeb039f00639c1b22fe59d6c6e5538f7a34c94f64fec83ba8363cc7d0
+EBUILD gst-plugins-libmms-1.12.4.ebuild 410 BLAKE2B 4a6e11d13ebe3b019851f2ff15dd64aa16bff25aa98b3f7e8bfeb07b7581f09db1162477278976926058c30cac84e8a4a1216abbf68310cd715e840c4047b24d SHA512 780e21a7d1ec334d0e9ff8c0f1f6777537ec969f0377a8f063777f79aa29007097cfe741e763375625be6253285f8c1f9354f83258d0ecddfd8e1b4cee5c4372
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild
new file mode 100644
index 000000000000..81e08dd5976e
--- /dev/null
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 65dee26f44b2..0c5a6ac4cdfa 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-lv2-1.12.3.ebuild 368 BLAKE2B 085cf12dbd5c88d427aa9d37c56b5d29117976e30fd2463b98877cbfe9742052f36b383f742e0866207735376c743017747caa31885381fc8e890fa0ad691c2e SHA512 d7bd86847196459e30a653575d2bc15d25993e94a5cc5d23026a9293cbda1c186a7730505af34816f9f067ca126d0a1787b062f36ea3d8cf6816aa2bc106be2d
+EBUILD gst-plugins-lv2-1.12.4.ebuild 368 BLAKE2B 2eeb95cb2c226077b910d9917387d2d8045d6363353039710b9dd6551cc2e0eb1045463eac5ca7313183c8faa9f8dccb3533a6d9b88079935e6f93d56fcf1a15 SHA512 ce68ef36e8668c75bf759b237a2034b65b8b3af5b13427fb6dc51b19b1fae80d6c9f3e41a779b9c500e9726922d1a66bed7a6da7247afef7cc384e60473ab288
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild
new file mode 100644
index 000000000000..05485204d8ed
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Lv2 elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index f99a1d32cb0c..cd9c60efacf9 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,6 +1,8 @@
 AUX gst-plugins-modplug-0.10.23-include-header.patch 860 BLAKE2B 68c3273324dda85a28cfc2a20162f4496ec982aa75eb995f2752b1245e5928357dfdc47b475d1ad6073eed5a9184e816b133cbdde40aba2439d347e14eb35ac1 SHA512 c38b1a954abcc11c3829818d15793bf35807b5958f5176a6fb30f7cfcb57e79106cd5aa8955bd686a8e81885945b208142a59dfd605aa88a77488b975d28621a
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-modplug-0.10.23-r1.ebuild 448 BLAKE2B 79098c3f7e021e91c3d3ff1c42bdd2a2ad5209cb090564ebf9a59948407ed595ad5ee62c5405b9ff84ae2a5812c1e175820060a7674099d74e54335d21044926 SHA512 fca50e87abf1b0da7daec6b60c57656cd66ffc3a260694866eb63ff0118bf72f156efb9578c4506573da42ad9c011a2a38e08193bff1c1c815d5c386aefcfa50
 EBUILD gst-plugins-modplug-1.12.3.ebuild 363 BLAKE2B a705c8a4c2c9db5ff7585a4a7b54de91461682848935d0deb66f7ef1c82c870d22624db4cc556c073c7a9d491bdbb76ca8a95f65f92028d03e955601dc190517 SHA512 6ef6a89ba2c993879b41227d7d90068a52bb34001280e4852647822596a3e76cb386ff052e2a313aec53a875e4d709a8a118642eb8b50b2857c5419ba2ff76cc
+EBUILD gst-plugins-modplug-1.12.4.ebuild 368 BLAKE2B d4caa16745a0391fda8115c3908ae1b8af6d0219b4211802f13c69422b14101e82a83d8bb41607cbad926c943dec855b35921c8bd25578b12887df3c44819190 SHA512 fbf58e54cc7e2a713dd95fba11565952c76cebe765027294cdba360c5e2699e145bbc4fffd92e1fa5fbd4df1e66514a35c838bba20ee14d42545fdc38bc83deb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild
new file mode 100644
index 000000000000..cb08d429e992
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MOD audio decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index d16ff3c131fa..61c166e6ac86 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-mpeg2enc-0.10.23-r1.ebuild 341 BLAKE2B d669bc88464615a8e750482351ff644be2614290e3fbbe3c78479d96b0a14a98c32c4d5aa4b25f8141acedcc10c87b51e203e662288c5b77a75b1e61ae61fe01 SHA512 1e14dcd11dc5a66d807bae912c7610ed8b169f99b743806a46ea36a042589e63ebe08b8046fb9adc35c8dc8c71b2ed8ee0fd102b8a96457b7824d060ee3e383a
 EBUILD gst-plugins-mpeg2enc-1.12.3.ebuild 339 BLAKE2B c66eab2db9293f113ad62fe0986bb307809eb444bf3d1157967ac0c67b74f6adef8553fa296cf00f579dfb2bcf825319133e2076f39189fa29ba1b721b8415fe SHA512 f55752eb5aacfa9b4be87bf1f7c60a3b0029542d53bdbd8947d950d2eec6d8870385fe7f7e4e3f8aede3805edbaa7b7ba5429a5fbc4840ba38200493e73e634d
+EBUILD gst-plugins-mpeg2enc-1.12.4.ebuild 341 BLAKE2B 0d9bb554e59e8c5cf9f7d6bf22bc2e806f74dbc9b8685c5c7979cb1eb3966e2f31f1df468f61c6369804639075392d8e59ceebce04f114533f20d398154bd2af SHA512 0dd029cd4cfb85e56d6af4f5bfb79adfc6bba9934649bb187f2a6a49354ef111702c58e17d5d99be350acbb57c1fd2d43bac53bdf07db90697d648d2662b775e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.12.4.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.12.4.ebuild
new file mode 100644
index 000000000000..d4688bccfa0d
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index e4c217365e43..fb1603a3770f 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-mplex-0.10.23-r1.ebuild 413 BLAKE2B 0a9b69ddec773d34fd3b4b3c63887b33253cba5f0ecdb0228da4271cf655b857b505696c4c1be2466282fbb0d0817f9e31cdf32fac3b1f9e9835302fa8daa251 SHA512 4b2d744b9409faf36a1972a16f8f0ea4fa6655f5af73103fd3b3342a75965929647d3483d49839d73975c10efcd6f6c56ea44f2bb846d0999b3070d4c8f498e6
 EBUILD gst-plugins-mplex-1.12.3.ebuild 413 BLAKE2B 637e67db19740b07b095253b8a54d0116a26a951c05f8df73d121ec01c5b58efece3f7de65ef619efc681274d5abd66bfab7b67ad0f110d0d22d71c1938810ad SHA512 c4c3ec3a52eafa28d9d52bf321ad8ca0527720eddcfa7c90a29421aba29d5ddfb8b9c50066e97425ea1208e2ff9d7e41efb5737e2412d02d9c837faa6c51d7cc
+EBUILD gst-plugins-mplex-1.12.4.ebuild 417 BLAKE2B 722a545ff74f370a4ac2d0fb6a728937a9bf1faee222d4d4fb9a9f75999285894f4535b3ddd7a58fe7e1559c922167db66d2226b0a456f416650462c14ba9842 SHA512 afa1e8ef9142571e49f0ca9212026794ae0c6b8a20d6c482578e1f3256f4ae9b6207334645cf262fccb851a938b222976f51526afd9575b6124bcc55d8d95e7e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.12.4.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.12.4.ebuild
new file mode 100644
index 000000000000..e32c8831537a
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 865e9a0a0059..e5df27ed39c2 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-neon-0.10.23-r1.ebuild 485 BLAKE2B 439c33ac05a4da45e5f222748c300cee6066d60d32a5b0ae02edc3eff5fef3bac18f5312137180d7818d584f2021373d55b6bedcea9df50771c3c2e7f3472583 SHA512 fe45be60e56ac658bebf737e85e52865eaf86a5fa4087554138205b4ad65d7caaffa4d83b29f8c55e9336b13737c37a0bbe73cc3bf9b1b190fdfba2a9e1d5743
 EBUILD gst-plugins-neon-1.12.3.ebuild 339 BLAKE2B 5352360c80e78d2cd218fae077f304a54842868a6ad43909196d8aac5b0c24e3921206d0c76251b3b18cdfce4ce55527d5e7a49631f12bbfced2690d5674cbaa SHA512 e192628e85061647862a8eaab1007e104a2643aae9b4f4cb70168476fde1f9e81d041052cd478bea05d0108bb4c0fc67d2b4747a088f3756adddad33c0be610b
+EBUILD gst-plugins-neon-1.12.4.ebuild 344 BLAKE2B ffc6ace5c38018aeb6f54573e9d81b37996a47b1f16fa758c9d82ee1f20643cb21087641f8a61f0c12af76f239b967aaa33ff5aebd276c92b35acb884df7036a SHA512 c03538e5b119f57230688d2a661f170b4ee9a658ae7672adaf5fd0912a75f2d45a5e783295da948d2b32434e5b872b09e5a37a6fa542968747c22dfd8b24fb1f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild
new file mode 100644
index 000000000000..31abc7967349
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index 9c9d833ad477..2f49e5429e25 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-ofa-0.10.23-r1.ebuild 326 BLAKE2B 6594d9171f2d82e7c2ce1f20a7578aee8e4fa5cfe83f694275b4e70944a32e508ee2484c389c2628ba4a5f45ec6580f241d0a3d7b2cf7c373cbac4ad9e88449e SHA512 fec405ac626a2a28e1be309b181ec5d614c696f8d92f8c37f5bf171139b3edab4895e8e90e170d123d0be47e052049ddfe84e29b908d190047c52461099ef4ad
 EBUILD gst-plugins-ofa-1.12.3.ebuild 388 BLAKE2B 41699e29b926e4be20ed72834c9936dc0b8e9cc4adb6bb686fb17733ec34ca74ebe8f290dfc59e4f7f121669f5d8a51c9df173b938fcd4b0c3287add4be3a193 SHA512 09b68ac5e2c6e1d174a96707ab768a5412c1884c683238ecccf6ed3cd2a8d24e96a9a134038bb05d7af413ab54954e62177940f14bf1831f7f2baa186b7a890c
+EBUILD gst-plugins-ofa-1.12.4.ebuild 390 BLAKE2B 4215ef72787f132d2f886cb7f8345c008486653fcc430c5b40540cab836b87bd5ce9cbde3c6c25153d53a0e982992ca7b4ece04d8f719bb40dbbf78c9a4c43c6 SHA512 2116df3eff0dcd9dbfa98814465c85e4daa5bd576f31efe5aa6ea0416038ddd56d80f91cb74c6533a43ab09d2604ecb49c6761be6e37174885982eb953ad4822
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.12.4.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.12.4.ebuild
new file mode 100644
index 000000000000..124706c079e8
--- /dev/null
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 01f99827d414..2b67a5abd642 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-opencv-1.12.3.ebuild 658 BLAKE2B 51f386e001d8952eed47ae58391a63d5b51afc903f17a521b5a23e75f14e52199d22f25a4d4093912d46499c88202cbf1d0dd1196acb8dc48b28a6055c41004d SHA512 7a33e86519c30278a459b49539d85906ebfc32b0a50adad1539616201c5b9e30c883829d5f97dbf1a01082fed4a90183fe13f4e79d6b3d10b7a766c4f6b218fb
+EBUILD gst-plugins-opencv-1.12.4.ebuild 658 BLAKE2B ccdb34126db2ee8314d5e4c1c2ea47d790e7690293cba749abcedc60cfb1679289a23bac96b9e838f52f570ab4d5e886359cf385945103d823c4afe442d5660b SHA512 7b23c69e7c9b2b39a0c6527fda67d78882513a35bf39d8e04a30d425368b47ae29db1a0b6320e76856c66ed6361388445ebe00fd8920e747d92309bb52c02eec
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.12.4.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.12.4.ebuild
new file mode 100644
index 000000000000..673e89a4e8ef
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.12.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="OpenCV elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/opencv-2.3.0[contrib(+),${MULTILIB_USEDEP}]
+	<media-libs/opencv-3.3.1
+"
+DEPEND="${RDEPEND}"
+
+# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV
+multilib_src_compile() {
+	emake -C gst-libs/gst/opencv
+	gstreamer_multilib_src_compile
+}
+
+multilib_src_install() {
+	emake -C gst-libs/gst/opencv DESTDIR="${D}" install
+	gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 8cae2db70b34..a72335af9ee1 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-openh264-1.12.3.ebuild 333 BLAKE2B fbdebbb70e5e41ece36b3f585bfd9d72bcd269c86b3515b6fc814098fe7a3d961919e134e0a159f2f84dc7c866371c5386625892ee51a4a235886747115987cd SHA512 0a3bf4c613fadf9c70e722fd6cd2c3c4b7c5af9455883c36b235b3fdd932a0c9824235406a64cfa59fc3cacb307ee890052e63e5980c6cc903597861643c34a6
+EBUILD gst-plugins-openh264-1.12.4.ebuild 335 BLAKE2B f5c24dc94c54be7a18a99e9d2d03ca545238d8b49117b0e528f1e4f5c539ddab7828d784b0f7db2f759561b8c9c15ad0b2dfcb91fa622bdd7c1e32dfd2b50088 SHA512 2c4534ccee26c54e1b5b8151e7c1ee4936525f7f3adb3e8b274fb548815d182773c3ec2718032bcf79261da60db5a7cedc73ed18c40ca06a471a1ba3f3f53d4a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.12.4.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.12.4.ebuild
new file mode 100644
index 000000000000..6886b2291256
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index b9cefcf8146c..03197e927f4d 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-resindvd-0.10.23-r1.ebuild 386 BLAKE2B e68fc74e19c19d205f904b3f5e576b10de64c2d46e9da71d671b729e63354ad85a33c39ef6d8a87a4555bad62c57dbb624900fb51fc0d7d636e57a8f65b0d120 SHA512 079db94e47930bd7886e03e3a51341709880847f945abe2ff4c75c54755850417b29cfa5e71fb0f710cdcc81cd858949c6e99744a4f7896395db299a97dca7f0
 EBUILD gst-plugins-resindvd-1.12.3.ebuild 448 BLAKE2B 858cf605c9e87ef8848cac7d409c888172e9fedb7c17da9cc946846f326352c0b25666f6a324b757a654940cc66ca1d433054ffefa54fc9ad45c1abef3cde459 SHA512 ceddb2790abba9cc3df44866f63e728e2520766207a581ebac2eca1ad4183e2ec7a57baf760033d36f5f0dcb0537d9c9584b26915e29d60de73abdb9e05ac8a0
+EBUILD gst-plugins-resindvd-1.12.4.ebuild 455 BLAKE2B 8249c58e5ea1361264b9f1d5bf3f34ba4abc142199e18ba4b0e35b674b39eea7ebbe6f554b8acef7a67b777148c84239a2ccb9848660bb0988b6ae47ac8804dc SHA512 aef1ab18af1f317e30523dfb567cae3ab661227da4c5cc51f9d19e12764b535997d4b82a5dfa84c6a42c831ba6ad6ee05d78f00912917d8e569ec1ba9e06af49
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild
new file mode 100644
index 000000000000..3f726bf1cef7
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DVD playback support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 6a37d0697d3b..a773e978723f 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-rtmp-0.10.23-r1.ebuild 344 BLAKE2B ca7c3a994aee7e03f24175b310b0594a77de1439bcd0c9787ae726f7553aed41a3018c47b285e48f6c251711a0120f0b19f4b16fe9457f083a5dc8dca0b613dc SHA512 923e89ddd3ea15e15b4c1820d09cc12888340dc4a48ca6c7fa64e4c3725ced7edbd0a2f136057afefd4ae4d82602d677b2ede99b617ec3181b86ec12605b35eb
 EBUILD gst-plugins-rtmp-1.12.3.ebuild 335 BLAKE2B ae83c4d79d266a3a7a67dd9a0df88b6b3356aa00fea358f54de63bff91f40315bf8bdfde0900c55924dc4dd6cce2eb0cf5a9ead84008487fae36f3845d4cab5c SHA512 f01e774c2a738be79cd887fcd4667f437d9d2c54aafb9b414d35e0f0ce8df2671be8b5f1d9fbdfbffb9d16dc74b0f746f53a7b4dffca8557ea276ceb4654c733
+EBUILD gst-plugins-rtmp-1.12.4.ebuild 337 BLAKE2B 267bbe18fc00e81d88454c5fb43b5e495fd69facef281beeb907d92328e825e0a6506787d5fcd7f616423ed325d073d710ee83c1aeac8f6ef54651f383c9064d SHA512 dc42784dc3c7ff80b58e6d96c2337a2024573885f0aaa40f836e7ef5b37030e3e3de7a3612c8034da7abe25ac30b4cc1dbce79deff5da56d82f5afbc68a3bdd9
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.12.4.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.12.4.ebuild
new file mode 100644
index 000000000000..c02ad8b37c98
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="RTMP source/sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-schroedinger/Manifest b/media-plugins/gst-plugins-schroedinger/Manifest
index 4c78e79d2de1..ea2c2af1a63e 100644
--- a/media-plugins/gst-plugins-schroedinger/Manifest
+++ b/media-plugins/gst-plugins-schroedinger/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-schroedinger-0.10.23-r1.ebuild 554 BLAKE2B 2bab898fd1c052694ddac4bc5d78c39f1966b72cde5a0c8535285e4bba8b40a8e72fb67a6eb171b5f736575aa47b9ad079f1f877a08a6aa1874c44b7296660a2 SHA512 f209f0e5a7505848f6919c21aed4f3dc10bd95b2294c4e9692fc0016e5b32b8bfb6bee52ea19a5dadc8bbefd938f0d4599fca3395fae4afb4786fddad9436d7c
 EBUILD gst-plugins-schroedinger-1.12.3.ebuild 403 BLAKE2B da8401eec36b6a8f023d03dac80f57b899585d2d9bc9ca2dabd9c7b3e5a3507e13082c0e44368b94e30ac7a1c0353fc853b3abea16486df29959eae1ef33fd1f SHA512 4bc726f6cd6e47988933e31807600628a729c5c82f2022e0f21545827a0aab2fe6de12fd76842fce16fde4d726e68cec01e72ec092ae91ab49da097edc36a2db
+EBUILD gst-plugins-schroedinger-1.12.4.ebuild 405 BLAKE2B dad9f5276025d43b5d26c65f830fbb49f1ebe159b2e5a45835de8dbc903e38d29424be17dfca4cd2f9aa32f33a15f4066d8d949a75e82714bc64a59951ee6344 SHA512 50a210b9f4d48058d1080ee20d87becf9130d5af9a2de9b4379432f356426e58f5cd9d6350b30a2f0ed7262d15776e38973dbd461addce81032759dc88d410a6
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.12.4.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.12.4.ebuild
new file mode 100644
index 000000000000..d1a3f261bc61
--- /dev/null
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.12.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Dirac encoder/decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="schro"
+GST_PLUGINS_BUILD_DIR="schroedinger"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 9b60f22f0c30..6cc102e38fa6 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-smoothstreaming-1.12.3.ebuild 1106 BLAKE2B b5cde9b78beb2a4b6ee460f540377d0e40b53136be7b167ab691ad29e0e7927bae129f16f8579e0f2feaa82642600cefa759183bb5dfb2d65a1d91f19ea69fb4 SHA512 9f90860e2fab01cf43957291d0d7e50e91939a3ae9994084dd2067b53f17efbdf7a9b2dbe0b903f5a734f6a92e3649d3aa7ca658b0a7fcb9e87b4c519f831245
+EBUILD gst-plugins-smoothstreaming-1.12.4.ebuild 1108 BLAKE2B e4d4a284bfcc751718a337e87a84405034a0b1e19b1504b4fa83c8e1768627cdde14154b49fc60a90df359e7affd6b01ce4b6d291acc77f02055c2e99e029b2c SHA512 4c5d3ee145b2cb55ea09d5db4364b38ac3e31b330b46e35f8853cf3ff21ecbb4cffcf843c3fd3445ef24a8781c0cdcf7c086f21fd66316652f8535616c5326f5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.12.4.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.12.4.ebuild
new file mode 100644
index 000000000000..e2bea2518827
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.12.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Smooth Streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+	gstreamer_system_link \
+		gst-libs/gst/codecparsers:gstreamer-codecparsers
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 6d35e1918966..3ccbe56a6ab2 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,5 +1,7 @@
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-soundtouch-0.10.23-r1.ebuild 367 BLAKE2B 1d920ac6b193946d3e2c78043d37a081e4a3219810dc797cccfcccf6d757a79a937e3da8031faaba0f698ef2b175ee8d0179e9879df042dcbda3b0e9f7cc621f SHA512 ff2584f662d23a35be5a2d0d973148049195aa41b0652d3cd72205e6e37b96c23a61d9e9efc450fa3fcd24421246a9cc85e0eec488100a91c7ec7673f33720a0
 EBUILD gst-plugins-soundtouch-1.12.3.ebuild 363 BLAKE2B 58ad4b3058a517d4d32d5ae8605163141710177a18108ee24767362a77f3c5526184807ad8e273fe5ae35cd72e943c7b44df876d6fbff1c4fe45ea913bbebf9b SHA512 941786d8d8cb6c147566bbe82e2aa803b4c1cdd7f873d3ef702d6e1e9d9d07b6cf0e593fe4d1352b18a592422e0c2b626dc9c27a1761658be0f0307c6093d213
+EBUILD gst-plugins-soundtouch-1.12.4.ebuild 365 BLAKE2B 5255e481ae4ed537c653ef14ac8e0cdaf11966df9f0a23610aa634bde79d6f2d3836f866a58f5123569aa7f490054ce56b983d9f3cc14b40db7ebc9d717300a8 SHA512 4a64f2d451b1e3571bf47d1dc9935b3e2b9514cb74b0f44c9ca0ea406276852835cff80eaf60e4ab6417b9833ec285fbc004ab268589e20f99883dd8971092c6
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.12.4.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.12.4.ebuild
new file mode 100644
index 000000000000..bc1c86772fbd
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 62b8c0444cb9..67767c35d22d 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-srtp-1.12.3.ebuild 326 BLAKE2B b638253fbd26586b3221d4a490c5790c33874f473e5a8c9e213f5f538a4dfd43cb2c6fbcb90cda827aacb1310899e53ba8519263d3dd0e94c5938e0c48f8bb7e SHA512 1df0149bfd68d569c6570a9254e59bcdf3e12a1bc4a9fb58368958c62237d5bb510d5bfccc82bc0bd6cbd14a3ec1767533047cedfde5b3619806cd9923321c77
+EBUILD gst-plugins-srtp-1.12.4.ebuild 327 BLAKE2B 5f83b8dc87b061041f8da2e9b9591c1b06b107921a6d144dad5ed83fd89d6e45646365c58c81e1b7851f16be4198aa59b1d0d374577f627f48d49a5e3ce96575 SHA512 44f1f7fffbb6f8786c556f42c9f44e3e069550810d2aa01602ad10bac925a2efe899210f528a4574612a9092bc889baf8ed9ba7bbdb546c304646e61bb50e4c7
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.12.4.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.12.4.ebuild
new file mode 100644
index 000000000000..23ec7b94eff9
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-libs/libsrtp:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index dad2764f9770..68a46d79eade 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-uvch264-1.12.3.ebuild 804 BLAKE2B 2a9699bdccc2184b08cd422fb9259a4385b06df71af07645063b7dad524bbdf95528605a82b0efd885d8a98de6e24c8de0c7d095faa6199bc5b6a3548ebd8587 SHA512 434e962840058a4ecd28220b9d34f30bc027f70748b92c03181a6d121c32b7d40ecfada97026ce85afecd27b7988adb62850321f2c1aecbe31967c7f6910a0fd
+EBUILD gst-plugins-uvch264-1.12.4.ebuild 806 BLAKE2B 638d1885813f1d3f5850d3e03b451adf9e9526999c01d9ddc0719b3367be8800a7729708d2c2b09f4047e51fcaeec00af9915dda3d7a0416a70ea6e633f961c5 SHA512 f7e977049f6f43903bfe74d59a6eb8b0acf228ed6f6c521efaa6e6846fc856a66c45fb93bf42a9006e5f2dada744008697f47516937cf08a9553d0d298827fbb
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.12.4.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.12.4.ebuild
new file mode 100644
index 000000000000..27d2bb3198fc
--- /dev/null
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.12.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libgudev:=[${MULTILIB_USEDEP}]
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gstbasecamerabin does not have a .pc
+	# gstreamer_system_link \
+	#   gst-libs/gst/basecamerabinsrc:gstbasecamerabinsrc
+
+	local directory libs
+	directory="gst-libs/gst/basecamerabinsrc"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgstbasecamerabinsrc-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i sys/uvch264/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 40f5a9e4a231..056a56611676 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-voaacenc-1.12.3.ebuild 322 BLAKE2B 1d2ef64cafe2384d6bcc5c8421f8fe1c955a52a2fad44d21fe9c9267ac4b5b9114133704cb8514662d1f48c7d8a063565c9a147f105084c79feffe3c8ffd0e3d SHA512 058be5f94b7c38b317920c8da3e53b3a4e0696661639b98f3004f8fc6329a152e4f8a5a4adbefc95c6c48b2c107c1bb8ed74b39d522eafd17992fa6838cceb2e
+EBUILD gst-plugins-voaacenc-1.12.4.ebuild 324 BLAKE2B 94821997eebf7b1963bf114837abbed767fac105a4afdf4b997b215ff0dedcfe90d5124938af85194f6c7c4adce050401e811a091b9ec2cdd3a244204e886a3a SHA512 8501c3e39b3d0c78e32f02731b16c9f3729fe04c8ff30d9436d53b876e6574efaf2a3530fa056f358d536a742abf15781f855b5376f011cf3a4e09a51f97c12f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.12.4.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.12.4.ebuild
new file mode 100644
index 000000000000..5e956ed3221d
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index fc6ab92f212a..519bf6e8d075 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-voamrwbenc-1.12.3.ebuild 336 BLAKE2B 341331ad3c52ea4f40854668ae96f89092d98e7b6008c96044b4ac4ff87b623b2063122fffcff07d7afd17dcd2019f759509f189e7c181dbd59725f4e0448303 SHA512 b0ebe357af3569c206a97ec819d7f0532992b83da997843002b83754588ee7c1ad2783b6101b1aee18751652896e670f8423efcd0efcd7df80a7a966c17e602f
+EBUILD gst-plugins-voamrwbenc-1.12.4.ebuild 338 BLAKE2B e3b9dbb555dfb03b28a5fbf3acd5c6d15e9d633a10c6c9cdf9d9549ae9b26ceb760add224f7da281c89c4173b644147bea866e426adcda360449b4fc4a368c47 SHA512 805b6f6e08f538eed6ad536bf0727e4af168b16d274adc469cd4d9759a33346776f2cecc93ea6ecedcd63607528931806eb9503df1be007c264ebc89b9665083
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.12.4.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.12.4.ebuild
new file mode 100644
index 000000000000..89130467e3ed
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index a233dad8a2c2..04624529effc 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-x265-1.12.3.ebuild 318 BLAKE2B d19c6926150d076ff97dee7400e26e07996c5b93757f709b5a3bfb5d2d35847e072a5dcd51847cd6fbfcef5fa3931d1830fff32001788da7aa71338fe23a1237 SHA512 9bf5aceb662e0a7ad668c5b6fb1d19db33414aa6be212e065becf02a0c6d5d2db23c969df986046fea66b979ba20db8680eda0d46a3391b9f0e096180e4898db
+EBUILD gst-plugins-x265-1.12.4.ebuild 320 BLAKE2B c06960afb625eff7a838f862d986efb05c9f49caef4872fec7f9c8144db8db1bd20defd0bb3762a3d235f13c585c88d05ca94d05ce1c52566487c0991c48236b SHA512 2842ac59a4c6c9461019acbac5029085299e79ed0be64441c1b6f755a4c9edfac3449129b290dbd18e696dd90a3f4e4200096c2b098553de89043983e15fe53f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.12.4.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.12.4.ebuild
new file mode 100644
index 000000000000..fdf54708a5a7
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.12.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit gstreamer
+
+DESCRIPTION="H.265 encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-zbar/Manifest b/media-plugins/gst-plugins-zbar/Manifest
index c5cc91bfbafe..9dd517766645 100644
--- a/media-plugins/gst-plugins-zbar/Manifest
+++ b/media-plugins/gst-plugins-zbar/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
+DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 EBUILD gst-plugins-zbar-1.12.3.ebuild 343 BLAKE2B 8f32e26f7ddcae1cd724a15cb67e370e89f993a7db7ee3c557ac417c8e26e7d8c28d5519fefab9ce27936f9f26509c2c83e93341bba816b873871deb16b20b1d SHA512 4ac0fd65545fe90bf8b2c8177b44ef27a9d72cc0502d3ceafdef1f9b8a9a819003367493942bd4c0d846b03873222db1f376f4c0e01bf520371cbdc3facd2f2d
+EBUILD gst-plugins-zbar-1.12.4.ebuild 343 BLAKE2B 6c271e87a5cb16ec20cadf1781378bb78b763122413c13f6660cbae764c268c612a02e563d862953d8d0677f6afad035cfa5562fc2fb2adff6452d8d1e9244a3 SHA512 81ba6f608b3a02b81be984f5f834fe8a13515b4cd9cfa51ed8c640ff926682b22629c68a74c63b884f2ad1f4c895953b62206c1a2ec03caffdce988d0f01453b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.12.4.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.12.4.ebuild
new file mode 100644
index 000000000000..38852a678134
--- /dev/null
+++ b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.12.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Bar codes detection in video streams for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index e606e43e1259..cf2d45c76134 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-inputstream-adaptive-1.0.6.tar.gz 556505 BLAKE2B 0b093850cf61ed75627d024f28fca93a6b0426decd3d99b94a60f9a86f611d59a6b2a7bee7e5db52095d99d0a0d092d60c3051a77294cb5a47e8cdcd13359a61 SHA512 10accc94d3cb68b0cf89d4703ed05b4c0b1fbd02415b6721c372933ba629eb13c034d4336a9c8e5ffb4c8150a798b29c184f0d475069cad82adbd6e63d63b712
-DIST kodi-inputstream-adaptive-2.0.10.tar.gz 441097 BLAKE2B 22d7d0bedb8d476b531de33f5ba22c0b982ad81cad7b1f5ee1913b0f16e63a29585f4ea31d0523b961467af380a84b74284cd1e6860160c9a001c5631c30a127 SHA512 89a50dd31442824924f962cae63b4c1a99faaff060c082b4d77a45569cb4ea18b8578d41d9cab8da28ccd9650755ad215a3221677d983317b858aa24b4d74d6e
+DIST kodi-inputstream-adaptive-2.0.19.tar.gz 881342 BLAKE2B afa1341e9f45d5b97338d21359e4527c3a19ac8ca30066ea2c83ea0eb8e2a34a72bc179cfc222612579ee1b1be12bda52325b3f32c85b53c7a9cefd8461d238c SHA512 0453998749df691071bd54e22eda8042f15f0ab1a11b04a260c7005048b533b51b6c82311bcb364fb10e68816512610a08db5331f974a042bb8967939d759d99
 EBUILD kodi-inputstream-adaptive-1.0.6-r1.ebuild 712 BLAKE2B 98e7767a0fb45a23133bd6f19fafd54db7a6523785f3e29a8846ee1cab2e777e32242aba6367007aa6832d32753421d605e2e48f1f3d995911383197a034a138 SHA512 c06736459fbc7e161837bdb0a102c25640c2f33283394b3dc55dfbf0441e039ae57287e40282be3aee4806e06a73426223c0b3fc0ad32a83016d244d56fa358d
-EBUILD kodi-inputstream-adaptive-2.0.10.ebuild 728 BLAKE2B a924667db534a6a1b7eccca0fd2fcf879de60646239ea6b8af354218195f124130e63fe3655f047bb564f74e6812f89880c1bc8fe9826601ae4d294e5b9f9b72 SHA512 2b93762c2ceb6835185465dc933b32ed173e5fdbd309672c9185429dfbada6de68d6573b73f0b020a5127a99215e26dbcefdcb6fd53c498e9ca2db453a277f19
+EBUILD kodi-inputstream-adaptive-2.0.19.ebuild 799 BLAKE2B 4ed20a891cd07e9252e6ae823a62f97e7391ad88867329950d90387e8bd8c88f98b9e06fe96d3f14331e10bf24f8c8aa5d6386589e6c21a65103dbdf68467f87 SHA512 5f8cf4730a4043ae95e0512ec87af5ba46c64bbe5d31e62ea24d0ddc505e449c0af69feaae1ef4bf15ac011ed65e5e499da8b9cb92d067d58b5eac2bdd04e312
 EBUILD kodi-inputstream-adaptive-9999.ebuild 730 BLAKE2B 0e54a9f7e9ad794728cb8ab514a1c4d6aaec025f40ca754fe9fefa4080e60b89876c9c414b179a4fc6eeb9fbc59fc1532ff30ca8b32353e16306538e89ea39f1 SHA512 ce1ae0b52332fde23c754b5e5ab8395357adb410f700c7753919fbdec50eb40d89cf4595947bc1729a793a06d2023266fda9adfbf7fe4f7bcd0df44a42ac6c50
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.10.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.10.ebuild
deleted file mode 100644
index a8a3a6a147cf..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild
new file mode 100644
index 000000000000..7a48b4c57ae4
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	GIT_COMMIT="9af21218a87572bd4ab8d8d660c11f6295144f97"
+	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz-${GIT_COMMIT} -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/npapi-vlc/Manifest b/media-plugins/npapi-vlc/Manifest
deleted file mode 100644
index 6c3bd9b55412..000000000000
--- a/media-plugins/npapi-vlc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST npapi-vlc-2.0.0.tar.xz 359508 BLAKE2B 0d502e70b4cb56f1bbaedebed570d13d17ac2c5f43da39f453b88095a2ed1008c2bd4c00f08706a895d66bd83e172cd20e1416d16905752d536795c40ac26851 SHA512 76da0e013c5477cd9b5eb84f7374912f3077bb03cf6723b3d173ec4df31a021ab72d6e8d1847951ff7e39f61c42e3e5e913dcdd1d0f77e6b0028dcb4ac579466
-EBUILD npapi-vlc-2.0.0.ebuild 1005 BLAKE2B 42525d8a9590377bbc45ac58f0c42857453d24f55a6f964bcb03c8eb9f14b5ccfe0278de700b6e04770f1e49c355ceb0e32644cce93c639bb377f124e58364d1 SHA512 095b80dd9a202f1ac200ffe6c013f59d83fa88d6f3d3d0247b14c819c74d1a74f4bf2c46f72b4226b8a350c23f4ef231a03ecc8f799b4f5c748f9f64d44c4baf
-EBUILD npapi-vlc-9999.ebuild 1007 BLAKE2B 947ad63e0ac24faa77b79dc19ad9e021e734dfc2d67ea6b8ef3605b464198ab0264e7a6b7b07e6a786d5fae96ba5a0cbf32eb13ff694f512a3ddd99e1bb0af52 SHA512 68d0a4e534b9f4cea91a4cb0513ab1c4f5902d2fcceb592c53bef56238510c438d38dee6924161a7abd7a4f7f33d91606d169e09fbed43a350d87fcc48998fc5
-MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-plugins/npapi-vlc/metadata.xml b/media-plugins/npapi-vlc/metadata.xml
deleted file mode 100644
index 811585329983..000000000000
--- a/media-plugins/npapi-vlc/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
deleted file mode 100644
index 7e64741327ae..000000000000
--- a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git"
-else
-	KEYWORDS="amd64 ~ppc64 x86"
-	DEPEND="app-arch/xz-utils"
-	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Mozilla plugin based on VLC"
-HOMEPAGE="http://www.videolan.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND="
-	>=media-video/vlc-1.1
-	x11-libs/libX11
-	!gtk? (
-		x11-libs/libXpm
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	!<media-video/vlc-1.2[nsplugin]"
-DEPEND+="
-	${RDEPEND}
-	virtual/pkgconfig
-	>=net-misc/npapi-sdk-0.27"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gtk)
-}
-
-src_install() {
-	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
deleted file mode 100644
index b4e4e67c3dd1..000000000000
--- a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/npapi-vlc.git"
-else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	DEPEND="app-arch/xz-utils"
-	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Mozilla plugin based on VLC"
-HOMEPAGE="http://www.videolan.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND="
-	>=media-video/vlc-1.1
-	x11-libs/libX11
-	!gtk? (
-		x11-libs/libXpm
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	gtk? ( x11-libs/gtk+:2 )
-	!<media-video/vlc-1.2[nsplugin]"
-DEPEND+="
-	${RDEPEND}
-	virtual/pkgconfig
-	>=net-misc/npapi-sdk-0.27"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf $(use_with gtk)
-}
-
-src_install() {
-	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 80d1b4bc77c5..69f13dcf11fd 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index c3f586169290..5c0cb0739620 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -9,5 +9,5 @@ DIST svxlink-15.11.tar.gz 1528034 BLAKE2B 70a8f0f0181aee836738fba0b570d5fe5a8966
 DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f977367069658bdf4af7d91726e558c9e1ab084423b0238ae1f5fdcafd8e88480b818491e5f91d176d07d81fced5a3 SHA512 90bd74420fcd78d974d12ee13ac792f2a0ecd7cb483ec36ef1085e905f9d6c62af707cb65d04079ec66d7df6da615080a2058a0a559c82171b4882a4b20289f9
 EBUILD svxlink-15.11-r1.ebuild 1750 BLAKE2B 0dd7c2ce869e18ea801c27c3af4aee7f0cac76e5c39807a36049c54734c14d108d57d5971c1aca1c71d3ebb8b8ce6594ab3455a8b0f64bce749dc4c98e4eada4 SHA512 033529dbe42592d5c650b62a08a48808c5bd5e2583d1505860abd1ce8cea6c93c3b91c1ec4937f92977e658d0bc236f327438cdc25461efd5fb5ba0d8f98f07d
 EBUILD svxlink-15.11.ebuild 1646 BLAKE2B 459ecb702fa6d5951ef130acbb34303b77b19dc0abd31c86f4179e5f175115739c3427448e5115b57d234b43ac69f49d5c98a1782ed4ac42c918268345f6e973 SHA512 8bb7ffe3775e1915256365cf8db31676db333d21217c2f6186fa0c36acc9aaff9f32bfddc35013f220b3461142b59cfec9a390206ef05761840e99ff0f4b2a5d
-EBUILD svxlink-17.12.1.ebuild 1649 BLAKE2B 00c5289dc9de4ce3077952908d753c855b0afbbc411b50d6d877fc45e346b49b3eae8070c2d6875738b4b9afb46a6e090a9b232bb58d41fd3e947fc3d4e0923a SHA512 c3ba8e8fd159be5e32558fcbfd0476f005460ff898f8313704ddb62aa803821e784982f4eef5d0bf85307d28515fe7f89d4e2cd9c15b5377201aa368251fde99
+EBUILD svxlink-17.12.1.ebuild 1674 BLAKE2B 1d01d1255cf5a50edba25c989e88c29c7ba45712b79cd8082ef6ee886d999b39f52fce108f679593b7b3181b566ff0b46c76659de8818bc2afa3bd61da8c2229 SHA512 99655c7306a6949f5b3814751f9bb740d6b704ff09c2b65956080172267e982ddfd65018cfdf0cbd0df79c21861d43191e548072edce3f1ea9461c87510d4519
 MISC metadata.xml 696 BLAKE2B 51be8858bc950793e0044d7d8dfa695f3f4c1fa0f373be8908d00c0fdc73ee0fbbe06b118a28da147978ad204d63f2eb02183c961123d71c078fcaa9cc8306f0 SHA512 8e514fc2f15af5d7520a371ab802aa2a024276514d184f31b00b96c09b06e7b7c69904a0ea256f17fbe9e97f8da4cd908a91072284b274ba6488982e92182bc5
diff --git a/media-radio/svxlink/svxlink-17.12.1.ebuild b/media-radio/svxlink/svxlink-17.12.1.ebuild
index e63fd2cb6cfe..c6402bb180e8 100644
--- a/media-radio/svxlink/svxlink-17.12.1.ebuild
+++ b/media-radio/svxlink/svxlink-17.12.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-lang/tcl:0
 	dev-libs/libsigc++:2
 	dev-libs/popt"
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 pkg_setup() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d84bf0a1d1d5..cc1995aa898c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index c383f1984dc3..5061f205af12 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,9 +2,13 @@ AUX csound-6.05-python.patch 661 BLAKE2B 4f0daaf04cafd5daa967409f7e49ae553e8751c
 AUX csound-6.09.1-python.patch 742 BLAKE2B b872878b91b5ad3200c78e0f5434f490e80f0879bb5cbaf9e2e4a53f9ea8ab29263fea84b81b13aea3dab1e79693901728e514519a3be7ce39c67c0e6bc17118 SHA512 52d2cb16831eb4090f22c7153f76213bbf4dfbf66ec791655714aa84db97dab6271022e64707247d24946ec5e019d20fe479a7a5d1711eac2c030625c4c86cdc
 DIST Csound6.09.1_manual_html.zip 15537547 BLAKE2B 8864cd42e811c596b1c17c68d0552edff39437412ce828772cf8cf13f47390d0edc25fa9a85ecfe1a50a01fe592cb0ee27ce5a11679195f8c1b41da9b1ede8cd SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd
 DIST Csound6.09.1_manual_pdf.zip 8647957 BLAKE2B 52209784a08c67284a6481d17eaef8db2abf03f068bf347a40b06d4ba323389371474cb87fd93a318fe6abadeb69afd060be0aa64fdd2b638172ef33a282386a SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b
+DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
+DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.08.0.tar.gz 33948686 BLAKE2B 6a81e5806420b63ffd487d71d507d34336c46e91ec7073b4805324d04af31101c1ea65142f22aae2de071f149eb8fe4c88547b6795462aea248b585d029bad6c SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca
 DIST csound-6.09.1.tar.gz 41969942 BLAKE2B 87dd02f61346f95648391c405edc18d08edad9d33c1cd2ab2cf054e0f10b7f987aaedce698a18520a8d8559d1fd78a20fa4f3d7db99e6afb3fdba316207e0495 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454
+DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
 EBUILD csound-6.08.0.ebuild 5569 BLAKE2B e134b89d7e62ba355621b3b57aa9b2b05df1477dc631ab33c05c5a1fcaa8def783138b6195f82a010e6f989904a2219499365a1fcb69f7579faeae2cd2932d3b SHA512 9bd0981e19af1f0c634d7d0f5a61f9738c65f8ab2cbdfd37d593327e6a8e2feb28be48dea052f6368bc007873ce5c61b17b45c7b381ca7139a8c7e0ef25f05d5
 EBUILD csound-6.09.1.ebuild 5972 BLAKE2B ec879625528671ccd4d82f14b71c2ce525260e8051986825f86ffd747e57dc0ed64af3fea6fe2eb3d316e54a89b235ceebd6577ab24b8834a9c59dc43b137cdb SHA512 e5be516ec79273158ee1b574753047b50ef980e0478a77a0fc73548083a7985b0befc074c9b71eb36fde943ef296b351e584b58adbd38a63276b2c71f2eaacd6
+EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
 EBUILD csound-9999.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
 MISC metadata.xml 1612 BLAKE2B 0198bbe7fb501a97f7545c0e07e7bd5201c8f1b36a244f5df94b7773dee0a8104c497c7dd9af5abe978697a1978680381da745b0f7bed43fad04ed65dfe75cc5 SHA512 2a471051eddcd4e46a28e5101aac7d2ae3ffb3e19cfc0fa137e1445e502a3aba5a9c0e0fb4e40b8539715bee30be33bc80d66e2c8ac7cf40ee9834f15e52cbbf
diff --git a/media-sound/csound/csound-6.10.0.ebuild b/media-sound/csound/csound-6.10.0.ebuild
new file mode 100644
index 000000000000..5906af36652d
--- /dev/null
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit java-pkg-opt-2 toolchain-funcs python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz
+		doc? (
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+		)"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp
+portaudio portmidi pulseaudio python samples score static-libs stk tcl test
++threads +utils vim-syntax websocket"
+
+IUSE_LANGS=" de en_US es es_CO fr it ro ru"
+
+REQUIRED_USE="
+	csoundac? ( || ( lua python ) )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost:=
+	)
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	image? ( media-libs/libpng:0= )
+	jack? ( media-sound/jack-audio-connection-kit )
+	java? ( virtual/jdk:* )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( sci-mathematics/gmm )
+	lua? (
+		luajit? ( dev-lang/luajit:2 )
+		!luajit? ( dev-lang/lua:0 )
+	)
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	stk? ( media-libs/stk )
+	tcl? (
+		>=dev-lang/tcl-8.5:0=
+		>=dev-lang/tk-8.5:0=
+	)
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets )
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	csoundac? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	local lang
+	for lang in ${IUSE_LANGS} ; do
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_ALSA=$(usex alsa)
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_CSOUND_AC=$(usex csoundac)
+		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
+		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DUSE_CURL=$(usex curl)
+		-DNEW_PARSER_DEBUG=$(usex debug)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DUSE_FLTK=$(usex fltk)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DUSE_JACK=$(usex jack)
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=$(usex java)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_OPCODES=$(usex lua)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DUSE_GETTEXT=$(usex nls)
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DUSE_OPEN_MP=$(usex openmp)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DSCORE_PARSER=$(usex score)
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_STATIC_LIBRARY=$(usex test)
+		-DBUILD_TCLCSOUND=$(usex tcl)
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+	)
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
+		-DUSE_LIB64=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc -r Release_Notes/.
+
+	# generate env.d file
+	cat > "${T}"/62${PN} <<-_EOF_ || die
+		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+		CSSTRNGS="${EPREFIX}/usr/share/locale"
+	_EOF_
+	if use stk ; then
+		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+	fi
+	doenvd "${T}"/62${PN}
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	use samples && dodoc -r samples
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins installer/misc/vim/csound_{csd,orc,sco}.vim
+		insinto /usr/share/vim/vimfiles/plugin
+		doins installer/misc/vim/csound.vim
+	fi
+
+	# rename extract to csound_extract (bug #247394)
+	mv "${ED%/}"/usr/bin/{,csound_}extract || die
+
+	use python && python_optimize
+
+	# install docs
+	if [[ ${PV} != "9999" ]] && use doc ; then
+		dodoc "${WORKDIR}"/*.pdf
+		dodoc -r "${WORKDIR}"/html
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "The extract tool is now installed as csound_extract"
+		elog "due to collisions with many other packages (bug #247394)."
+		elog
+	fi
+}
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
index f0c85980ee8c..82317ec02654 100644
--- a/media-sound/mp3_check/Manifest
+++ b/media-sound/mp3_check/Manifest
@@ -1,5 +1,5 @@
 AUX mp3_check-1.98-makefile.patch 605 BLAKE2B 8245fac6221ff1770dcf0e898adf207d123e9590ab1e97db6c2f257d9fc4a09f5f46784ddab7b846d02987b18576cee41b7a5b2352eb7bea8c333cffba5689b0 SHA512 53b1541b6644f32a03fb13c412badc2ecda775d605a3cb6aba6f97ca0d3dfe2fba80fc9e64f544a53ef55382afcc38eeb33dca837a997f3802155f38bdd0a447
 DIST mp3_check-1.98.tar.gz 83098 BLAKE2B 49f6a368ae0326aa426818e737964aa8019e09e8ed90316b333bee7aad973fdbd5ab9872ae1dcf41f8d9eed911b25c0b3b07f6dd5ba4557c6ed804c764186f87 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3
-EBUILD mp3_check-1.98-r1.ebuild 661 BLAKE2B ffac9ab4195a8b92c820a3d99e13703dec3a3fa7c6f6abfb39cd157a9c86c2d41a7ef636acaa5db975fc70301a41e135d1c4b1d89a6c729ad71fb80c28aff91e SHA512 7f9cb85c353ad11ebfb3d13fb03703345f66cca04c757e19caf08161713b59132e615158924465da83aaa04c559fc1604d140d5e76918e85cf1f1e28390254bc
+EBUILD mp3_check-1.98-r1.ebuild 660 BLAKE2B f9d9cf96e788969840aaa81b57d9268235dc7182e953d07427517b51b2bb2e4f6235515e7c54cf562f96c957fba2a124e632227c898b4678db1c330d41e85aeb SHA512 840fc7b27fea392bcb1a54a306c3340b8ca9bfd5a87b774c364f0bfecb3ca53bf30b2b1b4f6172f1c2593101b4a33ac9b43e7de79938aefca29559ea18834edb
 EBUILD mp3_check-1.98.ebuild 615 BLAKE2B 65765714f97173c4fb83aca9df49f3f17a1b0c9c0e4ae77ed57fd69f637f70ddcdeff985c3bc89f5aa79132eb896f289480f5fd5b5a2468151834badad3ae5de SHA512 e58ffa203884ca0e71d1de02a8ee1c13878290d50e43dec90ee33c5ddecef0eb9973b288db847e60c6d20f7d11e67b667c083d52d055a9045c841cf3e1f63706
 MISC metadata.xml 393 BLAKE2B d4df38beb932debf1e099affcd85edf27cd78aa872ae91ef365f6037337892aa470011702e3df0efa7d602b0696dcf84e62637726932cfe5c83a3d293c55bf7e SHA512 1d249854ee7bae0e2b8f6c8de7539cb7a4593c76c35e4e938b578f0b866d8d9ef712fbf0f113a0d5370dfa28dfc760b668769a50f17333cf58bd38d4d66a8b22
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
index e8590af4cc96..525ac68e69a9 100644
--- a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
+++ b/media-sound/mp3_check/mp3_check-1.98-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/media-sound/mp3diags/Manifest b/media-sound/mp3diags/Manifest
deleted file mode 100644
index c9801b0eafb6..000000000000
--- a/media-sound/mp3diags/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MP3Diags-1.2.03.tar.gz 1230173 BLAKE2B 59358018240e00c3662fc6f0a6881c889ef1c818669ce00b44af3672006ecd8eec52d34e4f2ec5873ad6478f5b74e2202cfcfb4bcb530dfd6e49de12ce9b30eb SHA512 0f7a5d300a3366a2b5ed3da78e1b1bf892618e19e6ea0de444cffea0926d8370f8309fae4fececcea4bf494b1b4b51ec6c382dbb7e46d8286c7580da18675fcf
-EBUILD mp3diags-1.2.03-r1.ebuild 976 BLAKE2B d87aa21afa3e59150dce8e013382895a61d3ebde3b1a0b8041be79a3585ecb28a1c71986b4ae1e284bcbe9267573c3edeb396f2974b26262bac0546cbe9db10e SHA512 df66f959a95f4e6d3eab27c9427853e5276fd2cb91463eb9871dd22d3507bf8d274c0147635782e4ef91e186d32b291187b5e9e2ebb419f2f8748d594a213df0
-MISC metadata.xml 325 BLAKE2B 870cebb344ed8489084785249735b311d133cfde185a1f241317d9db85c303d55fe00fdf1145e806226bfd8bb451783386b8cc94bf966d4dc271f01440f763c2 SHA512 d95070978fa178f56a68e1f84591437e268b82bc3fd9d749232da9f1f2b3ab294e91a53162c3df10ea1da06c2c4ea1e9c1b3de112d87d79e60a6077ca1c57211
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
deleted file mode 100644
index 15326088a6ed..000000000000
--- a/media-sound/mp3diags/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mp3diags</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild
deleted file mode 100644
index d9c81af3d443..000000000000
--- a/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils qmake-utils
-
-MY_PN=MP3Diags
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
-HOMEPAGE="http://mp3diags.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/boost:=[threads]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:4
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4 ${PN}.pro
-}
-
-src_install() {
-	dobin bin/${MY_PN}
-	dodoc changelog.txt
-
-	local size
-	for size in 16 22 24 32 36 40 48; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins desktop/${MY_PN}${size}.png ${MY_PN}.png
-	done
-	domenu desktop/${MY_PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 69b08c8f6172..ad381f807df1 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-2.1.6.tar.xz 195864 BLAKE2B 0be5f5df492742745f56ca3ba90faa134c11f802aefad359e1c03852c87be87e2c57afac811d4f17d2c9303d41e905fb0c9a8c9985c179d216a511183118d369 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba
 DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
-EBUILD soundconverter-2.1.6.ebuild 1490 BLAKE2B e297e063dc167e5aedeaa72ab06636b905797a7ff0fd94ad6169317e7163fe199a3feed13231c72971c4d8451347691d6acc1d2291319c5a0816c1a1a151d028 SHA512 d74027db98593fcce85fa8a7a5ae965037ef53c5ac238a4f6a4457b87caa291907991badfecc35c3a9fb89d4128b662a3c61e6fa0b268e2b82c34f5e14f5f229
-EBUILD soundconverter-3.0.0_beta1.ebuild 1724 BLAKE2B e6a570798939c4570939dc0e8a9c7713e408b67fd7fbd029a3dae023171f991bc1c1311ad4b4c0064a53134507f67e36f98a2244e36469e1b9e8a718be3b0eb3 SHA512 ab6f36f0e7ca2e82dad02e7ce9567df646d17089f9874f3d478cc16d800edc5d7df460fa3f750508404e72d806591f96be3f3a79cb4bcf55ad299cef63d65452
+EBUILD soundconverter-3.0.0_beta1.ebuild 1723 BLAKE2B f23e65f31ea2707e8bced4de1a19813c5d0b140aa5e38c8d6b0dfa46a2a92a771b3d590e0479e88d2239eb6b95f126068e959fd8f1821a258682db02bb9d3e9c SHA512 703175800399bb19fed41bee82a0e839a10f0c1d36f9da5c7854d8d030788f246ffb449765e20651e42fa050e966e1e45c1ca01cbdd0f4002e6434f8777dbc16
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-2.1.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
deleted file mode 100644
index 0636d6903f5c..000000000000
--- a/media-sound/soundconverter/soundconverter-2.1.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac mp3 opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	gnome-base/libglade[${PYTHON_USEDEP}]
-	aac? (
-		media-plugins/gst-plugins-faac:0.10
-		media-plugins/gst-plugins-faad:0.10 )
-	flac? ( media-plugins/gst-plugins-flac:0.10 )
-	mp3? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-mad:0.10
-		media-plugins/gst-plugins-taglib:0.10 )
-	vorbis? (
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )
-	opus? (	media-plugins/gst-plugins-opus:0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
index 9e6a1a333528..3a778827fb89 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 110da01d3f6d..3d4283de6e57 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dvbstream/Manifest b/media-tv/dvbstream/Manifest
index 0c9e5d4830a5..a8803c19e61a 100644
--- a/media-tv/dvbstream/Manifest
+++ b/media-tv/dvbstream/Manifest
@@ -1,6 +1,6 @@
 AUX dvbstream-0.7_pre20080302-telnet-port-switch.diff 976 BLAKE2B 54ab99dee8e90efc1e3bb623102156aa21cca6697d6edc3662d81284430ad0a7e295f53aa855e81776ba50bc8f05c315fbe2c7606977a3c3ae3341dcd063f368 SHA512 84f4cb764db871e1f3d42fdff7e550be2866caf21b725a065abce500a29f8db52087d02ac2446891c1a14f08521deb175362bdc2ffe00d5cb6bc237b31c02781
 AUX dvbstream-0.7_pre20080516-update.diff 334 BLAKE2B d729def0db777e853cbdd36bb8034885f84ccb5debc816d9d8d2f902c61044b1aa60c05b50d9c7f509be36e3cd3b3ef15fc980b44734a891873d1e31189d0aab SHA512 c22d5e25dc9cad4fe864864b9f4100d6e335236f865f4c8a15b29ce0dd22f1aef77dd9777aeea0529e0cdf0402cc76e55b6140595a8d62231ffa6145f868be92
 DIST dvbstream-snapshot-20080302.tar.bz2 58089 BLAKE2B 9dd2fdd5e1dfa3741554b84cd5361697cef16b0ecba6ee5a8a2890959678dfc1497e54003d9b5ebb9e0092e5f3e71a4b5786a2c2e224d31a9243ecaafeea98e1 SHA512 7116310435584b61c51f642d38cfdbbdf706df27448af7824b5a050e374ad72d3d08c2eb03de0d5ed6ec1cb15461e3be90ee8bd3b045b6ba858b5896c5546671
-EBUILD dvbstream-0.7_pre20080516-r1.ebuild 1514 BLAKE2B 9d86bb7ee2847de890f03f8b95f04aaa564bf2cb851e0c212729148abe5152dc7947a5d591224e42f728e0b8ed9cb9535cffef6b070613507440a7eaf4aa6b6b SHA512 fac51cad993fb651bd48eb7409aa16b781282201c92ce76bd72e371d0201ebc4e93441517fa15b83901cc9bcfc8871aa79c06703baa6445d3aae435372e4e6ce
+EBUILD dvbstream-0.7_pre20080516-r1.ebuild 1513 BLAKE2B 56f440c996ddf5d0aee9e359faa80dfde8962ec710a6e93eefe4efab7d2306503c8d2000d37c3c3a06150c39ce70dfc9c6ea49c7e68c6349dee4a8b7d4c4bc18 SHA512 28d43eb3e25687393136e9f491f98e045759adb50d19bd5b241bd188bfcf263051705adde637d5c03d1e7614607d8b0369a8e2d2ce37c7668693e52a9965d8bb
 EBUILD dvbstream-0.7_pre20080516.ebuild 1361 BLAKE2B 7c6937e21f004878a00d9c18bc64e8d0ce05cd0522748ba690cd6ee48c80bd5055401dcbba23c2c362451a83737e61af34eff981dbc6c0783ed4661dde3e142d SHA512 3cd5f1752917d7d37636f7ff349c999b7158fccb785ae9ef41373a2fcd7e5d0b9bef2d116539ce36eb8ae3e672d1dfd01cc7998f959db7a0206c2c80d358893a
 MISC metadata.xml 245 BLAKE2B 93ecb07b44a63a38bcbad0ea9783d8ac97a77a78c66e78941b16086522c2e07acd645544eba5c9d1a8efa0f1cb418e558501bd7b64f6e74dcfd9081b8632368e SHA512 d07141fde891b0f88b4f91ea7b4e7da644ad57f74ac7a9f3d43af56c387a9d06e4b995e18756222c77f8ca6d8fc6d83081806b77c19ded68dbc6fb6845af18e5
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
index 376728afc3e4..80b5df4b7c5a 100644
--- a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 35d8dbdf711f..0a5018446323 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -12,13 +12,16 @@ DIST kodi-17.5-generated-addons.tar.xz 57556 BLAKE2B d162146b5888a5731d4aaf05d45
 DIST kodi-17.5.tar.gz 58292301 BLAKE2B a57838754a4fb73ad439dbb8b82284b530ee91790bd8c1e33b8c1ef074b63d6968ce50025e5a4a395acb4739f8ef430c93f3162844ca39f24e17ed61e4ef9cdb SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736
 DIST kodi-17.6-generated-addons.tar.xz 57564 BLAKE2B 9b3000ac23a6aab24b703a2b66016dbf0637ff3d615b89435cba3717acb913a4543bb57aaa9ae59a9493891ba62af06414ef2c0cea3a81e9ec32ea60e209330d SHA512 ee1344e859b2871f9dd3e2f2f75f9c0f9f787ac111a6b9ab8f80af6524a786d51baeb4f247a8c5b35001073be49bf4289d1c63e3114625143f3747aa9b1f4be2
 DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c3a7f4a32e26c802bae9795979554204148e06d1923d8e68ba1f06f9d92bf11416f73cf9431381642ca00639 SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
+DIST libdvdcss-1.4.1-Leia-Alpha-1.tar.gz 100997 BLAKE2B 2baee62df94c98573a224b97d871f2f7de0fc01a283ceab1a5e9763df6481bc58725d3d3276d6d8ed3c928b220c85fad06b9bb03199022859d51da59c635a4a9 SHA512 e3d3fa59baa0b23121f5a0cd85fa765b0db48fa89d7874a164b37f0be6d52622f2ac76cc1831fcad683fec8e71b47700d2c46cf6a65ab1ccd75e9d1bc509771f
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
+DIST libdvdnav-6.0.0-Leia-Alpha-1.tar.gz 138014 BLAKE2B dea8723c271fcc58ae61f9ebf0875aae7dc2237810dc0073b111dec7a2f4a23888716734022c68ef7376bf893ea94736fe98148b2b6cb24d0deef9679a189739 SHA512 24e3d7ebbf66ae9e75e234b3aea597c8f2d5e1a6f211d22900aa62d918e3dc38c80f2678c94fa360c100a630081573188ce7e15758843be7497011b96da89ec4
 DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
+DIST libdvdread-6.0.0-Leia-Alpha-1.tar.gz 130629 BLAKE2B e7f5c08ed1aca3d35fad178d57b852587196bd250865a47ee7e9e60bca1f21967503e13dd947086a7be357bfceec55982600525c4927dadda72e21f2bf0632b0 SHA512 4fa4c7d6856713ccd10a022e699bb13dacab8682eceb8f0d30ec9266646e493f667000d36246b91330e68f1c59ce5c7cb26c531a123ce4f847678cef9bf32ea9
 EBUILD kodi-17.3-r1.ebuild 8577 BLAKE2B 89b0b422d7aafcd17a23d85e9821185e2afb7ae86e39cd0bee8355b7dbbd4478dc08f2010312d6af7a1987e33578b3a6db2c1b28549e2541c843617594168989 SHA512 be9bf1b24d6bcd3d797ee9f12a9495a7bd1245904b1a361a5bb67fff64eae69a9c5f8f3ae9b2a9c2aebe28b62c755135daeea7ae4f077e68ce5f0cad3169a78c
 EBUILD kodi-17.5-r1.ebuild 8830 BLAKE2B 8f09f8a724708f406157cb6a3acb81e06ca2c2f54bc81dab24b44b539ac1f3ca20cc450ce369fb516f7e8f80e0586af7e654418bca701e9df897e5f0f579a04d SHA512 68e7232a7a45afdfe8b042b4b999e2b7d803bf2812d021155636c40789ec713da025c7c8d01e094bc94121e7f8b22e6cccfc6871f99086646886059476da8df0
 EBUILD kodi-17.6-r1.ebuild 8741 BLAKE2B 63512c0c3c77736a551d2b0a255048a7579f852a5c3b592cb70581747dd7fc04a7beb9b1ceee60222266cb9e478e01f39dbb07f4e84f1a35b509bdb6552ff779 SHA512 6be7bb9f2bc68ef8dfbdf71972d221c503133f99ad42d1b434256d4c55fa6b9edeadc097f928c5176b1038d687b3dc5b38ce083aae969af6147e64562f68cf9e
 EBUILD kodi-17.6-r2.ebuild 8743 BLAKE2B d0d6014cc8735bf9cc273ca9848aff83c466257f551694c3dbd67ce3882b85f7dfab8c29302289f3406848935f8ee4700ad16e8ab7e9445ead5dca29d7d12fd4 SHA512 01ef54d3ae4404f768c126fac8a39ba66ebcf038104322a2f14bd903d336430d935f0201dc84d1025f9d1fd1ea4109de73c7de2342c8f47154a8b08e9c73a571
 EBUILD kodi-17.6.ebuild 8745 BLAKE2B 98d3a0a1b855474eb0bf68b49bbf26a229ad0e8d7a825f10aa131e423401de090bc237a1dae00da87575a851b5f62e27c086964f58afdc6b8e3649b5093b3bab SHA512 e0ab4f578136da46ae6910886d2a8239bf81acdb39256158d616d12a4a6ee168fb45424a3fbd5f31d110117223dcae85d9d881485d238c9c7f59101ca112cc57
-EBUILD kodi-9999.ebuild 8929 BLAKE2B b54f2a127046257898a1961f41d1896e33e602d0c50a113a9a45aff8aeda5696fba1907a3730352374a63b5da311a875f20088137657b9dabc3d5b8ff3565709 SHA512 8da04c2e8f532597e6ed2e2ab87a68700bf7c5f5c24a9d628634d47921b48b4aa09a342e6a68592c2474864ffafa7b92409b7d9fe27e1fe6b37be8222192c3ca
+EBUILD kodi-9999.ebuild 8875 BLAKE2B 2506a7bac1ecb991119d91414f0d383ee1ca91553fa5df2fc5004f4454e9a6a40b490a7aa32c95668b2f45cf289bab693999afeac610ecfd00b2ac787a6272bc SHA512 58cbc0319557989b67c6dd652f5141ce6601de86b5d22d8b7d73437b6eea95657f5c80a587f76e0300500427639c3f38d99310d3a12d520a63051270940b46e2
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 3996c58ade2b..4b879a0487a8 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -9,15 +9,15 @@ PYTHON_REQ_USE="sqlite"
 
 inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
 
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+LIBDVDCSS_VERSION="1.4.1-Leia-Alpha-1"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-1"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-1"
 FFMPEG_VERSION="3.4.1"
 CODENAME="Leia"
 FFMPEG_KODI_VERSION="Alpha-1"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
@@ -248,9 +248,9 @@ src_configure() {
 		-DENABLE_VAAPI=$(usex vaapi)
 		-DENABLE_VDPAU=$(usex vdpau)
 		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
 	)
 
 	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a8efabd08ba7..338a087ab777 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/blinkensim/Manifest b/media-video/blinkensim/Manifest
index 28c45111d7aa..b64dcdf54acc 100644
--- a/media-video/blinkensim/Manifest
+++ b/media-video/blinkensim/Manifest
@@ -1,3 +1,4 @@
 DIST blinkensim-2.7.tar.gz 88416 BLAKE2B a1ac70795f1eeb70ef3d4ff4a961a76c591071aaf4278a7a046d317b7c5a7dd2a19595ed0db659735f97143e1dffba3c53edd00521a8b450dbeb17b31d174c0f SHA512 35be6f0d871ede4ed3de1bb2a18e53e8a508a08001d795369cf222122dd9596ac48314d1c386905360be0a46b1fefffa763bdb9874eaaa6e1ed713a48a6fefd4
+EBUILD blinkensim-2.7-r1.ebuild 647 BLAKE2B 990d0a5cd5b5b9b0a61fbe4d1a15dcd7439711470dc69a01d16ba013c29210c3411121609ac0c605b2fbe1492104a01296d94bade9b1e8a32278ba8d58e792a4 SHA512 bef108b952734fbbda8047a6ebcb5ec2a96c4369c42e336170e81b8ed0eff451523d004bbbf8c952e6541f59b43899b0d614783a7355936b24e6c91695c228bd
 EBUILD blinkensim-2.7.ebuild 751 BLAKE2B bb225998d98c307d1510e962df3a6ceb38c39e5d20d5ac9332510d805c350ae5186ec7756f0b2d7d159ea49a9e5500d7c1591ccc663245b8d37466508273f873 SHA512 6e3206c78dae598a104b9baf9751ffaf7c59c4a9dd49cc3f3d375abf6a86dfc853ba3e71087f754c756c955225e6593eb4f5d44a85684f3406d04142eaa1afb8
 MISC metadata.xml 360 BLAKE2B f7cfcf7e66ea5a7ae30864099416f896879b5fa28422420e6e597e6c0fe190a8ecda1518c1cc277a13444099f08eb31f27835b07194d8984e7dd04a8df3a4375 SHA512 b8538f19756f7bf5248e4d60916093cb4aba5d06947dfcc152168941d43acedc6079e0c0aee3da4089a06a6956f74320f874b4cf50d50ae8d7476f2838901782
diff --git a/media-video/blinkensim/blinkensim-2.7-r1.ebuild b/media-video/blinkensim/blinkensim-2.7-r1.ebuild
new file mode 100644
index 000000000000..3aac989943e0
--- /dev/null
+++ b/media-video/blinkensim/blinkensim-2.7-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DESCRIPTION="Graphical Blinkenlights simulator with networking support"
+
+HOMEPAGE="http://www.blinkenlights.net/project/developer-tools"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aalib gtk"
+
+# if the config script finds any of the optional library it will try to
+# compile against it
+RDEPEND="
+	>=media-libs/blib-1.1.4
+	media-video/blinkenthemes
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b8d9988bc691..0042c691289f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,12 +8,12 @@ DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 7d6f094ca0bd5e2cab02e051acc8e554873bca
 DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7 SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
 DIST ffmpeg-3.3.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
-DIST ffmpeg-3.4.1.tar.bz2 10177055 BLAKE2B b92f5a5d03770a52d1b3c2f20f0327acd17bff1dcc59ce3193f23695544838768addd807d38459c433172e9ad7410617cf1f30f3b2027a6558231138cac0233f SHA512 e509995eac0d54ebb7c0896303d1060ca1425841811df1b2bd61c9e41363cc50c91144bd3a7cf47e0d618591368763d054c3270b7a0a4b0e794c49bbdc59c4c5
+DIST ffmpeg-3.4.2.tar.bz2 10179184 BLAKE2B a9116fd42b62683d904159b4317df7216df556268d5ac05f48c2204b7269d353746ecd709ad194cab542627047b991528bcfe7c302439753f96ddc5617ab236b SHA512 7d14865316d514b8fee19431b45c5f456422447bd7c68a746e06c6f7450a49aff1ec1d9f88b642c9072e846163d1f7bbe41d1cf73a1ad580f5162f58c8b30fb4
 EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c5be63a9d8a5271bee58729dd014e1843ab55c9e5ddb616d4290e8daca0eac8f4c586fbfc5faae989e16929be7 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869
 EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e
 EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b
 EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616
 EBUILD ffmpeg-3.3.6.ebuild 16111 BLAKE2B cfd38b5c31fa6ac16ff08a5693a97dc4de04146a3c841d501ece315b3d4eb717d95a0033b336b02e2f96fb1c201ba6a4a940e0617e995e3cc888bc0681b995e1 SHA512 a2c764effeb92ba71d9563cca131fb0ad6bec842f4e9369152fa93d4a148f142b39aeae895457934dc668cf2c6db0de13bbc5cf7b7c915c3dcc0b0376d6b27a7
-EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39
-EBUILD ffmpeg-9999.ebuild 16057 BLAKE2B 262d140c3b9e9eb2f663336a77cfa94610401bcc41e5bb81ab50b7eead6bcef70a70b1ce314196557c7f334ff42e7aacdbb5914d50b8611f5a1cba8a77d0314d SHA512 bfdcf1a4c23372da65eb2be595e05975f1b28677ef04a101ee9150b6347a61f4b634a4e50a78a5b58c4514453d523550d5a2af4929a2d03e1ff9525cee454381
-MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3
+EBUILD ffmpeg-3.4.2.ebuild 15729 BLAKE2B b2b84197b20a1b904aa91d4c48b5a7597a25f6911e3d70349cb0595861a6bb2efeb05392a527bd522e5950cd2ef8f8b9d58d75eef60a385401bea22e1bbe53b9 SHA512 a01935dd9c4708bc4b60cc47e57957ab0e65d9ac581aca153fe63362b7d17bc93e5c1f18278d2e7b95952ca4ef5e73d915478a27fb71aa2469885f78679608f7
+EBUILD ffmpeg-9999.ebuild 16113 BLAKE2B 1a59bc78f50cfd32417585ee2b8c78ccddc73cf3fef56dd28c0e5b0ed960ec3d252dc72228258cf0cd8ab015bcd9aa1591a1b826d4967f91f3cdf555385254a0 SHA512 082965818e981aa37f203af1fd12d81bba93247aa9cccf93c498637e7c3743232d5a2cabf35cff0f3c271a939f81df87df21013557f30ce3ef687b2ca8728bf5
+MISC metadata.xml 5749 BLAKE2B 1ff5bfe813e5dda3fb09ccdd7383adeceb2599ce173680eb917b7d088af6dd5f8d2434cb7a353b3f9dbf2d5ec3ecc05e3d4afab832e644d5aa7e5f9fe7e9082e SHA512 f635920b77f6e186f1a80a6a9a989a0d0876e915573d29f120631fc871bb65709d1fa9e1c29b4d5be3039465b8ea69ca966fc87435ff2a42cace5575fb92d435
diff --git a/media-video/ffmpeg/ffmpeg-3.4.1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.1.ebuild
deleted file mode 100644
index 4e76b854556c..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.4.1.ebuild
+++ /dev/null
@@ -1,490 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg vorbis:libvorbis
-		vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.4.2.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
new file mode 100644
index 000000000000..d6095bce04b2
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
@@ -0,0 +1,491 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=55.57.57
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex svg:librsvg vorbis:libvorbis
+		vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar nvenc:nvenc
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode jack oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		nvenc? ( media-video/nvidia_video_sdk )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( sys-apps/texinfo )
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	test? ( net-misc/wget sys-devel/bc )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Compiling for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			einfo "Installing for Chromium"
+			pushd ../chromium >/dev/null || die
+			emake V=1 DESTDIR="${D}" install-libffmpeg
+			popd >/dev/null || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index bae322e21e76..b9fe40c792d9 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
+		libv4l:libv4l2 pulseaudio:libpulse libdrm
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
@@ -211,6 +211,7 @@ RDEPEND="
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index e55fc74c4155..408dbb8e3c1f 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -30,6 +30,7 @@
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
 	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
 	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
+	<flag name="libdrm">Enables <pkg>x11-libs/libdrm</pkg> support for better screen grabbing and hardware accelerated codecs.</flag>
 	<flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c87921628d06..e1918bd904cb 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,13 +1,6 @@
-DIST libva-utils-1.8.0.tar.gz 1011595 BLAKE2B 17a148ad866e0fa9b9871d15eb2e7adbf11f768db8b97eff8dbcf540b07eb2a6ef7f5baf052379dc44c51458042c3a22e35813e9b562a962b11a71a0530ce4f1 SHA512 020cf1d5af7a78ecb4806afe69d34106525086f10b007dddb8d36c0243b670c311df537d969c8b60222b4afc7bfc08c1d594843339af72618886eecfd03887ec
-DIST libva-utils-1.8.1.tar.gz 1011602 BLAKE2B 49a55f2bc2334e90c9d3519db3e86d999257bb41cc4bfe8bbad11fad88fa3da6e14dd188474fe9187c3c1ac3a8833e529c8e87a586b76351c99fc49c0c64dcf7 SHA512 7b60cf773d7156bf5579754d0525a8cae07b5e63416fd1c6481a9bada388515f8f14d23661c11689599af7ddd192440f96f2c8873b539cf93e7db0550d4e1aae
-DIST libva-utils-1.8.2.tar.gz 1011622 BLAKE2B 549b7ef0d4d2049423ff898d6eac94a29a164bb793626f0e93502ec7d4bf9cd8f0da40e5e6311372f6d144e49f5ccd9f7d66addf927857640c399785cda8204d SHA512 e6d1e025d1c27112bf61869fa097a27c81bff9fb1ed5226842f3c7685852b4cc8903b0a29204d3c85bc4513dab9331b327de0f93c9493a411ab15e7e577ce616
-DIST libva-utils-1.8.3.tar.gz 1012261 BLAKE2B a42c61d50e643f65e23689716a3c96eb5f617728c0e7a070eb7d88f7c1271c3abd50535ed8bb15156e21d207e38c9d89b7dddd11dce85b792f521b2707551cc0 SHA512 0a16243f39556cb7853c144b91c1fb07d4a4fafd43d05f5519af969153bc8a4e5f6512c665c0c7c32c413d50e913f8977bef004bf639f606ae5d6f6af1571d39
 DIST libva-utils-2.0.0.tar.gz 1033292 BLAKE2B 5f9e36d2a69a6a65f3d47b0e29aa1807201da8bd69eb00da5dc232b2629fdd01279c38af77335244f673b4f2e849ea3cc89a572b7ce26fd614f44461603c0c19 SHA512 5c435b558fdeec6dc597c531b1e72e1a6e8b4f59f5f97af30d01b39a20430446cce7af5553b924144fbc54a64f0e39ab232c76e4e8a266329cc9868d60be0c4b
-EBUILD libva-utils-1.8.0.ebuild 1244 BLAKE2B 3e25949b69c82cafefef573a44d4916d46784d3a881caa249921729fb08d8582f26258ba280b690ecfdd5e4bf5583aaf060b14ce04043289b3f4fea4b7770269 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816
-EBUILD libva-utils-1.8.1.ebuild 1244 BLAKE2B 3e25949b69c82cafefef573a44d4916d46784d3a881caa249921729fb08d8582f26258ba280b690ecfdd5e4bf5583aaf060b14ce04043289b3f4fea4b7770269 SHA512 af4e585ffcacbe4d13283661dcf0e2136d7a75ea0ad81cf716fe565ee0badf7ebc4aecf358cf67b428c942c8f29c5e1ffb03586af2e97f3028007c0e24662816
-EBUILD libva-utils-1.8.2.ebuild 1348 BLAKE2B d1eb64cfecb5b490edc97712dddb2f148dde646443895c6b77f547d33002badd3aaee78d0c98126cf264850bab0a34f6a262c998d005fa687e811d988afa0a6a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e
-EBUILD libva-utils-1.8.3.ebuild 1348 BLAKE2B d1eb64cfecb5b490edc97712dddb2f148dde646443895c6b77f547d33002badd3aaee78d0c98126cf264850bab0a34f6a262c998d005fa687e811d988afa0a6a SHA512 26bfb37359a065a5e4776a046f69f3213b2f82ffa6f0762c17b4416d27d16ebe982947fcc99df4b70cd4ed3d52500264dc5633591d108006739b9de59b86ae5e
+DIST libva-utils-2.1.0.tar.gz 1034951 BLAKE2B 88fb075bd1946bbba79c460640c3242a6ad85fcb6396a77b549ce3d2193fb4ab6df35b70a0981d56cbc40822a9b2146074255f573783547b23ee0e7d8670fce3 SHA512 2dbf1e1849136804be8970b1f02957e6e3eb593a72e34289e8e2c087b3a358596e5eed7d17d3c56701045116a0658450c37b26600a352dcb37ed0d58d5e14ba6
 EBUILD libva-utils-2.0.0-r1.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f
-EBUILD libva-utils-2.0.0.ebuild 1350 BLAKE2B 4a4cb8ff640c73cedca99d436f8b33111bda7406aa94021e810b0111c999a14df0479a846e5b2239a57b7c3971db1ce42815df8a11a45fd84d416084d94d2390 SHA512 9003e0d228567dc29970bcbca498bbaabceaa3252c8e020a06677159351d1870a6865514fe6466213c56c5d69507d285f1b503cb7718001a83b6dbc9b1caff3a
-EBUILD libva-utils-9999.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f
-MISC metadata.xml 414 BLAKE2B 6a77b200f9b416b31b36c5f2b19f0100b123e6e624afe9aea3c3ca4ffcfa1bd113b27467737a4e757a1071e2286baa20b50a62d6ed666593ce88cc36dcd89dd8 SHA512 4135a2f2d53fc2e53c1eec8c51f24ca2ddfe062b541de33df0fad5c6e21332902249e80b1d049711e7890c9b3802e29bc22d1695afda74949c364b533a829d8e
+EBUILD libva-utils-2.1.0.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
+EBUILD libva-utils-9999.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
+MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-1.8.0.ebuild b/media-video/libva-utils/libva-utils-1.8.0.ebuild
deleted file mode 100644
index ef34dbe2e6cd..000000000000
--- a/media-video/libva-utils/libva-utils-1.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-1.8[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-1.8.1.ebuild b/media-video/libva-utils/libva-utils-1.8.1.ebuild
deleted file mode 100644
index ef34dbe2e6cd..000000000000
--- a/media-video/libva-utils/libva-utils-1.8.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-1.8[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-1.8.2.ebuild b/media-video/libva-utils/libva-utils-1.8.2.ebuild
deleted file mode 100644
index 0c4c99ffb3d8..000000000000
--- a/media-video/libva-utils/libva-utils-1.8.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-1.8[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-1.8.3.ebuild b/media-video/libva-utils/libva-utils-1.8.3.ebuild
deleted file mode 100644
index 0c4c99ffb3d8..000000000000
--- a/media-video/libva-utils/libva-utils-1.8.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-1.8[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-2.0.0.ebuild b/media-video/libva-utils/libva-utils-2.0.0.ebuild
deleted file mode 100644
index 408a185f8394..000000000000
--- a/media-video/libva-utils/libva-utils-2.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
-
-DESCRIPTION="Collection of utilities and tests for VA-API"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm test wayland X"
-
-RDEPEND="
-	>=x11-libs/libva-2.0.0[drm?,wayland?,X?]
-	drm? ( >=x11-libs/libdrm-2.4 )
-	X? (
-		>=x11-libs/libX11-1.6.2
-		>=x11-libs/libXext-1.3.2
-		>=x11-libs/libXfixes-5.0.1
-	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_prepare() {
-	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-		$(use_enable test tests)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/libva-utils/libva-utils-2.1.0.ebuild b/media-video/libva-utils/libva-utils-2.1.0.ebuild
new file mode 100644
index 000000000000..6c7521ce0786
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.1.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 98dff65e7b52..6c7521ce0786 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-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=5
@@ -7,7 +7,7 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva-utils"
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
@@ -18,7 +18,7 @@ HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/01org/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/libva-utils/metadata.xml b/media-video/libva-utils/metadata.xml
index f539c20c15b0..6a47b632dfe2 100644
--- a/media-video/libva-utils/metadata.xml
+++ b/media-video/libva-utils/metadata.xml
@@ -9,6 +9,6 @@
     <flag name="drm">Enables VA/DRM API support.</flag>
   </use>
   <upstream>
-    <remote-id type="github">01org/libva-utils</remote-id>
+    <remote-id type="github">intel/libva-utils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c14b4ec7332b..2be7d8cf61c5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,11 +1,12 @@
 AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
-AUX mplayer-1.3-vdpau-x11.patch 543 BLAKE2B 5e8b01243a8fd8a09389adeefadd2e3631a679138b3e50d100737703854121bb02815829dcc2ff408ad90389cba95da8ba1e4585e8c8dbd25ef52c9802f56f2e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805
+AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
 EBUILD mplayer-1.3.0-r3.ebuild 17268 BLAKE2B 39bc007a2cd9c4d24423e34f4b5748225bb3eb673866e363e52f4cea715ce0a7c5ffd4768bd662e153b66290c07a2fe3bee0215aba30c70a5f4eab5339602d6a SHA512 1ef846cce25623acb7f58ea8f359b9ec3acf545c7c38f463d7df129bfe768d01f863bd852037244807fa8c1370660686f7c45a34756c42f8c60dd4548c0b79d1
-EBUILD mplayer-9999.ebuild 17132 BLAKE2B 9d444e6097f769bdf7e2a02ee0f208939a21975dda02af25757f48d971913d5bcf65eeaa3f24345e5b4864cd0c058e3ddef83ad3fe6fc09abc21aa9141a9258b SHA512 79b644282fc1b5111d3b7ecfc65294b8e07034efd79ff512db3d607e804d7483b647f82aa7e66f9e32621d5c0721f7e6ca66f138f57dd42498f49f082742d53b
+EBUILD mplayer-1.3.0-r4.ebuild 17195 BLAKE2B ed7c637741d29fc34e4ccabb168a083705ee38e8b936c2ba9bf09692d52c16fb3bab09454806642c4502ed2d177c13898c2b8b3ec707d5d661f4bfd866c5f96e SHA512 f220b5fcd06a375f48d28aafa3e6ac0ec26fe9d88e1eff531e53f3b546879ac9abaa722dbf30b74b62921b1ecdc1fa05ca8e5c9edbcb6d60fd8077e2084c36c7
+EBUILD mplayer-9999.ebuild 17044 BLAKE2B 1b85b2ca48e0f3df600c89e2c6f4bafb30e7c2c38f0d9c3cef8026528d85ce2fa851fa5d6399560a7ffe89ac3accd78909b1b187a04a0b52285eec0628c63830 SHA512 b4fdf43ac7782b680a8095a440a33db08f60c15fdbca24a1e89b55417d18639844cc8883e6d79daac9f0bca77df1b623f6c3b2676725f27a4e5451a08d2f8a68
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
index ae21941a8aa1..cfefb63deb94 100644
--- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -7,8 +7,8 @@ commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
 
 Index: libvo/vo_vdpau.c
 ===================================================================
---- libvo/vo_vdpau.c	(revision 37931)
-+++ libvo/vo_vdpau.c	(revision 37932)
+--- a/libvo/vo_vdpau.c	(revision 37931)
++++ b/libvo/vo_vdpau.c	(revision 37932)
 @@ -34,6 +34,7 @@
  
  #include <stdio.h>
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
new file mode 100644
index 000000000000..d1f122ab57df
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -0,0 +1,629 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+
+VIDEO_CARDS="mga tdfx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+	RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+	MY_P="MPlayer-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+	RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+	!truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+	virtual/ttf-fonts
+	media-libs/fontconfig
+	>=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+#	nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+	sys-libs/ncurses:0=
+	app-arch/bzip2
+	sys-libs/zlib
+	>=media-video/ffmpeg-3.0:0=[vdpau?]
+	a52? ( media-libs/a52dec )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bidi? ( dev-libs/fribidi )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	bs2b? ( media-libs/libbs2b )
+	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+	dga? ( x11-libs/libXxf86dga )
+	dts? ( media-libs/libdca )
+	dv? ( media-libs/libdv )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? ( >=media-libs/libdvdread-4.1.3 )
+	dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	encode? (
+		!twolame? ( toolame? ( media-sound/toolame ) )
+		twolame? ( media-sound/twolame )
+		faac? ( media-libs/faac )
+		mp3? ( media-sound/lame )
+		x264? ( >=media-libs/x264-0.0.20100423:= )
+		xvid? ( media-libs/xvid )
+	)
+	enca? ( app-i18n/enca )
+	faad? ( media-libs/faad2 )
+	ggi? ( media-libs/libggi media-libs/libggiwmh )
+	gif? ( media-libs/giflib:0= )
+	gsm? ( media-sound/gsm )
+	iconv? ( virtual/libiconv )
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( >=media-libs/libass-0.9.10:= )
+	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live )
+	lzo? ( >=dev-libs/lzo-2 )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	mp3? ( media-sound/mpg123 )
+	nas? ( media-libs/nas )
+	nut? ( >=media-libs/libnut-661 )
+	openal? ( media-libs/openal )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	pnm? ( media-libs/netpbm )
+	pulseaudio? ( media-sound/pulseaudio )
+	rar? (
+		|| (
+			app-arch/unrar
+			app-arch/rar
+		)
+	)
+	rtmp? ( media-video/rtmpdump )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora[encode?] )
+	tremor? ( media-libs/tremor )
+	truetype? ( ${FONT_RDEPS} )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( !tremor? ( media-libs/libvorbis ) )
+	X? ( ${X_RDEPS}	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+	x11-proto/videoproto
+	x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dga? ( x11-proto/xf86dgaproto )
+	X? ( ${X_DEPS} )
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	amd64? ( ${ASM_DEP} )
+	doc? (
+		dev-libs/libxslt app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+	)
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+	dga? ( X )
+	dvdnav? ( dvd )
+	enca? ( iconv )
+	ggi? ( X )
+	libass? ( truetype )
+	opengl? ( X )
+	osdmenu? ( X )
+	truetype? ( iconv )
+	vdpau? ( X )
+	vidix? ( X )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
+pkg_setup() {
+	if [[ ${PV} == *9999* ]]; then
+		elog
+		elog "This is a live ebuild which installs the latest from upstream's"
+		elog "subversion repository, and is unsupported by Gentoo."
+		elog "Everything but bugs in the ebuild itself will be ignored."
+		elog
+	fi
+
+	if use cpudetection; then
+		ewarn
+		ewarn "You've enabled the cpudetection flag. This feature is"
+		ewarn "included mainly for people who want to use the same"
+		ewarn "binary on another system with a different CPU architecture."
+		ewarn "MPlayer will already detect your CPU settings by default at"
+		ewarn "buildtime; this flag is used for runtime detection."
+		ewarn "You won't need this turned on if you are only building"
+		ewarn "mplayer for this system. Also, if your compile fails, try"
+		ewarn "disabling this use flag."
+	fi
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Please note that upstream uses media-video/ffmpeg."
+		ewarn "media-video/libav should be fine in theory but if you"
+		ewarn "experience any problem, try to move to media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		subversion_src_unpack
+		cd "${WORKDIR}"
+		rm -rf "${WORKDIR}/${P}/ffmpeg/"
+		( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+	else
+		unpack ${A}
+	fi
+
+	if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
+	fi
+
+	if ! use truetype; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			font-arial-iso-8859-2.tar.bz2 \
+			font-arial-cp1250.tar.bz2
+	fi
+}
+
+src_prepare() {
+	default
+
+	local svf=snapshot_version
+	if [[ ${PV} = *9999* ]]; then
+		# Set SVN version manually
+		subversion_wc_info
+		printf "${ESVN_WC_REVISION}" > $svf
+	else
+		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+	fi
+	if [ ! -f VERSION ] ; then
+		[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+		local sv=$(<$svf)
+		printf "SVN-r${sv} (Gentoo)" > VERSION
+	fi
+
+	# fix path to bash executable in configure scripts
+	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+	# Use sane default for >=virtual/udev-197
+	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+	local myconf=""
+	local uses i
+
+	# set LINGUAS
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+	[[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+	# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+	# compilation in almost every situation. The reason for this is
+	# because if --enable is used, it will force the build of that option,
+	# regardless of whether the dependency is available or not.
+
+	###################
+	#Optional features#
+	###################
+	# disable svga since we don't want it
+	# disable arts since we don't have kde3
+	# always disable internal ass
+	# disable opus and ilbc since it only controls support in internal
+	#         ffmpeg which we do not use
+	myconf+="
+		--disable-svga --disable-svgalib_helper
+		--disable-ass-internal
+		--disable-arts
+		--disable-kai
+		--disable-libopus
+		--disable-libilbc
+		$(use_enable network networking)
+		$(use_enable joystick)
+	"
+	uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+	myconf+=" --disable-nemesi" # nemesi automagic disable
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bidi  || myconf+=" --disable-fribidi"
+	use ipv6  || myconf+=" --disable-inet6"
+	use libass || myconf+=" --disable-ass"
+	use nut   || myconf+=" --disable-libnut"
+	use rar   || myconf+=" --disable-unrarexec"
+	use samba || myconf+=" --disable-smb"
+	use lirc  || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+	# libcdio support: prefer libcdio over cdparanoia
+	# don't check for cddb w/cdio
+	if use cdio; then
+		myconf+=" --disable-cdparanoia"
+	else
+		myconf+=" --disable-libcdio"
+		use cdparanoia || myconf+=" --disable-cdparanoia"
+		use cddb || myconf+=" --disable-cddb"
+	fi
+
+	################################
+	# DVD read, navigation support #
+	################################
+	#
+	# dvdread - accessing a DVD
+	# dvdnav - navigation of menus
+	use dvd || myconf+=" --disable-dvdread"
+	use dvdnav || myconf+=" --disable-dvdnav"
+
+	#############
+	# Subtitles #
+	#############
+	#
+	# SRT/ASS/SSA (subtitles) requires freetype support
+	# freetype support requires iconv
+	# iconv optionally can use unicode
+	use truetype || myconf+=" --disable-freetype"
+	use iconv || myconf+=" --disable-iconv --charset=noconv"
+	use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+	#####################################
+	# DVB / Video4Linux / Radio support #
+	#####################################
+	myconf+=" --disable-tv-bsdbt848"
+	# broken upstream, won't work with recent kernels
+	myconf+=" --disable-ivtv"
+	# gone since linux-headers-2.6.38
+	myconf+=" --disable-tv-v4l1"
+	if { use dvb || use v4l || use pvr || use radio; }; then
+		use dvb || myconf+=" --disable-dvb"
+		use pvr || myconf+=" --disable-pvr"
+		use v4l || myconf+=" --disable-tv-v4l2"
+		if use radio && { use dvb || use v4l; }; then
+			myconf+="
+				--enable-radio
+				$(use_enable encode radio-capture)
+			"
+		else
+			myconf+="
+				--disable-radio-v4l2
+				--disable-radio-bsdbt848
+			"
+		fi
+	else
+		myconf+="
+			--disable-tv
+			--disable-tv-v4l2
+			--disable-radio
+			--disable-radio-v4l2
+			--disable-radio-bsdbt848
+			--disable-dvb
+			--disable-v4l2
+			--disable-pvr"
+	fi
+
+	##########
+	# Codecs #
+	##########
+	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+	use dts || myconf+=" --disable-libdca"
+	if ! use mp3; then
+		myconf+="
+			--disable-mp3lame
+			--disable-mpg123
+		"
+	fi
+	uses="a52 bs2b dv gsm lzo rtmp vorbis"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-lib${i}"
+	done
+
+	uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+	myconf+=" --disable-libopenjpeg"
+
+	# Encoding
+	uses="faac x264 xvid toolame twolame"
+	if use encode; then
+		for i in ${uses}; do
+			use ${i} || myconf+=" --disable-${i}"
+		done
+	else
+		myconf+=" --disable-mencoder"
+		for i in ${uses}; do
+			myconf+=" --disable-${i}"
+			use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+		done
+	fi
+
+	#################
+	# Binary codecs #
+	#################
+	myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+	################
+	# Video Output #
+	################
+	uses="md5sum sdl yuv4mpeg"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use aalib || myconf+=" --disable-aa"
+	use fbcon || myconf+=" --disable-fbdev"
+	use libcaca || myconf+=" --disable-caca"
+	use zoran || myconf+=" --disable-zr"
+
+	if ! use kernel_linux || ! use video_cards_mga; then
+		 myconf+=" --disable-mga --disable-xmga"
+	fi
+
+	if use video_cards_tdfx; then
+		myconf+="
+			$(use_enable video_cards_tdfx tdfxvid)
+			$(use_enable fbcon tdfxfb)
+		"
+	else
+		myconf+="
+			--disable-3dfx
+			--disable-tdfxvid
+			--disable-tdfxfb
+		"
+	fi
+
+	# sun card, disable by default, see bug #258729
+	myconf+=" --disable-xvr100"
+
+	################
+	# Audio Output #
+	################
+	myconf+=" --disable-esd"
+	uses="alsa jack ladspa nas openal"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use pulseaudio || myconf+=" --disable-pulse"
+	if ! use radio; then
+		use oss || myconf+=" --disable-ossaudio"
+	fi
+
+	####################
+	# Advanced Options #
+	####################
+	# Platform specific flags, hardcoded on amd64 (see below)
+	use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+	uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+	for i in ${uses}; do
+		myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+	done
+
+	uses="altivec shm"
+	for i in ${uses}; do
+		myconf+=" $(use_enable ${i})"
+	done
+
+	use debug && myconf+=" --enable-debug=3"
+
+	if use x86 && gcc-specs-pie; then
+		filter-flags -fPIC -fPIE
+		append-ldflags -nopie
+	fi
+
+	###########################
+	# X enabled configuration #
+	###########################
+	myconf+=" --disable-gui"
+	myconf+=" --disable-vesa"
+	uses="ggi vdpau xinerama xv"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use dga          || myconf+=" --disable-dga1 --disable-dga2"
+	use opengl       || myconf+=" --disable-gl"
+	use osdmenu      && myconf+=" --enable-menu"
+	use vidix        || myconf+=" --disable-vidix --disable-vidix-pcidb"
+	use xscreensaver || myconf+=" --disable-xss"
+	use X            || myconf+=" --disable-x11"
+	if use xvmc; then
+		myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+	else
+		myconf+=" --disable-xvmc"
+	fi
+
+	############################
+	# OSX (aqua) configuration #
+	############################
+	if use aqua; then
+		myconf+="
+			--enable-macosx-finder
+			--enable-macosx-bundle
+		"
+	fi
+
+	./configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--confdir="${EPREFIX}/etc/mplayer" \
+		--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--disable-ffmpeg_a \
+		${myconf} || die
+}
+
+src_compile() {
+	default
+
+	# Build only user-requested docs if they're available.
+	if use doc ; then
+		# select available languages from $LINGUAS
+		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+		local BUILT_DOCS=""
+		for i in ${LINGUAS} ; do
+			has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+		done
+		if [[ -z $BUILT_DOCS ]]; then
+			emake -j1 html-chunked
+		else
+			for i in ${BUILT_DOCS}; do
+				emake -j1 html-chunked-${i}
+			done
+		fi
+	fi
+}
+
+src_install() {
+	local i
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALLSTRIP="" \
+		install
+
+	dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+	docinto tech/
+	dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+	docinto TOOLS/
+	dodoc -r TOOLS
+	docinto tech/mirrors/
+	dodoc DOCS/tech/mirrors/*
+
+	if use doc; then
+		docinto html/
+		dohtml -r "${S}"/DOCS/HTML/*
+	fi
+
+	if ! use truetype; then
+		dodir /usr/share/mplayer/fonts
+		# Do this generic, as the mplayer people like to change the structure
+		# of their zips ...
+		for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+			cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+		done
+		# Fix the font symlink ...
+		rm -rf "${ED}/usr/share/mplayer/font"
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+	fi
+
+	insinto /etc/mplayer
+	newins "${S}/etc/example.conf" mplayer.conf
+	cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+	doins "${S}/etc/input.conf"
+	if use osdmenu; then
+		doins "${S}/etc/menu.conf"
+	fi
+
+	if use truetype; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+	fi
+
+	# bug 256203
+	if use rar; then
+		cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+	fi
+
+	dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+	newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+	[[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+		rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+	# Cleanup stale symlinks
+	[ -L "${EROOT}/usr/share/mplayer/font" -a \
+			! -e "${EROOT}/usr/share/mplayer/font" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/font"
+
+	[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+			! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+		rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index b75b7dbc479e..bc3255c47039 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
 
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
 
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
 +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
 +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
@@ -69,7 +69,6 @@ RDEPEND+="
 	cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
 	dga? ( x11-libs/libXxf86dga )
-	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
 	dvb? ( virtual/linuxtv-dvb-headers )
@@ -238,6 +237,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	local svf=snapshot_version
 	if [[ ${PV} = *9999* ]]; then
 		# Set SVN version manually
@@ -253,8 +254,6 @@ src_prepare() {
 	# fix path to bash executable in configure scripts
 	sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
 
-	base_src_prepare
-
 	# Use sane default for >=virtual/udev-197
 	sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
 }
@@ -414,7 +413,7 @@ src_configure() {
 	################
 	# Video Output #
 	################
-	uses="directfb md5sum sdl yuv4mpeg"
+	uses="md5sum sdl yuv4mpeg"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -524,7 +523,8 @@ src_configure() {
 }
 
 src_compile() {
-	base_src_compile
+	default
+
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 26fb0e23e73a..8f034dd48d5f 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,19 +1,15 @@
-AUX 0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch 1456 BLAKE2B e74c5828301daa303ee1fa826b96b06827ca6fa8fc9652cb6cd6f6e1fd82e002f4023a97c239cf332881a4f6686ea9b9d786d31e57fea7c1e06edecfc5877c2a SHA512 42cb00778b84157eff45d5143c3e1a232f7c98377d33aa9dbbb30122e678458168fe651b959656f00916a86069b727e814a6b8a9a7d10cd58f45dace2db32ef7
-AUX 0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch 2102 BLAKE2B 507ffa5983e2988889f82de786771bc4ff8ba6d5c7ca32cf16443e76906a93a101861098aa5e5c58c48b0eeeac0db74e787b1a8b452115d1ce45888d6ac37e5c SHA512 b2bfcb9529e2b90f786b3277a54018dedc3d8f38db5bf1f45c2df365ea297f05fc93524d225a308078b353f7be3c830e4091070a30a6ca30d767b8d207cb01bd
-AUX 0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch 996 BLAKE2B 67988decbfe56b78541ba8786d4a12d124177278b424fad796ce814bb3befefce9dd9ffa7048eb727676769f3273a35137b184151ad1f1f9bdaf73c22bbf6fdd SHA512 cb2e04515da4f4d1154f489327ec282b75e71c8257477ac2f2602bb21b7c2765b2b6ebc7e5c7e1f6a57f271a804e694a9bf8dd25aa71b34fa13ab7a0ee21283e
-AUX 0.27.0/mpv-0.27.0-support-libva2.patch 2918 BLAKE2B c9e217ebc0e42b56c327f8437a396dcb523ceeba3d2c2684a62babacb6bd3db636cd2e23e3311e0c57000e261f74b7c693aa128eedbb9b3f6f48d85e04beca3a SHA512 ece9f59d7875ba881bc9e913c3e44449401e0cc0bcfd46493f4c0d167e853bac9033fd7af2c15056768289709ec2a8d6b54c571360c140bbec3fd9d947c6b50b
 AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470830fd2c76cc75a1712976112bdfc8269d04ec42de054d1f63d3e028b9ee61adc7d49500479f0f14955a627a34d797b512a9a9f976bc6b45b1e47b6 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6
 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e
 AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875
+AUX mpv-0.27.0-add-missing-link-flags-for-rpi.patch 988 BLAKE2B 2dc3c70dbb0565db93fbaa9852e37afd1d953e896bb820095afdac8bc8d1bba52fca07173a63d306990e7c72611afb40e22a21d1bc8293b69691d4f5252c2753 SHA512 bb204c5910d927d3dd159fe17f8edecbbc80a9d36b60d83f08d10181e019fcb140a701d2b3d4c6436d08ef0ebe95fb81bb5d7467c2b63a1b098ba412defeea32
 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2
 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
-DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7
-DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4
-DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70
+DIST mpv-0.27.1-patches-r0.tar.xz 6580 BLAKE2B fdf5f580fbda9ec6856354d43fd80a177464af27ea6f65ab31c610996fced64670f178956b4030c9c34d0707f8fa4544c829e4401679d2e2d6e730b19ebfe6d8 SHA512 8f25c51f0a3c6b5304090144b8343afba4d872216f8fa13890240a51ac464bd2c486b017390d4d3398d7082ffdf3e617659861f15505bd2db72b6f5ab4500bcb
+DIST mpv-0.27.1.tar.gz 2957202 BLAKE2B 79dd06ba9399368f24c2c0a065218432110829af08d97cfdf753966ec7ca75e5af8f04da381f83251cb57bdce9b30c0d2d8c6fc772f73b5a0ed43139ce66a316 SHA512 3b8e12edb20b6ffdbbb02aba9cc64ad25e4fb583efc72248549641a46cc840827c1b6b017e7efc323d8a8299b7b094a676525bd978b8c3c9ecccca32fe39149a
+DIST mpv-0.28.1.tar.gz 2982546 BLAKE2B ae078e3393b1113a8211699da1fea867324c50d3696ab82446996f04b2571b29791811b3d3dc082761ca36d63c9b1aa844d7cd56b740e73821b3e7ca35d39512 SHA512 7593e5dbb5963bf39f57f8a08f1b5142474897172a2c6cafcbfd3a83a2f0cfb9a3e5d62eea6625f01aae8ccc236b738511846cd5a5016b93d2510f12f0be7624
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
-EBUILD mpv-0.26.0.ebuild 10622 BLAKE2B 4a1f7e2dc861811e3aa5b8ed431f2aaeb29d8074e63cc396e0fa479b11ae37179f754ced934bc6c61a3e0acfb6364d0c0fc98a20aeca852602ea287fc9471884 SHA512 dd00d0b0a0d21612c8b1235b8905bf586b022410f254cdf3d944dd7146845d58d75d8480a5f2c5b3521feb576f586093eec7f89da9f7eacfb3f6bdc55e5deb36
-EBUILD mpv-0.27.0-r1.ebuild 10611 BLAKE2B 90ca794f83fefcb510c85652bbcd5e189dd7c3a7554071f2348806032edc3b8989cb313d94c443aeffa861a541145305ce21d0b8d794e15eb8aeb26198d684b2 SHA512 07ee2752322684f398aba5f1bad5e3140b84d8f395523a62158e58d7616c2b9d6cf98e8513bd31639852c7905d8b59b02fd6a70621b7776c758ebc3793203d26
-EBUILD mpv-0.28.0.ebuild 10351 BLAKE2B 723a63983cbd7f4109b1a0dd4a36d2501368e8d3ad32e3879cec388858df77b5e3c65c55977aeed3bdeb3bf99be5be720761f15265532f37e55bb530f46ea2a5 SHA512 7cd80b8251161588786a4c0104429441b5e9ecd56cbb81af587977eb66c7177100c4ac0f239ac0f2b3587994897d75b04ecc19e26bfb0554312c8cc114c5b0d4
-EBUILD mpv-9999.ebuild 10286 BLAKE2B 8866ee5e4817eeeabed02799640ff4390ecc32c922d255052e4a2d171e157296c71b8438fb6ea9a0ed2276c54a38e9dc320cfb9ffc27f0625c3a5630051d1e15 SHA512 dd71019d9a8533a475c1bae6c7d720b4b59b72b7f2d031e314c9bebc810446d2f3a27b6c7376e6d498b7965b1c8bb9c6a9cc21306dd8528866b3bbfd1a3d3486
+EBUILD mpv-0.27.1.ebuild 10608 BLAKE2B 8cf9467e23e5080042318407d4fa6ddf36a20688a051e4d0fe6935350687f8a433152aef4e4d9816d42806869bffd32a7f45f3e36125bc6521dbeeb70caf2375 SHA512 740a8339bf62af2916613c8c006f8938cd2ebe7d1a3eb6196f8f18d3757718298ed1a822bfb583b6a70f7b5218c7c6035ee0996f3715fbdb6eb1869c5a3c9d15
+EBUILD mpv-0.28.1.ebuild 10271 BLAKE2B bc1b2cb09fce5a7418832441a470a582c4e56c695266018b714c1e2d1da5680dfa854177a471b1ba6d9c7672a2ffc67b94af7b909839229d90cdd134d5edab49 SHA512 095ba672f0b62795348fa95ef491aa53e93ce1a339e8e09f27275e383864494652ff98fefcc11a0bed9398632adb420de2a1f250012718d0bc70d6b3e26f30f5
+EBUILD mpv-9999.ebuild 10141 BLAKE2B a184019b35680564e5065e227553cf1e259381a093406abd1d4c43d6b8b26a0b3c8c9dbaddbca033cd4c437f011c21861fb2f5413a4ec8b9ceb41452b781cc36 SHA512 c8c70c8180a2ea232558b678d95d1f975235bade86073b0586fe99da77c092c34b126f8a833f1eb3b2853a01800d97eb1ab241f7d2b017ddee6665b557c73a87
 MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
deleted file mode 100644
index e83be2250e72..000000000000
--- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit b881881dbd38a1720a9f8401fd1baafdd0dfccc0
-Author: wm4 <wm4@nowhere>
-Date:   Tue Sep 19 18:33:37 2017 +0200
-
-Revert "vd_lavc: change auto-probe order to prefer cuda over vdpau-copy"
-
-This reverts commit 96462040ec79b353457b64949f96fad30bd6e988.
-
-I guess the autoprobing is still too primitive to handle this well. What
-it really should be trying is initializing the wrapper decoder, and if
-that doesn't work, try another method. This is complicated by hwaccels
-initializing in a delayed way, so there is no easy solution yet.
-
-Probably fixes #4865.
-
-diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
-index 476beeb9e..e08246a29 100644
---- a/video/decode/vd_lavc.c
-+++ b/video/decode/vd_lavc.c
-@@ -261,11 +261,16 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
- #endif
- #if HAVE_VDPAU_HWACCEL
-     &mp_vd_lavc_vdpau,
-+    &mp_vd_lavc_vdpau_copy,
- #endif
- #if HAVE_VIDEOTOOLBOX_HWACCEL
-     &mp_vd_lavc_videotoolbox,
-     &mp_vd_lavc_videotoolbox_copy,
- #endif
-+#if HAVE_VAAPI_HWACCEL
-+    &mp_vd_lavc_vaapi,
-+    &mp_vd_lavc_vaapi_copy,
-+#endif
- #if HAVE_D3D_HWACCEL
-     &mp_vd_lavc_d3d11va,
-
-@@ -285,13 +290,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
-     &mp_vd_lavc_cuda_old,
-  #endif
-     &mp_vd_lavc_cuda_copy,
--#endif
--#if HAVE_VDPAU_HWACCEL
--    &mp_vd_lavc_vdpau_copy,
--#endif
--#if HAVE_VAAPI_HWACCEL
--    &mp_vd_lavc_vaapi,
--    &mp_vd_lavc_vaapi_copy,
- #endif
-     &mp_vd_lavc_crystalhd,
-     NULL
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
deleted file mode 100644
index f7d3129d8559..000000000000
--- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 810990a7465f31ee5ff5e29ebea1fb783e5ed502
-Author: wm4 <wm4@nowhere>
-Date:   Tue Sep 19 18:59:01 2017 +0200
-
-mp_image: always copy color attributes on hw download
-
-It was noticed that -copy hwdec modes typically dropped the
-chroma_location field. This happened because the attributes on hw
-download are copied with mp_image_copy_attributes(), which tries to copy
-these parameters only if src and dst were both YUV (in an attempt to
-copy parameters only if it makes sense).
-
-But hardware formats did not have the YUV flag set (anymore?), and code
-shouldn't attempt to check the flag in this way anyway. Drop the check,
-and always copy the whole color metadata struct. There is a call to
-mp_image_params_guess_csp() below, which tries to unset nonsense
-metadata if it was copied from a YUV format to RGB. This function would
-also do the right thing for hw formats (although for the cited bug only
-the software case matters).
-
-Fixes #4804.
-
-diff --git a/video/mp_image.c b/video/mp_image.c
-index 7180e2be5..5aa564775 100644
---- a/video/mp_image.c
-+++ b/video/mp_image.c
-@@ -525,15 +525,8 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src)
-         dst->params.p_w = src->params.p_w;
-         dst->params.p_h = src->params.p_h;
-     }
--    dst->params.color.primaries = src->params.color.primaries;
--    dst->params.color.gamma = src->params.color.gamma;
--    dst->params.color.sig_peak = src->params.color.sig_peak;
--    dst->params.color.light = src->params.color.light;
--    if ((dst->fmt.flags & MP_IMGFLAG_YUV) == (src->fmt.flags & MP_IMGFLAG_YUV)) {
--        dst->params.color.space = src->params.color.space;
--        dst->params.color.levels = src->params.color.levels;
--        dst->params.chroma_location = src->params.chroma_location;
--    }
-+    dst->params.color = src->params.color;
-+    dst->params.chroma_location = src->params.chroma_location;
-     dst->params.spherical = src->params.spherical;
-     mp_image_params_guess_csp(&dst->params); // ensure colorspace consistency
-     if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) {
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
deleted file mode 100644
index 3f2a5d1f56a3..000000000000
--- a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 8810c1fc050347e1bef0d3eb89edd30c8e840648
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Sun Sep 17 21:54:37 2017 +0300
-
-build: remove duplicate android option after 72a8120da
-
-The first one (line 140) comes from 69650851f8 and is the correct one.
-The second one (line 731) comes from 72a8120daa and slipped in with the
-revert commit.
-
-Remove the second one.
-
-diff --git a/wscript b/wscript
-index 9d885884d..9fe5b0bc8 100644
---- a/wscript
-+++ b/wscript
-@@ -727,10 +727,6 @@ video_output_features = [
-         'desc': 'Direct3D support',
-         'deps': [ 'win32-desktop' ],
-         'func': check_cc(header_name='d3d9.h'),
--    }, {
--        'name': '--android',
--        'desc': 'Android support',
--        'func': check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
-     }, {
-         # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
-         # every project to hardcode the paths to the include directories. Also,
diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch
deleted file mode 100644
index 8ae7f537682f..000000000000
--- a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-commit 2ecf240b1cd20875991a5b18efafbe799864ff7f
-Author: Mark Thompson <sw@jkqxz.net>
-Date:   Mon Oct 9 20:10:26 2017 +0100
-
-vaapi: Use libva2 message callbacks
-
-They are no longer global, so they work vaguely sensibly.
-
-diff --git a/video/vaapi.c b/video/vaapi.c
-index 6bedbbaa18..3b1cb9cc41 100644
---- a/video/vaapi.c
-+++ b/video/vaapi.c
-@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
-     return 0;
- }
-
--// VA message callbacks are global and do not have a context parameter, so it's
--// impossible to know from which VADisplay they originate. Try to route them
--// to existing mpv/libmpv instances within this process.
-+#if VA_CHECK_VERSION(1, 0, 0)
-+static void va_message_callback(void *context, const char *msg, int mp_level)
-+{
-+    struct mp_vaapi_ctx *res = context;
-+    mp_msg(res->log, mp_level, "libva: %s", msg);
-+}
-+
-+static void va_error_callback(void *context, const char *msg)
-+{
-+    va_message_callback(context, msg, MSGL_ERR);
-+}
-+
-+static void va_info_callback(void *context, const char *msg)
-+{
-+    va_message_callback(context, msg, MSGL_V);
-+}
-+#else
-+// Pre-libva2 VA message callbacks are global and do not have a context
-+// parameter, so it's impossible to know from which VADisplay they
-+// originate.  Try to route them to existing mpv/libmpv instances within
-+// this process.
- static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
- static struct mp_vaapi_ctx **va_mpv_clients;
- static int num_va_mpv_clients;
-@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
- {
-     va_message_callback(msg, MSGL_V);
- }
-+#endif
-
- static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
- {
-@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
-         },
-     };
-
-+#if VA_CHECK_VERSION(1, 0, 0)
-+    vaSetErrorCallback(display, va_error_callback, res);
-+    vaSetInfoCallback(display,  va_info_callback,  res);
-+#else
-     pthread_mutex_lock(&va_log_mutex);
-     MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
-     pthread_mutex_unlock(&va_log_mutex);
-@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
- #ifdef VA_FOURCC_I010
-     vaSetErrorCallback(va_error_callback);
-     vaSetInfoCallback(va_info_callback);
-+#endif
- #endif
-
-     int major, minor;
-@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
-         if (ctx->destroy_native_ctx)
-             ctx->destroy_native_ctx(ctx->native_ctx);
-
-+#if !VA_CHECK_VERSION(1, 0, 0)
-         pthread_mutex_lock(&va_log_mutex);
-         for (int n = 0; n < num_va_mpv_clients; n++) {
-             if (va_mpv_clients[n] == ctx) {
-@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
-         if (num_va_mpv_clients == 0)
-             TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
-         pthread_mutex_unlock(&va_log_mutex);
-+#endif
-
-         talloc_free(ctx);
-     }
diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch
new file mode 100644
index 000000000000..411573a66251
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch
@@ -0,0 +1,25 @@
+commit 48143b0cf52de37f93ae53a95261988d9b5ebff2
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Thu Jan 26 23:51:29 2017 +0300
+
+build: rpi: add missing linker flags to fix build
+
+See https://www.raspberrypi.org/forums/viewtopic.php?f=67&t=20005&p=194090
+and https://github.com/raspberrypi/firmware/issues/110
+
+Raspberry-pi upstream also adds '-lGLESv2' when EGL is used:
+https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in
+
+diff --git a/wscript b/wscript
+index 1880f631e5..741fe1e5a4 100644
+--- a/wscript
++++ b/wscript
+@@ -772,7 +772,7 @@ video_output_features = [
+                      lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+             # We still need all OpenGL symbols, because the vo_opengl code is
+             # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+-            check_cc(lib="EGL"),
++            check_cc(lib="EGL", linkflags="-lGLESv2"),
+             check_cc(lib="GLESv2"),
+         ),
+     } , {
diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild
deleted file mode 100644
index c3ff2f124af7..000000000000
--- a/media-video/mpv/mpv-0.26.0.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# 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} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=1.9.8
-
-inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
-	inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
-	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
-	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
-	zsh-completion"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	aqua? ( opengl )
-	cuda? ( !libav opengl )
-	egl? ( || ( gbm X wayland ) )
-	gbm? ( drm egl opengl )
-	lcms? ( opengl )
-	luajit? ( lua )
-	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-	raspberry-pi? ( opengl )
-	test? ( opengl )
-	tools? ( cli )
-	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( gbm X wayland ) )
-	vdpau? ( X )
-	wayland? ( egl )
-	X? ( egl? ( opengl ) )
-	xv? ( X )
-	zsh-completion? ( cli )
-	${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cuda? ( >=media-video/ffmpeg-3.3:0 )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
-	vaapi? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libva[drm?,X?,wayland?]
-	)
-	vdpau? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libvdpau
-	)
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-python/docutils
-	virtual/pkgconfig
-	doc? ( dev-python/rst2pdf )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
-	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default_src_prepare
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG AR
-
-	if tc-is-cross-compiler && use raspberry-pi; then
-		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
-		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
-		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
-	fi
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize		# Don't add '-O2' to CFLAGS.
-		--disable-debug-build	# Don't add '-g' to CFLAGS.
-		--enable-html-build
-
-		$(use_enable doc pdf-build)
-		$(use_enable cplugins)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable javascript)
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable zlib)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays.
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays.
-		--disable-sndio			# Only available in overlays.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		--disable-android
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev	# Only available in overlays.
-		$(usex opengl '' '--disable-gl')
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
-		$(use_enable cuda cuda-hwaccel)
-
-		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		version_compare ${rv} 0.18.1
-		[[ $? -eq 1 ]] && softvol_0_18_1=1
-		version_compare ${rv} 0.21.0
-		[[ $? -eq 1 ]] && osc_0_21_0=1
-		version_compare ${rv} 0.24.0
-		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
-		version_compare ${rv} 0.25.0
-		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
-		elog "If you want to have command-line completion via bash-completion,"
-		elog "please install app-shells/mpv-bash-completion."
-	fi
-
-	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
-		has_version 'app-shells/mpv-bash-completion'; then
-		elog "If command-line completion doesn't work after mpv update,"
-		elog "please rebuild app-shells/mpv-bash-completion."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild
deleted file mode 100644
index 558adb5ce720..000000000000
--- a/media-video/mpv/mpv-0.27.0-r1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# 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='threads(+)'
-
-WAF_PV=1.9.8
-
-inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
-	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
-	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
-	zsh-completion"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	aqua? ( opengl )
-	cuda? ( !libav opengl )
-	egl? ( || ( gbm X wayland ) )
-	gbm? ( drm egl opengl )
-	lcms? ( opengl )
-	luajit? ( lua )
-	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-	raspberry-pi? ( opengl )
-	test? ( opengl )
-	tools? ( cli )
-	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( gbm X wayland ) )
-	vdpau? ( X )
-	wayland? ( egl )
-	X? ( egl? ( opengl ) )
-	xv? ( X )
-	zsh-completion? ( cli )
-	${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cuda? ( >=media-video/ffmpeg-3.3:0 )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
-	vaapi? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libva:=[drm?,X?,wayland?]
-	)
-	vdpau? (
-		!libav? ( >=media-video/ffmpeg-3.3:0 )
-		libav? ( >=media-video/libav-13:0 )
-		x11-libs/libvdpau
-	)
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-python/docutils
-	virtual/pkgconfig
-	doc? ( dev-python/rst2pdf )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
-	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	eapply "${FILESDIR}/${PV}"
-	default_src_prepare
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG AR
-
-	if tc-is-cross-compiler && use raspberry-pi; then
-		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
-		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
-		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
-	fi
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize		# Don't add '-O2' to CFLAGS.
-		--disable-debug-build	# Don't add '-g' to CFLAGS.
-		--enable-html-build
-
-		$(use_enable doc pdf-build)
-		$(use_enable cplugins)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		--disable-android
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable javascript)
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable zlib)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays.
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays.
-		--disable-sndio			# Only available in overlays.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev	# Only available in overlays.
-		$(usex opengl '' '--disable-gl')
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
-		$(use_enable cuda cuda-hwaccel)
-
-		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		version_compare ${rv} 0.18.1
-		[[ $? -eq 1 ]] && softvol_0_18_1=1
-		version_compare ${rv} 0.21.0
-		[[ $? -eq 1 ]] && osc_0_21_0=1
-		version_compare ${rv} 0.24.0
-		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
-		version_compare ${rv} 0.25.0
-		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
-		elog "If you want to have command-line completion via bash-completion,"
-		elog "please install app-shells/mpv-bash-completion."
-	fi
-
-	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
-		has_version 'app-shells/mpv-bash-completion'; then
-		elog "If command-line completion doesn't work after mpv update,"
-		elog "please rebuild app-shells/mpv-bash-completion."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/mpv/mpv-0.27.1.ebuild b/media-video/mpv/mpv-0.27.1.ebuild
new file mode 100644
index 000000000000..dec8d69628f0
--- /dev/null
+++ b/media-video/mpv/mpv-0.27.1.ebuild
@@ -0,0 +1,374 @@
+# 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='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="
+		https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libva:=[drm?,X?,wayland?]
+	)
+	vdpau? (
+		!libav? ( >=media-video/ffmpeg-3.3:0 )
+		libav? ( >=media-video/libav-13:0 )
+		x11-libs/libvdpau
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
+	"${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	eapply "${WORKDIR}/${PV}"
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild
deleted file mode 100644
index 23b6694770d7..000000000000
--- a/media-video/mpv/mpv-0.28.0.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# 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='threads(+)'
-
-WAF_PV=1.9.8
-
-inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-	DOCS=( RELEASE_NOTES )
-else
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
-	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
-	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
-	zsh-completion"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	aqua? ( opengl )
-	cuda? ( !libav opengl )
-	egl? ( || ( gbm X wayland ) )
-	gbm? ( drm egl opengl )
-	lcms? ( opengl )
-	luajit? ( lua )
-	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-	raspberry-pi? ( opengl )
-	test? ( opengl )
-	tools? ( cli )
-	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
-	vaapi? ( || ( gbm X wayland ) )
-	vdpau? ( X )
-	wayland? ( egl )
-	X? ( egl? ( opengl ) )
-	xv? ( X )
-	zsh-completion? ( cli )
-	${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	archive? ( >=app-arch/libarchive-3.0.0:= )
-	bluray? ( >=media-libs/libbluray-0.3.0:= )
-	cdda? ( dev-libs/libcdio-paranoia )
-	drm? ( x11-libs/libdrm )
-	dvd? (
-		>=media-libs/libdvdnav-4.2.0
-		>=media-libs/libdvdread-4.1.0
-	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
-	iconv? (
-		virtual/libiconv
-		uchardet? ( app-i18n/uchardet )
-	)
-	jack? ( virtual/jack )
-	javascript? ( >=dev-lang/mujs-1.0.0 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	libass? (
-		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
-	vdpau? ( x11-libs/libvdpau )
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		>=x11-libs/libxkbcommon-0.3.0
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? (
-			x11-libs/libXdamage
-			virtual/opengl
-		)
-		xv? ( x11-libs/libXv )
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-python/docutils
-	virtual/pkgconfig
-	doc? ( dev-python/rst2pdf )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
-	cuda? ( x11-drivers/nvidia-drivers[X] )
-	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-	chmod +x "${S}"/waf || die
-	default_src_prepare
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG AR
-
-	if tc-is-cross-compiler && use raspberry-pi; then
-		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
-		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
-		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
-	fi
-
-	local mywafargs=(
-		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-
-		--disable-libmpv-static
-		--disable-static-build
-		# See deep down below for build-date.
-		--disable-optimize		# Don't add '-O2' to CFLAGS.
-		--disable-debug-build	# Don't add '-g' to CFLAGS.
-		--enable-html-build
-
-		$(use_enable doc pdf-build)
-		$(use_enable cplugins)
-		$(use_enable zsh-completion zsh-comp)
-		$(use_enable test)
-
-		--disable-android
-		$(use_enable iconv)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(usex luajit '--lua=luajit' '')
-		$(use_enable javascript)
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable zlib)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdda)
-		$(use_enable uchardet)
-		$(use_enable rubberband)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# Only available in overlays.
-		--disable-vapoursynth-lazy
-		$(use_enable archive libarchive)
-
-		--enable-libavdevice
-
-		# Audio outputs:
-		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound		# Only available in overlays.
-		--disable-sndio			# Only available in overlays.
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		--disable-opensles
-		$(use_enable alsa)
-		$(use_enable coreaudio)
-
-		# Video outputs:
-		$(use_enable aqua cocoa)
-		$(use_enable drm)
-		$(use_enable gbm)
-		$(use_enable wayland wayland-scanner)
-		$(use_enable wayland wayland-protocols)
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xv)
-		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
-		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
-		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
-		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
-		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
-		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
-		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
-		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
-		$(use_enable libcaca caca)
-		$(use_enable jpeg)
-		$(use_enable raspberry-pi rpi)
-		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev	# Only available in overlays.
-		$(usex opengl '' '--disable-gl')
-
-		# HWaccels:
-		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
-		$(use_enable cuda cuda-hwaccel)
-
-		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
-		$(use_enable dvb dvbin)
-
-		# Miscellaneous features:
-		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
-	)
-
-	if use vaapi && use X; then
-		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
-			$(use_enable egl vaapi-x-egl)
-		)
-	fi
-
-	# Create reproducible non-live builds.
-	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use lua; then
-		insinto /usr/share/${PN}
-		doins -r TOOLS/lua
-	fi
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/${PN}
-	fi
-
-	if use tools; then
-		dobin TOOLS/{mpv_identify.sh,umpv}
-		newbin TOOLS/idet.sh mpv_idet.sh
-		python_replicate_script "${ED}"usr/bin/umpv
-	fi
-}
-
-pkg_postinst() {
-	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
-	for rv in ${REPLACING_VERSIONS}; do
-		version_compare ${rv} 0.18.1
-		[[ $? -eq 1 ]] && softvol_0_18_1=1
-		version_compare ${rv} 0.21.0
-		[[ $? -eq 1 ]] && osc_0_21_0=1
-		version_compare ${rv} 0.24.0
-		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
-		version_compare ${rv} 0.25.0
-		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
-	done
-
-	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Since version 0.18.1 the software volume control is always enabled."
-		elog "This means that volume controls don't change the system volume,"
-		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
-		elog
-	fi
-
-	if [[ ${osc_0_21_0} -eq 1 ]]; then
-		elog "In version 0.21.0 the default OSC layout was changed."
-		elog "If you want to restore the previous layout, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
-		elog
-	fi
-
-	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
-		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
-		elog "If you want to restore the previous behaviour, please refer to"
-		elog
-		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
-		elog
-	fi
-
-	if [[ ${opengl_0_25_0} -eq 1 ]]; then
-		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
-		elog "the 'opengl' video output and no longer explicitly requires"
-		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
-	fi
-
-	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
-		elog "If you want to have command-line completion via bash-completion,"
-		elog "please install app-shells/mpv-bash-completion."
-	fi
-
-	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
-		has_version 'app-shells/mpv-bash-completion'; then
-		elog "If command-line completion doesn't work after mpv update,"
-		elog "please rebuild app-shells/mpv-bash-completion."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-src_test() {
-	cd "${S}"/build/test || die
-	local test
-	for test in *; do
-		if [[ -x ${test} ]]; then
-			./"${test}" || die "Test suite failed"
-		fi
-	done
-}
diff --git a/media-video/mpv/mpv-0.28.1.ebuild b/media-video/mpv/mpv-0.28.1.ebuild
new file mode 100644
index 000000000000..472b73c52c56
--- /dev/null
+++ b/media-video/mpv/mpv-0.28.1.ebuild
@@ -0,0 +1,361 @@
+# 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='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+	"${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
+	"${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 1543eb4db2e5..c530dace68b4 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-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
@@ -8,7 +8,7 @@ PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=1.9.8
 
-inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="https://mpv.io/"
@@ -147,10 +147,9 @@ src_prepare() {
 src_configure() {
 	tc-export CC PKG_CONFIG AR
 
-	if tc-is-cross-compiler && use raspberry-pi; then
-		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
-		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
-		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
 	fi
 
 	local mywafargs=(
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5cc3d5a3bbbc..be5bfb59c77e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,9 +16,10 @@ AUX vlc-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa9464
 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
+DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
 EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
-EBUILD vlc-2.2.8-r1.ebuild 14813 BLAKE2B 7c03fd365a135eeb9c2a859dfc7e6e878940f621d8dd0a27022cd984fd17d22e41be524ae6899281eb7b273072606e3b38b7f0a6e524215e0779a1b155316a00 SHA512 b506c3c01ce5e35e31194622bde4eab21cb698a3280edb83b553752caa42428abc07a744d3aaae458405c97facb7b7eef10ee652afd667d16546af34fd89a207
-EBUILD vlc-2.2.9999.ebuild 14829 BLAKE2B d7ffc34f6e72390a45ae5bb4218dc25c3eebcab96047a7ab43f5695ca833f7bf492cdd22337aee635c5fb3b9d9bc04c4fe4d750a44b9020babbfe8e20fc27aeb SHA512 46ee0565bfa2884abce8a0b230721ce3c9adfda7cffb0d43cb2d3a7fa3099ba226ee7aff3534f42de0fa09302be0c89da3b8460575bf550eeb65dedc973e8bed
-EBUILD vlc-3.0.9999.ebuild 13815 BLAKE2B 5748955ba987e4fbaa8b7f9851f94aadbc4612d12b4be80cbceae29c43a54262a0064975934dd61714b63c9ed540a718406e01625eb18a5828ddece87b6a245b SHA512 55da89559e31ae099c21f17eaa346ad39afbd0de637fb24ecd7674c38faa1319eadf264cbaed8e00df4b93a2f0b211f4086ddda6e01964f7e230b0441af663aa
-EBUILD vlc-9999.ebuild 13808 BLAKE2B 02fe3a017cd07b06b19d337c2e09f687820be7b095a8a33110d02d15710a14dee07d183eaaaeb38d29be0af0389005e15a60d2a66943966287f4cc20f06c2778 SHA512 d1d4f508d185dad2c38b11548950daf2edd7f39220371e1537a1f765d92d788693d28dd8018f5fe6bb93b9d3ed9df3a3d7cbd914f9306682d7ce8299a6aa0cf7
+EBUILD vlc-2.2.8-r1.ebuild 14829 BLAKE2B bd4dfb29beba20d2f9177c41ee4791aa733054eee6c522039b76586f0c9be8ec8ba6c79043a139ef0557b73cfc14c81edc7b14821241969a2bb8c84c1b5eefb0 SHA512 20305c4736dabc61729189a06be0082340f4f0619a9e49e28f4192585d88147c6a1c49a6284664c02b6674ab24c7ef4b1963484336cbb6c899330c048b250163
+EBUILD vlc-3.0.0-r1.ebuild 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e
+EBUILD vlc-3.0.9999.ebuild 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e
+EBUILD vlc-9999.ebuild 13757 BLAKE2B a63677b92fd8ad7e432071f88962247b37b5394d609827b3ace21ea64f437fdc82a6fcf238f2ab3deb86b29b2e57f34919bd951a5ae857c53e0c304c68f923e6 SHA512 b088d6fec3f082455a95f318e6487eb522ba6c80fa4a321637471e4352ca3d584c8d52b2ecf12e3d546bc78bc93cae1ee6066c9d4137732bb39cc096fc7ea3dd
 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index e5ea17223128..cf77af601678 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -470,8 +470,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
-		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
 	fi
 
 	gnome2_icon_cache_update
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
deleted file mode 100644
index e9fdb939b366..000000000000
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	SCM="git-r3"
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
-	cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2
-	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
-	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
-	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
-	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
-	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
-	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi
-"
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt5? ( X )
-	sdl? ( X )
-	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-RDEPEND="
-	dev-libs/libgpg-error:0
-	net-dns/libidn:0
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.3:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
-	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	dts? ( >=media-libs/libdca-0.0.5:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
-	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
-	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
-	gme? ( media-libs/game-music-emu:0 )
-	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
-	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
-	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
-	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
-	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl? ( >=media-libs/libsdl-1.2.10:0
-		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
-	sid? ( media-libs/libsidplay:2 )
-	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
-	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
-	swscale? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-	tremor? ( media-libs/tremor:0 )
-	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 ) )
-	twolame? ( media-sound/twolame:0 )
-	udev? ( >=virtual/udev-142:0 )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? (
-		x11-libs/libva:0=[X,drm]
-		!libav? ( media-video/ffmpeg:0=[vaapi] )
-		libav? ( media-video/libav:0=[vaapi] )
-	)
-	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-	vdpau? (
-		x11-libs/libvdpau:0
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-10:0= )
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
-	X? ( x11-libs/libX11:0 )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
-"
-
-PATCHES=(
-	# Fix build system mistake.
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
-	# Bug #541678
-	"${FILESDIR}"/qt4-select.patch
-
-	# Allow QT5.5 since Gentoo has a patched QTwidgets
-	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
-	# Bug #575072
-	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
-	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
-	# Bug #589396
-	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
-	# Bug #594126, #629294
-	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
-	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
-	# Bug #593460
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-
-	"${FILESDIR}"/${P}-libupnp-compat.patch
-
-	# Bug 590164
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
-	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	xdg_environment_reset # bug 608256
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	if use qt5 ; then
-		myconf+=" --enable-qt=5"
-	else
-		myconf+=" --disable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable gstreamer gst-decode) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable matroska mkv) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opengl glspectrum) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable x265) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zeroconf bonjour) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-directfb \
-		--disable-gles1 \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal-codec \
-		--disable-mmal-vout \
-		--disable-opensles \
-		--disable-oss \
-		--disable-quicktime \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
-		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..782d399de032
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.0-r1.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	SCM="git-r3"
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
+	chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
+	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
+	gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	libnotify +libsamplerate libtiger linsys libtar lirc live lua
+	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
+	mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
+	png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
+	schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
+	+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
+	vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+"
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	skins? ( qt5 truetype X xml )
+	vaapi? ( avcodec X )
+	vdpau? ( X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+RDEPEND="
+	dev-libs/libgpg-error:0
+	net-dns/libidn:0
+	sys-libs/zlib:0[minizip]
+	virtual/libintl:0
+	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+	aalib? ( media-libs/aalib:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	avcodec? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	avformat? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	bidi? ( dev-libs/fribidi:0 )
+	bluray? ( >=media-libs/libbluray-0.6.2:0= )
+	cddb? ( >=media-libs/libcddb-1.2:0 )
+	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dc1394? (
+		>=media-libs/libdc1394-2.1:2
+		>=sys-libs/libraw1394-2.0.1:0
+	)
+	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0
+		>=media-libs/libdvdread-4.9:0
+	)
+	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+	faad? ( >=media-libs/faad2-2.6.1:0 )
+	fdk? ( media-libs/fdk-aac:0 )
+	flac? (
+		>=media-libs/flac-1.1.2:0
+		>=media-libs/libogg-1:0
+	)
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+	gme? ( media-libs/game-music-emu:0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnutls? ( net-libs/gnutls:0 )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		>=sys-libs/libavc1394-0.5.3:0
+		>=sys-libs/libraw1394-2.0.1:0
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( >=media-libs/libkate-0.3:0 )
+	libass? (
+		media-libs/fontconfig:1.0
+		>=media-libs/libass-0.9.8:0=
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libnotify:0
+	)
+	libsamplerate? ( media-libs/libsamplerate:0 )
+	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	lirc? ( app-misc/lirc:0 )
+	live? ( >=media-plugins/live-2011.12.23:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	matroska? (
+		>=dev-libs/libebml-1:0=
+		>=media-libs/libmatroska-1:0=
+	)
+	modplug? ( media-libs/libmodplug:0 )
+	mp3? ( media-libs/libmad:0 )
+	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+	mtp? ( >=media-libs/libmtp-1:0 )
+	musepack? ( >=media-sound/musepack-tools-444:0 )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( >=media-libs/libogg-1:0 )
+	opencv? ( >media-libs/opencv-2:0= )
+	opengl? (
+		virtual/opengl:0
+		>=x11-libs/libX11-1.3.99.901:0
+	)
+	opus? ( >=media-libs/opus-1.0.3:0 )
+	png? ( media-libs/libpng:0= )
+	postproc? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
+		libav? ( media-libs/libpostproc:0= )
+	)
+	projectm? (
+		media-fonts/dejavu:0
+		media-libs/libprojectm:0
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? ( dev-qt/qtx11extras:5 )
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
+	sftp? ( net-libs/libssh2:0 )
+	shout? ( >=media-libs/libshout-2.1:0 )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext:0
+		x11-libs/libXinerama:0
+		x11-libs/libXpm:0
+	)
+	speex? (
+		>=media-libs/speex-1.2.0:0
+		media-libs/speexdsp:0
+	)
+	svg? (
+		>=gnome-base/librsvg-2.9:2
+		>=x11-libs/cairo-1.13.1:0
+	)
+	swscale? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= )
+	)
+	taglib? ( >=media-libs/taglib-1.9:0 )
+	theora? ( media-libs/libtheora:0 )
+	tremor? ( media-libs/tremor:0 )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts:0
+		!fontconfig? ( media-fonts/dejavu:0 )
+	)
+	twolame? ( media-sound/twolame:0 )
+	udev? ( virtual/udev:0 )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:0 )
+	vaapi? (
+		x11-libs/libva:0=[drm,wayland?,X?]
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
+		libav? ( media-video/libav:0=[vaapi] )
+	)
+	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
+	vdpau? (
+		x11-libs/libvdpau:0
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( >=media-video/libav-10:0= )
+	)
+	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0= )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+	X? ( x11-libs/libX11:0 )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xcb? (
+		x11-libs/libxcb:0
+		x11-libs/xcb-util:0
+		x11-libs/xcb-util-keysyms:0
+	)
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+	zvbi? ( media-libs/zvbi:0 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils:0
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig:*
+	amd64? ( dev-lang/yasm:* )
+	x86?   ( dev-lang/yasm:* )
+	xcb? ( x11-proto/xproto:0 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-vlc
+		--docdir=/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		$(use_enable a52)
+		$(use_enable aalib aa)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable avcodec)
+		$(use_enable avformat)
+		$(use_enable bidi fribidi)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable directx)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable dxva2)
+		$(use_enable encode sout)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gnutls)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable macosx-qtkit)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg) $(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable opus)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable rtsp realrtsp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable schroedinger)
+		$(use_enable sdl-image)
+		$(use_enable sid)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable skins skins2)
+		$(use_enable speex)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable swscale)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable truetype freetype)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vcd)
+		$(use_enable vdpau)
+		$(use_enable vlm)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_enable wma-fixed)
+		$(use_with X x)
+		$(use_enable x264)
+		$(use_enable xcb)
+		$(use_enable xml libxml2)
+		$(use_enable xv xvideo)
+		$(use_enable x265)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-srt
+		--disable-vsxu
+		--disable-wasapi
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	xdg_environment_reset # bug 608256
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf ${myeconfargs[@]}
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index f97e73f1b770..782d399de032 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -27,19 +27,19 @@ DESCRIPTION="Media player and framework with support for most multimedia files a
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
+SLOT="0/5-9" # vlc - vlccore
 
 IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
 	chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
 	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
-	gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
 	libnotify +libsamplerate libtiger linsys libtar lirc live lua
 	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
 	mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
 	png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
 	schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
 	+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
-	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+	vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
 "
 REQUIRED_USE="
 	aalib? ( X )
@@ -80,7 +80,7 @@ RDEPEND="
 	bluray? ( >=media-libs/libbluray-0.6.2:0= )
 	cddb? ( >=media-libs/libcddb-1.2:0 )
 	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-	chromecast? ( >=dev-libs/protobuf-2.5.0 )
+	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
 	dbus? ( >=sys-apps/dbus-1.6:0 )
 	dc1394? (
 		>=media-libs/libdc1394-2.1:2
@@ -103,6 +103,7 @@ RDEPEND="
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
 	gme? ( media-libs/game-music-emu:0 )
+	gnome-keyring? ( app-crypt/libsecret )
 	gnutls? ( net-libs/gnutls:0 )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
@@ -202,7 +203,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0=[X,drm]
+		x11-libs/libva:0=[drm,wayland?,X?]
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
@@ -215,6 +216,10 @@ RDEPEND="
 	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
 	X? ( x11-libs/libX11:0 )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
@@ -249,7 +254,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then
@@ -278,7 +284,149 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myeconfargs=(
+		--enable-vlc
+		--docdir=/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		$(use_enable a52)
+		$(use_enable aalib aa)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable avcodec)
+		$(use_enable avformat)
+		$(use_enable bidi fribidi)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable directx)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable dxva2)
+		$(use_enable encode sout)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gnutls)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable macosx-qtkit)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg) $(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable opus)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable rtsp realrtsp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable schroedinger)
+		$(use_enable sdl-image)
+		$(use_enable sid)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable skins skins2)
+		$(use_enable speex)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable swscale)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable truetype freetype)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vcd)
+		$(use_enable vdpau)
+		$(use_enable vlm)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_enable wma-fixed)
+		$(use_with X x)
+		$(use_enable x264)
+		$(use_enable xcb)
+		$(use_enable xml libxml2)
+		$(use_enable xv xvideo)
+		$(use_enable x265)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-srt
+		--disable-vsxu
+		--disable-wasapi
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
 
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
@@ -300,156 +448,20 @@ src_configure() {
 
 	if use truetype || use projectm ; then
 		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
 	fi
 
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable aom) \
-		$(use_enable archive) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable chromecast) \
-		$(use_enable dbus) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnutls) \
-		$(use_enable gstreamer gst-decode) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-notifications osx-notifications) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5 qt) \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcd) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable x265) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-libplacebo \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal \
-		--disable-opensles \
-		--disable-oss \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-spatialaudio \
-		--disable-srt \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
+	econf ${myeconfargs[@]}
 
 	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
 }
 
 src_test() {
@@ -477,8 +489,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
-		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
 	fi
 
 	gnome2_icon_cache_update
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index d4545b0e1f96..9a3f64ee3bf8 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -27,19 +27,19 @@ DESCRIPTION="Media player and framework with support for most multimedia files a
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
+SLOT="0/5-9" # vlc - vlccore
 
 IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
 	chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
 	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
-	gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
 	libnotify +libsamplerate libtiger linsys libtar lirc live lua
 	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
 	mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
 	png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
 	schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
 	+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
-	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+	vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
 "
 REQUIRED_USE="
 	aalib? ( X )
@@ -80,7 +80,7 @@ RDEPEND="
 	bluray? ( >=media-libs/libbluray-0.6.2:0= )
 	cddb? ( >=media-libs/libcddb-1.2:0 )
 	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-	chromecast? ( >=dev-libs/protobuf-2.5.0 )
+	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
 	dbus? ( >=sys-apps/dbus-1.6:0 )
 	dc1394? (
 		>=media-libs/libdc1394-2.1:2
@@ -103,6 +103,7 @@ RDEPEND="
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
 	gme? ( media-libs/game-music-emu:0 )
+	gnome-keyring? ( app-crypt/libsecret )
 	gnutls? ( net-libs/gnutls:0 )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
@@ -202,7 +203,7 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? (
-		x11-libs/libva:0=[X,drm]
+		x11-libs/libva:0=[drm,wayland?,X?]
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
 		libav? ( media-video/libav:0=[vaapi] )
 	)
@@ -215,6 +216,10 @@ RDEPEND="
 	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
 	X? ( x11-libs/libX11:0 )
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
@@ -249,7 +254,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
 	if [[ ${PV} = *9999 ]] ; then
@@ -278,7 +284,149 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myeconfargs=(
+		--enable-vlc
+		--docdir=/usr/share/doc/${PF}
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		$(use_enable a52)
+		$(use_enable aalib aa)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable avcodec)
+		$(use_enable avformat)
+		$(use_enable bidi fribidi)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable directx)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable dxva2)
+		$(use_enable encode sout)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gnutls)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable macosx-qtkit)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mad)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg) $(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable opus)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable rtsp realrtsp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable schroedinger)
+		$(use_enable sdl-image)
+		$(use_enable sid)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable skins skins2)
+		$(use_enable speex)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable swscale)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable truetype freetype)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vcd)
+		$(use_enable vdpau)
+		$(use_enable vlm)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_enable wma-fixed)
+		$(use_with X x)
+		$(use_enable x264)
+		$(use_enable xcb)
+		$(use_enable xml libxml2)
+		$(use_enable xv xvideo)
+		$(use_enable x265)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-srt
+		--disable-vsxu
+		--disable-wasapi
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
 
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
@@ -300,156 +448,20 @@ src_configure() {
 
 	if use truetype || use projectm ; then
 		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
 	fi
 
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable aom) \
-		$(use_enable archive) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable chromecast) \
-		$(use_enable dbus) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnutls) \
-		$(use_enable gstreamer gst-decode) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-notifications osx-notifications) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5 qt) \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcd) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable x265) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-libplacebo \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal \
-		--disable-opensles \
-		--disable-oss \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-spatialaudio \
-		--disable-srt \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
+	econf ${myeconfargs[@]}
 
 	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
 }
 
 src_test() {
@@ -477,8 +489,8 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
-		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
 	fi
 
 	gnome2_icon_cache_update
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a81246bf3d03..e20be0f9b71d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b9f05110e62a..a0c90c150e52 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Feb 2018 15:08:24 +0000
+Thu, 15 Feb 2018 16:08:26 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 362fd853017d..a16b46b6c408 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 416281 BLAKE2B 9f5d0005cdae01ce5134efdc393aef2fa9e4486317293d473758f4b6f8a874ce6ac4b387a4d8c46338853ea09d96165ac399c906f15c28230dbfd8e95d4cdf26 SHA512 abd62c080ba1aa5d4609732620883228f3aa81aa544122207a98ca33c50401945a5d524cfb277af684f89fcc0fb6bc394206dcd88925ddccd9d1d6a9ee4a9949
-TIMESTAMP 2018-02-11T15:08:28Z
+MANIFEST Manifest.files.gz 416439 BLAKE2B 9451ad1983863ef867238ceaf1d2a0af002edf5e1ee38ab229eea18dec7f38c31751e2367ad2398ad5cb5d9206fec16a27ff1b7fb6ff757ea2f3b3fbb7fa275b SHA512 aa029ea036d1044bc9b418b6deb17521309312a35b209441023548e1b4be034c00928f553cefbe006eecd6d99256dc219c640bc0b04b4c49e0a78c63944b4a4b
+TIMESTAMP 2018-02-15T16:08:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqAXGxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqFsH5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCVAA/+MEV3zgMKg6BaGw1dz9PRIz0c9ocFEjpEoTztXgSXY9atFiaTE0P6lmcS
-Ga5g4M80qfGJTje3blyRdYRP/vHYgN1Lr0NBnlQLTiRXKuJ5aNzjHR2kBUgIXUC0
-Pgq/SY3z0n0CpZu4f3xk5o9AuqwWsh8wcpZm0xU+BrF2tFYHPw6ZOz6IBVw8BDse
-k65x/HWhGMXVg12NCqh6Yj/Uc+G6Y2l0HxXskNvuznT5z65Eepf5NJaFIOnyozYP
-GWmKuIks8YmFD8zJiowdVUaari1d8xpEb8WQavm4KsWYyU7AY3MiOlI1iqKLCZE3
-6Jrsnqj0SFT9y3xqgZyqY91BZ4FuYfxKcoUdifoHUDGuwOMcEKWMs0y9my2kXB4k
-AwBsOpSoMguX4N2iTNok6sOrFYg+5i3gRY2k3RfkluLtTEw6xQBf4EiGp97MVbqx
-RbkeDF9+xze4HL6fEZbErug5oD93c4pw7CoMcEz+2XMF/08CrW0V2xs/oHhv0Cwx
-3wHyaGoXXm0FrRrC4gIgk8VASxyqaHOL4uUzcx2+oyb8soJNIUw4PjKfdNIM8dYg
-7Oz5NpOHLYQGkzKCMIa2nMhDx16U4B3INZgsgF9/+pJ7z71Y5yujOWm1OyXc2A8L
-8mcNwrcT1J6n9OTbLtSqP2WrlyPl8JoPgXXAf+PR675qLqKQ3bo=
-=4m26
+klBCDRAAt0vn/OKXcdVR+IieLvF+nGQBPwsOGSuRVLSHI/lw5KQz14RmmgX+x24I
+NSaKmay3V4XK/MssDuipfm+ztq6IVlJzTuDGuKSowlpCM5g5MDtNbWUyDzSPZUbc
+hE4wqjIR35BNif7QU7Wyz666vGqgdNpr50eU7cZdAQqZ+VzJGODNvndMXgMib31q
+mKJnoJqIOXJfcoyuvBTaEZpHd5h5H0s2VhNeNDZm7k8SZPchD+psgzSkGiui008T
+jOuYG5QSsLfFFIWjLWYLIbvWxbqwvVBd1aM81XT2iOLocmS6zqpWqFvwQnUX8vKY
+dEvgpRJPoJn8JuMSFblsqPZcHbqURjAK+u5tOdBPDCBpyITRTNhxSUqYwQ2iV/In
+wjRghM1T7mJMM0v87b6yHrse4mHBz6tZ5zsZa1qRiVsJNw4DN5NrpcB1FllCqSve
+edAgBquQiXoTAXg2M80MBlwqliQCjrMlgz+WKNgKO1Qa5ULrjy+iHcvCKM4vJgob
+Tnbj4C7VfDD+yrTu0nrQu1YBtAso/zh2KIY1Jtb6ycuo8503AmRoNoQCO062auW6
+ToeijQrmvFUN832eOXo6+UxXb+AG4geS43WgcHHex+WAQ238SbPm6RvSusFVWp7X
+27cDUSMI43X6hYIwHYbTbVHO9uxOFstzNfFWxnyZ9pwz/V+0St8=
+=TelI
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index f87abaa3fa80..4bb9feddeaa4 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201802-01.xml b/metadata/glsa/glsa-201802-01.xml
new file mode 100644
index 000000000000..81eb28da9afd
--- /dev/null
+++ b/metadata/glsa/glsa-201802-01.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201802-01">
+  <title>VirtualBox: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in VirtualBox, the worst
+    of which could allow an attacker to take control of VirtualBox.
+  </synopsis>
+  <product type="ebuild">virtualbox,virtualbox-bin</product>
+  <announced>2018-02-11</announced>
+  <revised count="1">2018-02-11</revised>
+  <bug>644894</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="app-emulation/virtualbox" auto="yes" arch="*">
+      <unaffected range="ge">5.1.32</unaffected>
+      <vulnerable range="lt">5.1.32</vulnerable>
+    </package>
+    <package name="app-emulation/virtualbox-bin" auto="yes" arch="*">
+      <unaffected range="ge">5.1.32.120294</unaffected>
+      <vulnerable range="lt">5.1.32.120294</vulnerable>
+    </package>
+    <package name="app-emulation/virtualbox-guest-additions" auto="yes" arch="*">
+      <unaffected range="ge">5.1.32</unaffected>
+      <vulnerable range="lt">5.1.32</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>VirtualBox is a powerful virtualization product from Oracle.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in VirtualBox. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>An attacker could take control of VirtualBox resulting in the execution
+      of arbitrary code with the privileges of the process, a Denial of Service
+      condition, or other unspecified impacts.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All VirtualBox users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/virtualbox-5.1.32"
+    </code>
+    
+    <p>All VirtualBox Binary users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/virtualbox-bin-5.1.32.120294"
+    </code>
+    
+    <p>All VirtualBox Guest Additions users should upgrade to the latest
+      version:
+    </p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/virtualbox-guest-additions-5.1.32"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2676">CVE-2018-2676</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2685">CVE-2018-2685</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2686">CVE-2018-2686</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2687">CVE-2018-2687</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2688">CVE-2018-2688</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2689">CVE-2018-2689</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2690">CVE-2018-2690</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2693">CVE-2018-2693</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2694">CVE-2018-2694</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-2698">CVE-2018-2698</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-01-23T02:04:52Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2018-02-11T22:35:40Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b9f05110e62a..236ad6aada15 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Feb 2018 15:08:24 +0000
+Thu, 15 Feb 2018 16:08:27 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 70bcad55b1d5..7a2b7b5b3ad6 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-d8a17c05c216f757bca7ba612006419934a11158 1517072516 2018-01-27T17:01:56+00:00
+64ce437d0a7b7134c3694879d7b9648fad09b8b3 1518388633 2018-02-11T22:37:13+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a011591b4655..acf874a25c27 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 1870ef7d05e0..1a542c3d7ca4 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/apachetop-0.17.4 b/metadata/md5-cache/app-admin/apachetop-0.17.4
new file mode 100644
index 000000000000..dc0cc3e4a653
--- /dev/null
+++ b/metadata/md5-cache/app-admin/apachetop-0.17.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) 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=A realtime Apache log analyzer
+EAPI=6
+HOMEPAGE=https://github.com/tessus/apachetop
+IUSE=fam pcre
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= fam? ( virtual/fam ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=https://github.com/tessus/apachetop/releases/download/0.17.4/apachetop-0.17.4.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c16a5ad5c26461b69664f875948753ab
diff --git a/metadata/md5-cache/app-admin/consul-1.0.6 b/metadata/md5-cache/app-admin/consul-1.0.6
new file mode 100644
index 000000000000..fb4bc3f5917a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=dev-go/gox >=dev-lang/go-1.9:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.8 virtual/pkgconfig
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=6
+HOMEPAGE=http://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.0.6.tar.gz -> consul-1.0.6.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=350ff072aa8cc092f3685c179ade86ac
diff --git a/metadata/md5-cache/app-admin/glance-15.0.1 b/metadata/md5-cache/app-admin/glance-15.0.1
new file mode 100644
index 000000000000..2ad50e5775f7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/glance-15.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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=Services for discovering, registering, and retrieving VM images
+EAPI=6
+HOMEPAGE=https://launchpad.net/glance
+IUSE=doc mysql postgres +sqlite +swift 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 sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.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/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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/pastedeploy-1.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/routes-2.3.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/webob-1.7.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/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-sqlparse-0.2.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/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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-concurrency-3.8.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-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/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/taskflow-2.7.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/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(-)] >=dev-python/keystonemiddleware-4.12.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/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/prettytable-0.8.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/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-keystoneclient-3.8.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/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-db-4.24.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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.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-1.23.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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/glance_store-0.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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/cursive-0.1.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/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/glance/glance-15.0.1.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce119e59f5c67a8d5acd3460d5d5f75e
diff --git a/metadata/md5-cache/app-admin/glance-2017.2.9999 b/metadata/md5-cache/app-admin/glance-2017.2.9999
index 44f34a6bc82a..83c0b1fc4d5b 100644
--- a/metadata/md5-cache/app-admin/glance-2017.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2017.2.9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 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	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5da319e707806374f17956771413d5b5
+_md5_=ce119e59f5c67a8d5acd3460d5d5f75e
diff --git a/metadata/md5-cache/app-admin/helm-2.7.2-r3 b/metadata/md5-cache/app-admin/helm-2.7.2-r3
deleted file mode 100644
index c9712ac3dbfd..000000000000
--- a/metadata/md5-cache/app-admin/helm-2.7.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Package Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/helm/archive/v2.7.2.tar.gz -> helm-2.7.2.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz -> github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz -> github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz https://github.com/kubernetes/kubernetes/archive/0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz -> github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz https://github.com/kubernetes/metrics/archive/8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz -> github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz https://github.com/kubernetes/utils/archive/9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz -> github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e9f02b15564d2f47df204ed71a795d5
diff --git a/metadata/md5-cache/app-admin/helm-2.8.1 b/metadata/md5-cache/app-admin/helm-2.8.1
new file mode 100644
index 000000000000..b06eae7caf07
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-2.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Package Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/helm/archive/v2.8.1.tar.gz -> helm-2.8.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/aws/aws-sdk-go/archive/760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz -> github.com-aws-aws-sdk-go-760741802ad40f49ae9fc4a69ef6706d2527d62e.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-ini/ini/archive/300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz -> github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jmespath/go-jmespath/archive/0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/b217b9c388de2cacde4354c536e520c52c055563.tar.gz -> github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-gcfg/gcfg/archive/27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz -> github.com-go-gcfg-gcfg-27e4946190b4a327b539185f2b5b1f7c84730728.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-warnings/warnings/archive/8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz -> github.com-go-warnings-warnings-8a331561fe74dadba6edfc59f3be66c22c3b065d.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz -> github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz https://github.com/kubernetes/kubernetes/archive/3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz -> github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=49859522e64eccc3a07b67b9bd0e6455
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index a58d9e5d2597..f556c5fffebd 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=6
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype debug http test yubikey
 LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
+RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e662ff04ef183e8337109160465c0e9
+_md5_=efb475225e85d31b3d30f8d477da0533
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.4.13 b/metadata/md5-cache/app-admin/mongo-tools-3.4.13
new file mode 100644
index 000000000000..86548df2e890
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.4.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!<dev-db/mongodb-3.0.0 dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.org
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!<dev-db/mongodb-3.0.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.4.13.tar.gz -> mongo-tools-3.4.13.tar.gz
+_md5_=041f317c982aa9e77c256fe9e36b6976
diff --git a/metadata/md5-cache/app-admin/mtail-0_pre20161108 b/metadata/md5-cache/app-admin/mtail-0_pre20161108
deleted file mode 100644
index edb43724209d..000000000000
--- a/metadata/md5-cache/app-admin/mtail-0_pre20161108
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.6:=
-DESCRIPTION=A tool for extracting metrics from application logs
-EAPI=6
-HOMEPAGE=https://github.com/google/mtail/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-misc/mtail
-SLOT=0
-SRC_URI=https://github.com/google/mtail/archive/a780a6342bd70a8fb8ffe187ef988d5417d43a96.tar.gz -> mtail-0_pre20161108.tar.gz https://github.com/spf13/afero/archive/06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz -> afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/fsnotify/fsnotify/archive/v1.4.2.tar.gz -> go-fsnotify-1.4.2.tar.gz https://github.com/golang/tools/archive/76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz -> go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz https://github.com/golang/sys/archive/30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz -> go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz https://github.com/golang/text/archive/b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz -> go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz test? ( https://github.com/kylelemons/godebug/archive/d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz -> godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz )
-_md5_=bfebec5e73a20a953d90e03010ff62d5
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc2 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc2
deleted file mode 100644
index c2e6d906684a..000000000000
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A tool for extracting metrics from application logs
-EAPI=6
-HOMEPAGE=https://github.com/google/mtail
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-misc/mtail
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc2.tar.gz -> mtail-3.0.0_rc2.tar.gz https://github.com/golang/tools/archive/68e087e2a5786de2c035ed544b1c5a42e31f1933.tar.gz -> github.com-golang-tools-68e087e2a5786de2c035ed544b1c5a42e31f1933.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz -> github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz https://github.com/spf13/afero/archive/ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b.tar.gz -> github.com-spf13-afero-ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b.tar.gz https://github.com/golang/sys/archive/314a259e304ff91bd6985da2a7149bbf91237993.tar.gz -> github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz https://github.com/golang/text/archive/1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz -> github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=d49120ef77577a5129059f530242ee07
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc5 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
new file mode 100644
index 000000000000..46204c1696a3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=A tool for extracting metrics from application logs
+EAPI=6
+HOMEPAGE=https://github.com/google/mtail
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-misc/mtail
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/mtail/archive/v3.0.0-rc5.tar.gz -> mtail-3.0.0_rc5.tar.gz https://github.com/golang/tools/archive/a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz -> github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/pkg/errors/archive/30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz -> github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz https://github.com/spf13/afero/archive/bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz -> github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz https://github.com/golang/text/archive/4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz -> github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=9a2f9a14f6baa50ec76bb66c18d3dc87
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.9 b/metadata/md5-cache/app-admin/puppet-4.10.9
deleted file mode 100644
index 58d2bef818c4..000000000000
--- a/metadata/md5-cache/app-admin/puppet-4.10.9
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) 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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-4.10.9.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=95126d96c7796fb07785a7878b5dbc6e
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.9-r1 b/metadata/md5-cache/app-admin/puppet-4.10.9-r1
deleted file mode 100644
index 23622c399e6a..000000000000
--- a/metadata/md5-cache/app-admin/puppet-4.10.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) 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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-4.10.9.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=0c648ba9b76534cc52062c6d166371af
diff --git a/metadata/md5-cache/app-admin/puppet-5.1.0 b/metadata/md5-cache/app-admin/puppet-5.1.0
deleted file mode 100644
index e81d7c894134..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[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/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=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.1.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=64bcd855e8446f0816c91633f33d04d4
diff --git a/metadata/md5-cache/app-admin/puppet-5.1.0-r1 b/metadata/md5-cache/app-admin/puppet-5.1.0-r1
deleted file mode 100644
index 4b09da15a1ef..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] 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/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/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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.1.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0605f96d89db862ec07486baf57dc6e1
diff --git a/metadata/md5-cache/app-admin/puppet-5.3.3 b/metadata/md5-cache/app-admin/puppet-5.3.3
deleted file mode 100644
index 3ce3ab507eee..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] 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/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/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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.3.3.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0605f96d89db862ec07486baf57dc6e1
diff --git a/metadata/md5-cache/app-admin/puppet-5.3.3-r1 b/metadata/md5-cache/app-admin/puppet-5.3.3-r1
deleted file mode 100644
index 560e063b4496..000000000000
--- a/metadata/md5-cache/app-admin/puppet-5.3.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] 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/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/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 system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.3.3.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=dfb81c63f7ac21e5c425ded2e92016fd
diff --git a/metadata/md5-cache/app-admin/puppet-5.3.5 b/metadata/md5-cache/app-admin/puppet-5.3.5
new file mode 100644
index 000000000000..f4706875a311
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-5.3.5
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] 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/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/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 system automation and configuration management software.
+EAPI=6
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.3.5.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dfb81c63f7ac21e5c425ded2e92016fd
diff --git a/metadata/md5-cache/app-admin/puppet-5.4.0 b/metadata/md5-cache/app-admin/puppet-5.4.0
new file mode 100644
index 000000000000..b066b0749b9a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-5.4.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] 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/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/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 system automation and configuration management software.
+EAPI=6
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 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=http://downloads.puppetlabs.com/puppet/puppet-5.4.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	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dfb81c63f7ac21e5c425ded2e92016fd
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.2.1 b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
index 344115ce86e1..c81fa11c3f53 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.2.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A linter for puppet DSL
 EAPI=5
 HOMEPAGE=http://puppet-lint.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
+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/puppet-lint-2.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_=67a39ea785beea1c142c5ecbe137150a
+_md5_=5cea5beafdf16ac0b5afef70293d9135
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.0 b/metadata/md5-cache/app-admin/puppet-lint-2.3.0
index 7083c9f6e914..7209755ccf41 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A linter for puppet DSL
 EAPI=6
 HOMEPAGE=http://puppet-lint.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
+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/puppet-lint-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_=3a98d930658690bc97d61ed90d7001f8
+_md5_=5dc2e9c5fb3aa46eeda47ba0eed2b1ad
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.2 b/metadata/md5-cache/app-admin/puppet-lint-2.3.2
index 6621a5d3cb8a..676b1b6d9f94 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A linter for puppet DSL
 EAPI=6
 HOMEPAGE=http://puppet-lint.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+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/puppet-lint-2.3.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_=7355e69a93322758c50668ec64c774b4
+_md5_=64cf3c5c33759c629e42dd9f96c45be2
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.3 b/metadata/md5-cache/app-admin/puppet-lint-2.3.3
index 2cbb3d1b1e38..9e2b6918f8c7 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.3
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=A linter for puppet DSL
 EAPI=6
 HOMEPAGE=http://puppet-lint.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+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/puppet-lint-2.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_=7355e69a93322758c50668ec64c774b4
+_md5_=64cf3c5c33759c629e42dd9f96c45be2
diff --git a/metadata/md5-cache/app-admin/restart-services-0.14.1 b/metadata/md5-cache/app-admin/restart-services-0.14.1
index 2a528e5bd822..50c6663f3f55 100644
--- a/metadata/md5-cache/app-admin/restart-services-0.14.1
+++ b/metadata/md5-cache/app-admin/restart-services-0.14.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Tool to manage OpenRC services that need to be restarted
 EAPI=5
 HOMEPAGE=https://dev.gentoo.org/~mschiff/restart-services/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-admin/lib_users sys-apps/openrc
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/src/restart-services/restart-services-0.14.1.tgz
-_md5_=f42cfb6b80427d2cbcbf410454e7f2e4
+_md5_=fe15888d8184ff66b98c706c67eb9020
diff --git a/metadata/md5-cache/app-admin/rex-1.6.0 b/metadata/md5-cache/app-admin/rex-1.6.0
new file mode 100644
index 000000000000..0f630a157a77
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rex-1.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes test? ( dev-perl/JSON-MaybeXS dev-perl/Test-UseAllModules virtual/perl-File-Temp ) dev-lang/perl:=
+DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Rex/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Data-Validate-IP dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/YAML virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-1.6.0.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=bd2809e2eba7eae36bc20d59b7a53cba
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.13.2 b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
index e65428b3ee10..46b9c2dda2a7 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.13.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.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(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c8281bebf698e42eb06d089da15bf597
+_md5_=8c24e931041d89d6600ba25a3dc73d45
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.2 b/metadata/md5-cache/app-admin/sysstat-11.7.2
new file mode 100644
index 000000000000..a978ae569272
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/vault-0.9.3 b/metadata/md5-cache/app-admin/vault-0.9.3
new file mode 100644
index 000000000000..db4bbe6f247e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-0.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.9:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DESCRIPTION=A tool for managing secrets
+EAPI=6
+HOMEPAGE=https://vaultproject.io/
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v0.9.3.tar.gz -> vault-0.9.3.tar.gz
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=021cd6ec2fdba0fe1d171a9fb812376f
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a014ca573afc..3e2c5b72ec8b 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/stenc-1.0.7 b/metadata/md5-cache/app-arch/stenc-1.0.7
new file mode 100644
index 000000000000..a85159adc130
--- /dev/null
+++ b/metadata/md5-cache/app-arch/stenc-1.0.7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=SCSI Tape Encryption Manager enables AES support for LTO drives.
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/stenc/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/stenc/source/stenc-1.0.7.tar.gz
+_md5_=45ca1e82d5aa06f212223bad1e65ad8d
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index f05992b10657..7cf1a95e540f 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.6 b/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.6
deleted file mode 100644
index f57a51f4fb83..000000000000
--- a/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libgcrypt:= dev-libs/lzo dev-qt/qtcore:4 dev-qt/qtgui:4 sys-apps/util-linux sys-fs/e2fsprogs sys-libs/zlib
-DESCRIPTION=Qt4 frontend for fsarchiver
-EAPI=5
-HOMEPAGE=http://qt4-fsarchiver.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libgcrypt:= dev-libs/lzo dev-qt/qtcore:4 dev-qt/qtgui:4 sys-apps/util-linux sys-fs/e2fsprogs sys-libs/zlib >=app-backup/fsarchiver-0.6.19[lzma,lzo]
-SLOT=0
-SRC_URI=mirror://sourceforge/qt4-fsarchiver/source/qt4-fsarchiver-0.6.19-6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=818f7ee31c18b8be51075322e67fe940
diff --git a/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.7 b/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.7
deleted file mode 100644
index 2abf4025932f..000000000000
--- a/metadata/md5-cache/app-backup/qt4-fsarchiver-0.6.19.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libgcrypt:= dev-libs/lzo dev-qt/qtcore:4 dev-qt/qtgui:4 sys-apps/util-linux sys-fs/e2fsprogs sys-libs/zlib
-DESCRIPTION=Qt4 frontend for fsarchiver
-EAPI=5
-HOMEPAGE=http://qt4-fsarchiver.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libgcrypt:= dev-libs/lzo dev-qt/qtcore:4 dev-qt/qtgui:4 sys-apps/util-linux sys-fs/e2fsprogs sys-libs/zlib >=app-backup/fsarchiver-0.6.19[lzma,lzo]
-SLOT=0
-SRC_URI=mirror://sourceforge/qt4-fsarchiver/source/qt4-fsarchiver-0.6.19-7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7befe124d24aa2c8932e820528efc4c1
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 53797a607381..e1c034a0903e 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/cfssl-1.2.0_p20170915 b/metadata/md5-cache/app-crypt/cfssl-1.2.0_p20170915
deleted file mode 100644
index 9f4c6724d1b4..000000000000
--- a/metadata/md5-cache/app-crypt/cfssl-1.2.0_p20170915
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Cloudflare's PKI and TLS toolkit
-EAPI=6
-HOMEPAGE=https://github.com/cloudflare/cfssl
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=!!dev-lang/mono
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudflare/cfssl/archive/7d88da830aad9d533c2fb8532da23f6a75331b52.tar.gz -> cfssl-1.2.0_p20170915.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=e7cbd926cf3a5f312a6ea0d236dac60f
diff --git a/metadata/md5-cache/app-crypt/cfssl-1.3.0 b/metadata/md5-cache/app-crypt/cfssl-1.3.0
new file mode 100644
index 000000000000..57af08aa883f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/cfssl-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Cloudflare's PKI and TLS toolkit
+EAPI=6
+HOMEPAGE=https://github.com/cloudflare/cfssl
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=!!dev-lang/mono
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/cloudflare/cfssl/archive/1.3.0.tar.gz -> cfssl-1.3.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=0e34db3d5b1afc5140a847013eb06e02
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 b/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
index 26a0a355701e..440ce4ba6d23 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.4.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=49fe8bf2e52a7564b1a92aabcb29adcd
+_md5_=30e010eb18a554090ddd6f2366ed4040
diff --git a/metadata/md5-cache/app-crypt/keybase-1.0.21 b/metadata/md5-cache/app-crypt/keybase-1.0.21
deleted file mode 100644
index 0a02fab87b46..000000000000
--- a/metadata/md5-cache/app-crypt/keybase-1.0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-lang/go-1.6:0
-DESCRIPTION=Client for keybase.io
-EAPI=6
-HOMEPAGE=https://keybase.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-crypt/gnupg
-SLOT=0
-SRC_URI=https://github.com/keybase/client/archive/v1.0.21.tar.gz -> keybase-1.0.21.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=82038d9391955b525fee5b626bcc9c3a
diff --git a/metadata/md5-cache/app-crypt/keybase-1.0.41 b/metadata/md5-cache/app-crypt/keybase-1.0.41
new file mode 100644
index 000000000000..d63ee2cb9712
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-1.0.41
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=dev-lang/go-1.6:0
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/keybase/client/archive/v1.0.41.tar.gz -> keybase-1.0.41.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=641d8d36542b6d9e5a98ffe409c82e3c
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0 b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
new file mode 100644
index 000000000000..2e18a8c6adf3
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python library and command line tool for configuring a YubiKey
+EAPI=6
+HOMEPAGE=https://developers.yubico.com/yubikey-manager/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=app-crypt/libu2f-host dev-python/six[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/pyscard[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/pyusb[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/click[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/cryptography[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/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-auth/ykpers 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://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-0.6.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4eeeafbbf8db34967b5ec170e25d21de
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 3b09bb1f7eed..e514a9f45dce 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/qvortaro-0.4.1 b/metadata/md5-cache/app-dicts/qvortaro-0.4.1
deleted file mode 100644
index 0270f6a14663..000000000000
--- a/metadata/md5-cache/app-dicts/qvortaro-0.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4
-DESCRIPTION=Esperanto Dictionary
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gentoo/qvortaro-0.4.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8e8d02d1aa4c0bb88e04e66d84681ec3
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9f09eccbb8d5..d17b24f0b0b6 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1 b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
index 3501a778435e..93d58d905e1a 100644
--- a/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
+++ b/metadata/md5-cache/app-doc/linux-kernel-in-a-nutshell-1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Linux Kernel in a Nutshell: A Desktop Quick Reference
 EAPI=6
 HOMEPAGE=http://www.kroah.com/lkn/
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=CC-BY-SA-2.5
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2 mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f150bae7d658db64a6d7ceecc5dc4715
+_md5_=e9d96e0a74e4ce63958c9a1db1ffa057
diff --git a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1 b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
index bf5fdf02002d..82627c4541e4 100644
--- a/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
+++ b/metadata/md5-cache/app-doc/mkdoxy-1.0.0-r1
@@ -3,8 +3,8 @@ DEPEND=app-doc/doxygen >=dev-lang/perl-5
 DESCRIPTION=mkDoxy generates Doxygen-compatible HTML documentation for makefiles
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/mkdoxy/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://sourceforge/mkdoxy/mkdoxy-1.0.0.tar.gz
-_md5_=f9379527ba307d85c72f91ec2582b81b
+_md5_=d1f5beb031d1ae5553c1d2160e1415f3
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 02ca45707ea3..006b43ecce33 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r11 b/metadata/md5-cache/app-editors/emacs-18.59-r11
index 151f7da6ab86..85cf559b7948 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r11
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r11
@@ -10,4 +10,4 @@ RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x3
 SLOT=18
 SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-10.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=690c2ebe7e7da1f1f6b86842e013d6ad
+_md5_=97ee94d6196d838aa643578c465f2373
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r16 b/metadata/md5-cache/app-editors/emacs-23.4-r16
deleted file mode 100644
index cc000d2e3503..000000000000
--- a/metadata/md5-cache/app-editors/emacs-23.4-r16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-23.4
-REQUIRED_USE=?? ( aqua X )
-SLOT=23
-SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-21.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6b424d5ffef5488de81cb792f2953e39
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r17 b/metadata/md5-cache/app-editors/emacs-23.4-r17
new file mode 100644
index 000000000000..fc0f9980ef83
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-23.4
+REQUIRED_USE=?? ( aqua X )
+SLOT=23
+SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-21.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a227cd09339414dd4da35a7d01062097
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r4 b/metadata/md5-cache/app-editors/emacs-24.5-r4
deleted file mode 100644
index 619cf00e0630..000000000000
--- a/metadata/md5-cache/app-editors/emacs-24.5-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-24.5
-REQUIRED_USE=?? ( aqua X )
-SLOT=24
-SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=39f55e7f69f683424d60813a50b06b6b
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r5 b/metadata/md5-cache/app-editors/emacs-24.5-r5
new file mode 100644
index 000000000000..8b31737f25ad
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-24.5
+REQUIRED_USE=?? ( aqua X )
+SLOT=24
+SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7e6c700348327e5db32cf1eca5d9ebb2
diff --git a/metadata/md5-cache/app-editors/emacs-25.3 b/metadata/md5-cache/app-editors/emacs-25.3
deleted file mode 100644
index 00d7cba8438c..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-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
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-25.3
-REQUIRED_USE=?? ( aqua X )
-SLOT=25
-SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b05b8c705ca6ad04ae87c19fa116f603
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r1 b/metadata/md5-cache/app-editors/emacs-25.3-r1
new file mode 100644
index 000000000000..cc899f622d31
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+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
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-25.3
+REQUIRED_USE=?? ( aqua X )
+SLOT=25
+SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=902b790de460e0ba94cabe9fc2a26909
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.0.90 b/metadata/md5-cache/app-editors/emacs-vcs-26.0.90
index b6d1631b20ba..32e1fdd15a0d 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-26.0.90
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.0.90
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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=The extensible, customizable, self-documenting real-time display editor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-26.0.90.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-26.0.90.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bcb5226888f2556f45378b44452b5e8
+_md5_=2d72a410cf19c43e93e00412bdb59f65
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.0.91 b/metadata/md5-cache/app-editors/emacs-vcs-26.0.91
index 305e1f897d22..c9f939055017 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-26.0.91
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.0.91
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) >=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=The extensible, customizable, self-documenting real-time display editor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-26.0.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-26.0.91.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bcb5226888f2556f45378b44452b5e8
+_md5_=2d72a410cf19c43e93e00412bdb59f65
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-26.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-vcs-26.0.9999-r1
index 910ee9a950b7..2b4cdb265dfe 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-26.0.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.0.9999-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) sys-apps/texinfo >=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 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) sys-apps/texinfo >=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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=26
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bcb5226888f2556f45378b44452b5e8
+_md5_=2d72a410cf19c43e93e00412bdb59f65
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999 b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
index 23f3a1cb07d5..2a0e0da9ee01 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-vcs-27.0.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) sys-apps/texinfo >=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 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr ) sys-apps/texinfo >=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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( x11-libs/gtk+:3 net-libs/webkit-gtk:4= ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( xwidgets? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3 x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) )
 REQUIRED_USE=?? ( aqua X )
 SLOT=27
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9d3c2171897fa693cfc2dae2424b6dd6
+_md5_=01229b0f7f5369b18db1ce1478e37224
diff --git a/metadata/md5-cache/app-editors/lfhex-0.42 b/metadata/md5-cache/app-editors/lfhex-0.42
deleted file mode 100644
index acd2c1c84aad..000000000000
--- a/metadata/md5-cache/app-editors/lfhex-0.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 x11-libs/libXt sys-devel/flex sys-devel/bison
-DESCRIPTION=A fast hex-editor with support for large files and comparing binary files
-EAPI=4
-HOMEPAGE=http://stoopidsimple.com/lfhex
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 x11-libs/libXt
-SLOT=0
-SRC_URI=http://stoopidsimple.com/files/lfhex-0.42.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f638aa6a0f678002e04f46d8494d8967
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 1d45076070f5..5d733ddf9418 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/emhacks-20070920 b/metadata/md5-cache/app-emacs/emhacks-20070920
deleted file mode 100644
index 69a81c62ff85..000000000000
--- a/metadata/md5-cache/app-emacs/emhacks-20070920
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=jde? ( app-emacs/jde ) >=virtual/emacs-23
-DESCRIPTION=Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar
-EAPI=5
-HOMEPAGE=http://emhacks.sourceforge.net/
-IUSE=jde
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=jde? ( app-emacs/jde ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=2df776655325ac87d027f263e67cad2f
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
new file mode 100644
index 000000000000..9008e1149a51
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar
+EAPI=6
+HOMEPAGE=http://emhacks.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
+_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
index c76da20de6e9..808564fb9313 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=fbc0af7cd83f314e85ffedc1569c1bad
+_md5_=2a3c1766da79f8e26f63e26555c31aaa
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b319393628c6..5240d5117ec2 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.2 b/metadata/md5-cache/app-emulation/cloud-init-17.2
new file mode 100644
index 000000000000..e0259016b89a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-init-17.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst 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(-)] test? ( dev-python/jinja[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/oauthlib[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/pyserial[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/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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/jsonpatch[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/jsonschema[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/six[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/httpretty-0.7.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/mock[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/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(-)] dev-python/unittest2[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/coverage[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/contextlib2[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(-)] virtual/pkgconfig
+DESCRIPTION=cloud initialisation magic
+EAPI=6
+HOMEPAGE=https://launchpad.net/cloud-init
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/jinja[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/oauthlib[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/pyserial[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/configobj-5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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/jsonpatch[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/jsonschema[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/six[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(-)] net-analyzer/macchanger sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/cloud-init/trunk/17.2/+download/cloud-init-17.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	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b1deef657de126d8f9c8a1efa168c97
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.2 b/metadata/md5-cache/app-emulation/containerd-1.0.2
new file mode 100644
index 000000000000..6ba71b06a1ba
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.8
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=+btrfs hardened
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.0.2.tar.gz -> containerd-1.0.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3e4c46281f5175b04682746d06a812f0
diff --git a/metadata/md5-cache/app-emulation/kompose-1.7.0 b/metadata/md5-cache/app-emulation/kompose-1.7.0
deleted file mode 100644
index 807a4c1f6e3a..000000000000
--- a/metadata/md5-cache/app-emulation/kompose-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Tool to move from docker-compose to Kubernetes
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kompose/archive/v1.7.0.tar.gz -> kompose-1.7.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=8ba027e90ca1768aec239a16d8b62a7c
diff --git a/metadata/md5-cache/app-emulation/kompose-1.9.0 b/metadata/md5-cache/app-emulation/kompose-1.9.0
new file mode 100644
index 000000000000..f02e8ae6f9d9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/kompose-1.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Tool to move from docker-compose to Kubernetes
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kompose/archive/v1.9.0.tar.gz -> kompose-1.9.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=87f67393460153595ac7cf4044b12f7c
diff --git a/metadata/md5-cache/app-emulation/libvirt-3.10.0-r2 b/metadata/md5-cache/app-emulation/libvirt-3.10.0-r2
deleted file mode 100644
index 096457da8075..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-3.10.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath 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=C toolkit to manipulate virtual machines
-EAPI=6
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/3.10.0
-SRC_URI=http://libvirt.org/sources/libvirt-3.10.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ee79c530aa7a1a84524a0b6846af94d6
diff --git a/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1 b/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1
deleted file mode 100644
index 0b1646c7c1b6..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-3.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath 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=C toolkit to manipulate virtual machines
-EAPI=6
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/3.8.0
-SRC_URI=http://libvirt.org/sources/libvirt-3.8.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f26924486aa8ea4ae9e250b978fd71a6
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.0.0 b/metadata/md5-cache/app-emulation/libvirt-4.0.0
index 800b9dd5774f..27a3b3b5f477 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.0.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=6
 HOMEPAGE=http://www.libvirt.org/
 IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/4.0.0
 SRC_URI=http://libvirt.org/sources/libvirt-4.0.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=70e201b315ac919a8016aa3454652f67
+_md5_=0d6710bf6895e53a0b5ce3cc4ecc05b6
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 1ee21a374ecb..9985252cb07d 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -9,4 +9,4 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0c435113fee326532769fbe0508cd2d6
+_md5_=6aefdb3ee43a88a2c9e505594a12e267
diff --git a/metadata/md5-cache/app-emulation/nemu-9999 b/metadata/md5-cache/app-emulation/nemu-9999
new file mode 100644
index 000000000000..3da0213356b2
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/nemu-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev ) app-emulation/qemu[vnc,virtfs] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=ncurses interface for QEMU
+EAPI=6
+HOMEPAGE=https://lib.void.so/nemu
+IUSE=+vnc-client +ovf savevm debug
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0=[unicode] dev-db/sqlite:3= virtual/libusb:1 || ( sys-fs/eudev sys-fs/udev ) app-emulation/qemu[vnc,virtfs] ovf? ( dev-libs/libxml2 app-arch/libarchive ) vnc-client? ( net-misc/tigervnc )
+SLOT=0
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b5a41e2df84db2777c88f2118fc1ab84
diff --git a/metadata/md5-cache/app-emulation/qemu-2.10.1-r1 b/metadata/md5-cache/app-emulation/qemu-2.10.1-r1
deleted file mode 100644
index bfb3a4a4b039..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-2.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=6
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
-SLOT=0
-SRC_URI=http://wiki.qemu-project.org/download/qemu-2.10.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cfb755913686bbba0cd34f1295ecdaaf
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.0 b/metadata/md5-cache/app-emulation/qemu-2.11.0
new file mode 100644
index 000000000000..5eb9cfd737fc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=6
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.0-patches-r0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b7428d828e2cbfd5a200893b613fce29
diff --git a/metadata/md5-cache/app-emulation/qemu-2.11.0-r50 b/metadata/md5-cache/app-emulation/qemu-2.11.0-r50
new file mode 100644
index 000000000000..244ae2666abb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-2.11.0-r50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=6
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
+REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.0-patches-r0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4c90c511ad649f7c68371c42cda2334b
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index e535a2a65c08..9bdb128c64df 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure info install postinst prepare pretend setup test unpack
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:=[static-libs(+)] ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=6
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps
+IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=053e3d39fc46fc5b10fb86c2f55c2acc
+_md5_=4baa8f148ee9814da53d03f02ae53d9e
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.0
new file mode 100644
index 000000000000..da6465282489
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
+EAPI=6
+HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
+SLOT=0
+SRC_URI=http://wiki.qemu.org/download/qemu-2.11.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=609588d3be4782028d71a34f17a0b711
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.6.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.6.0
deleted file mode 100644
index 6e4322f4ffae..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=5
-HOMEPAGE=http://wiki.qemu.org/Features/QAPI/GuestAgent
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 BSD-2
-RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-2.6.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=037f0ed6011d67c08071937c0686153e
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1
deleted file mode 100644
index d0c4b0e53b7e..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=6
-HOMEPAGE=http://wiki.qemu.org/Features/QAPI/GuestAgent
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 BSD-2
-RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-2.8.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=001e9bd51fce75aa587c4e0162b2dc98
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0
deleted file mode 100644
index 4a31a19a3643..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-2.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5 || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
-EAPI=6
-HOMEPAGE=http://wiki.qemu.org/Features/QAPI/GuestAgent
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 BSD-2
-RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1 !<sys-apps/sysvinit-2.88-r5
-SLOT=0
-SRC_URI=http://wiki.qemu.org/download/qemu-2.9.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=001e9bd51fce75aa587c4e0162b2dc98
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc2-r2 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc2-r2
deleted file mode 100644
index 6a017cd0aeab..000000000000
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=runc container cli tools
-EAPI=6
-HOMEPAGE=http://runc.io
-IUSE=apparmor hardened +seccomp
-KEYWORDS=amd64 ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc2.tar.gz -> runc-1.0.0_rc2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=6256d2b3767aa0126c99360e4d41e4ca
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc4 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
index b007f5d90087..a2f0d4bb285d 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc4
@@ -4,10 +4,10 @@ DESCRIPTION=runc container cli tools
 EAPI=6
 HOMEPAGE=http://runc.io
 IUSE=+ambient apparmor hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc4.tar.gz -> runc-1.0.0_rc4.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=a19e134e163e113b19f987cf6455c60b
+_md5_=6f29254e231a3f4af40dbbcf61acba9d
diff --git a/metadata/md5-cache/app-emulation/spice-0.13.90 b/metadata/md5-cache/app-emulation/spice-0.13.90
deleted file mode 100644
index 36da5d440a6a..000000000000
--- a/metadata/md5-cache/app-emulation/spice-0.13.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=app-emulation/spice-protocol-0.12.12 virtual/pkgconfig || ( ( dev-lang/python:3.6 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=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=SPICE server
-EAPI=6
-HOMEPAGE=https://www.spice-space.org/
-IUSE=libressl lz4 sasl smartcard static-libs gstreamer
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/releases/spice-0.13.90.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79a312ddea37fa368ba1348646a69b3f
diff --git a/metadata/md5-cache/app-emulation/spice-0.14.0 b/metadata/md5-cache/app-emulation/spice-0.14.0
new file mode 100644
index 000000000000..a10e1efd5a75
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/spice-0.14.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=app-emulation/spice-protocol-0.12.13 virtual/pkgconfig || ( ( dev-lang/python:3.6 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/six[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=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=SPICE server
+EAPI=6
+HOMEPAGE=https://www.spice-space.org/
+IUSE=libressl lz4 sasl smartcard static-libs gstreamer
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
+SLOT=0
+SRC_URI=https://www.spice-space.org/download/releases/spice-0.14.0.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9786d4c7717a7d3d3b2ef41b78de5c92
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.9.8 b/metadata/md5-cache/app-emulation/vagrant-1.9.8
deleted file mode 100644
index f811d413e3a4..000000000000
--- a/metadata/md5-cache/app-emulation/vagrant-1.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby22] >=dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] <dev-ruby/log4r-1.1.11[ruby_targets_ruby22] >=dev-ruby/net-ssh-4.1.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.1.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[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] ) )
-DESCRIPTION=A tool for building and distributing development environments
-EAPI=6
-HOMEPAGE=http://vagrantup.com/
-IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby22] >=dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] <dev-ruby/log4r-1.1.11[ruby_targets_ruby22] >=dev-ruby/net-ssh-4.1.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.1.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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/mitchellh/vagrant/archive/v1.9.8.tar.gz -> vagrant-1.9.8.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=6eee8c8581bc8738bdb2203575e33c96
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.0.2 b/metadata/md5-cache/app-emulation/vagrant-2.0.2
new file mode 100644
index 000000000000..fb607cddf5af
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby22] >=dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] <dev-ruby/log4r-1.1.11[ruby_targets_ruby22] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[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] ) )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=6
+HOMEPAGE=http://vagrantup.com/
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby22] >=dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] <dev-ruby/log4r-1.1.11[ruby_targets_ruby22] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mitchellh/vagrant/archive/v2.0.2.tar.gz -> vagrant-2.0.2.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=7f8e9873e717864cb22b81c5d2c90a35
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.4.0-r3 b/metadata/md5-cache/app-emulation/virt-manager-1.4.0-r3
deleted file mode 100644
index b15e279a1d6f..000000000000
--- a/metadata/md5-cache/app-emulation/virt-manager-1.4.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) x11-themes/gnome-icon-theme ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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(+)]
-DESCRIPTION=A graphical tool for administering virtual machines
-EAPI=5
-HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl debug python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) x11-themes/gnome-icon-theme ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	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_=527069bf8034d61e19293137d408fd2b
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.4.1 b/metadata/md5-cache/app-emulation/virt-manager-1.4.1
deleted file mode 100644
index dba4f8ab362f..000000000000
--- a/metadata/md5-cache/app-emulation/virt-manager-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) x11-themes/gnome-icon-theme ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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(+)]
-DESCRIPTION=A graphical tool for administering virtual machines
-EAPI=6
-HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) x11-themes/gnome-icon-theme ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.4.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	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_=1ea322b50b86f7337579006b61a71188
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.4.2 b/metadata/md5-cache/app-emulation/virt-manager-1.4.2
deleted file mode 100644
index e95ab8145b50..000000000000
--- a/metadata/md5-cache/app-emulation/virt-manager-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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(+)]
-DESCRIPTION=A graphical tool for administering virtual machines
-EAPI=6
-HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.4.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	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_=ab8ed9cd7d26ff2cbfacbf020322884c
diff --git a/metadata/md5-cache/app-emulation/virt-manager-1.5.0 b/metadata/md5-cache/app-emulation/virt-manager-1.5.0
new file mode 100644
index 000000000000..3ae8bfd960ae
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-manager-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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(+)]
+DESCRIPTION=A graphical tool for administering virtual machines
+EAPI=6
+HOMEPAGE=http://virt-manager.org
+IUSE=gnome-keyring gtk policykit sasl python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	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_=b534abfe8096bf661397e817d3c800d1
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 18f959d1ec7e..044a9ff1942a 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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-vcs/git-1.8.2.1
+DEPEND=!app-emulation/virtinst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/configparser[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/ipaddr[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/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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-vcs/git-1.8.2.1
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
 IUSE=gnome-keyring gtk policykit sasl python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] 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/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/ipaddr[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/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( x11-libs/gtk+:3[introspection] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) 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(+)]
+RDEPEND=!app-emulation/virtinst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/configparser[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/ipaddr[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/libvirt-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[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/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	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_=ab8ed9cd7d26ff2cbfacbf020322884c
+_md5_=a8a640edb2d989c773ba2e54ddca7071
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-4.0 b/metadata/md5-cache/app-emulation/virt-viewer-4.0
deleted file mode 100644
index d92b86abd2bd..000000000000
--- a/metadata/md5-cache/app-emulation/virt-viewer-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-libs/libxml2-2.6 x11-libs/gtk+:3 spice? ( >=net-misc/spice-gtk-0.31[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] ) dev-lang/perl >=dev-util/intltool-0.35.0 virtual/pkgconfig spice? ( >=app-emulation/spice-protocol-0.12.10 ) >=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 console client for connecting to virtual machines
-EAPI=6
-HOMEPAGE=http://virt-manager.org/
-IUSE=sasl +spice +vnc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-libs/libxml2-2.6 x11-libs/gtk+:3 spice? ( >=net-misc/spice-gtk-0.31[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )
-REQUIRED_USE=|| ( spice vnc )
-SLOT=0
-SRC_URI=http://virt-manager.org/download/sources/virt-viewer/virt-viewer-4.0.tar.gz
-_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_=c64cb6c8dc3af8de8a98a27b51b14a19
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-6.0 b/metadata/md5-cache/app-emulation/virt-viewer-6.0
index a077993b1d75..baad45ba33af 100644
--- a/metadata/md5-cache/app-emulation/virt-viewer-6.0
+++ b/metadata/md5-cache/app-emulation/virt-viewer-6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical console client for connecting to virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org/
 IUSE=sasl +spice +vnc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-emulation/libvirt-0.10.0[sasl?] app-emulation/libvirt-glib >=dev-libs/libxml2-2.6 x11-libs/gtk+:3 spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )
 REQUIRED_USE=|| ( spice vnc )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-viewer/virt-viewer-6.0.tar.gz
 _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_=035a5e5a98002aec74d3aeb6e519a0d6
+_md5_=0f3b4f2fe8602fedb8242961e0449f9c
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index a68dae326369..5ef6ccf11576 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1 b/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1
deleted file mode 100644
index 73fa1328ee97..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-1.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Utility to select the default PostgreSQL slot
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-1.2.1.tbz2
-_md5_=4c51fbb78d8761e578f451f10377b888
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
index e6015502e8bd..7c352e34954d 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.3.tbz2
-_md5_=5a9ba74529a10241c279ef678fc330e9
+_md5_=91370d5412dccc1320136f7f236ccc90
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index caef6828c086..1e6dcea2103e 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2
new file mode 100644
index 000000000000..5f52ba08f01f
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Fcitx input method module for Qt 5
+EAPI=6
+HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
+RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
+SLOT=4
+SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.2.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_=1ee706de106e9a5804a34bef888f3871
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
index 3f522d3707f8..d38948c0380d 100644
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20130108-r2
@@ -9,6 +9,6 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-i18n/ibus[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ~app-i18n/sunpinyin-2.0.4_pre20130108:= nls? ( virtual/libintl )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/sunpinyin-2.0.4_pre20130108.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e7117835acfd3196f03e29ccda4a0b0
+_md5_=afc67e92babde17612bb58c198760e56
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20130215 b/metadata/md5-cache/app-i18n/man-pages-ja-20130215
deleted file mode 100644
index c07cd255a2b0..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20130215
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A collection of manual pages translated into Japanese
-EAPI=3
-HOMEPAGE=http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://linuxjm.sourceforge.jp/man-pages-ja-20130215.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=dbccb88aac48db6bbde7748aba8e1b55
diff --git a/metadata/md5-cache/app-i18n/man-pages-ja-20171215 b/metadata/md5-cache/app-i18n/man-pages-ja-20171215
index a2749983989e..7e948dc7d195 100644
--- a/metadata/md5-cache/app-i18n/man-pages-ja-20171215
+++ b/metadata/md5-cache/app-i18n/man-pages-ja-20171215
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=A collection of manual pages translated into Japanese
 EAPI=6
 HOMEPAGE=http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=http://linuxjm.osdn.jp/man-pages-ja-20171215.tar.gz https://dev.gentoo.org/~hattya/distfiles/portage-man-pages-ja-20060415.tar.gz
-_md5_=a29eb322d208e96fb59d05dd1dbb3f22
+_md5_=336d4ad280ef2b4f7be2303bc896f602
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index 1452b4ee63d0..7f0699170a0a 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/
 REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
 SLOT=0
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1902a8103847d6fefe0bbf030b9afb0f
+_md5_=d0c7bc18f472fc5aa0b1482226ed104b
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.2 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.2
deleted file mode 100644
index 65863d7cddc6..000000000000
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) ) test? ( app-editors/emacs )
-DESCRIPTION=Online command-line translator
-EAPI=5
-HOMEPAGE=https://www.soimort.org/translate-shell/
-IUSE=+curl +bidi test tts
-KEYWORDS=~amd64
-LICENSE=public-domain
-RDEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) )
-SLOT=0
-SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.2.tar.gz -> translate-shell-0.9.6.2.tar.gz
-_md5_=a96c8584f4ac08e3ed4d84a760d56e60
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.6 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.6
new file mode 100644
index 000000000000..81d6316a09b6
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) ) test? ( app-editors/emacs )
+DESCRIPTION=Online command-line translator
+EAPI=6
+HOMEPAGE=https://www.soimort.org/translate-shell/
+IUSE=+curl +bidi test tts
+KEYWORDS=~amd64
+LICENSE=public-domain
+RDEPEND=app-misc/rlwrap >=sys-apps/gawk-4.0.2 curl? ( net-misc/curl[ssl] ) bidi? ( dev-libs/fribidi ) tts? ( || ( media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer ) )
+SLOT=0
+SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.6.tar.gz -> translate-shell-0.9.6.6.tar.gz
+_md5_=f8144b70d2b02f0f1ec246a24262199a
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index ea2b8f4e99a9..b12f6260640e 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/ibam-0.5.2-r3 b/metadata/md5-cache/app-laptop/ibam-0.5.2-r3
deleted file mode 100644
index a0fa96c956ee..000000000000
--- a/metadata/md5-cache/app-laptop/ibam-0.5.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gkrellm? ( virtual/pkgconfig )
-DESCRIPTION=Intelligent Battery Monitor
-EAPI=4
-HOMEPAGE=http://ibam.sourceforge.net/
-IUSE=gkrellm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9be36ec350fd073eb98b4789597ef594
diff --git a/metadata/md5-cache/app-laptop/ibam-0.5.2-r4 b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
new file mode 100644
index 000000000000..2f4047a64330
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gkrellm? ( virtual/pkgconfig )
+DESCRIPTION=Intelligent Battery Monitor
+EAPI=6
+HOMEPAGE=http://ibam.sourceforge.net/
+IUSE=gkrellm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.1.diff.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=38c1dfc0781a42694775b0af1948f360
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 5c7ba7d0dd99..f8ddc9b94b7a 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/away-0.9.5-r2 b/metadata/md5-cache/app-misc/away-0.9.5-r2
index 1358d4fc21d1..f8228fcef406 100644
--- a/metadata/md5-cache/app-misc/away-0.9.5-r2
+++ b/metadata/md5-cache/app-misc/away-0.9.5-r2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/pam-0.75
 DESCRIPTION=Terminal locking program with few additional features
 EAPI=6
 HOMEPAGE=http://unbeatenpath.net/software/away/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=http://unbeatenpath.net/software/away/away-0.9.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7322793095a9811fd4fe35fb03ce8c53
+_md5_=829349753ce52aff3e468e3f3140262a
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1-r1 b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
index caa004bd0527..6aa71233e2f1 100644
--- a/metadata/md5-cache/app-misc/calendar-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
 EAPI=6
 HOMEPAGE=http://bsdcalendar.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6eb2162413e59d8ca231a293355a4dd1
+_md5_=abf009fe0d0f7364180dd047fbad0974
diff --git a/metadata/md5-cache/app-misc/ckb-0.2.9 b/metadata/md5-cache/app-misc/ckb-0.2.9
new file mode 100644
index 000000000000..f0615317c884
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckb-0.2.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/pkgconfig
+DESCRIPTION=Corsair K65/K70/K95 Driver
+EAPI=5
+HOMEPAGE=https://github.com/ckb-next/ckb-next
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.2.9.tar.gz -> ckb-0.2.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=0dc5442e630670c30957ee5a9fa93473
diff --git a/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3 b/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
index d55b50254f7c..631ed7470d09 100644
--- a/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
+++ b/metadata/md5-cache/app-misc/dailystrips-1.0.28-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=dailystrips automatically downloads your favorite online comics from the web
 EAPI=6
 HOMEPAGE=http://dailystrips.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-perl/libwww-perl-5.50 dev-perl/DateTime dev-perl/TimeDate
 SLOT=0
 SRC_URI=mirror://sourceforge/dailystrips/dailystrips-1.0.28.tar.gz
-_md5_=c4ae5ec21354d6dcfe6dedee91cb4cf2
+_md5_=397a83de48ff05713c4de71f694cc46d
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
index f3f102907bd5..07c99f9b7697 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
 EAPI=6
 HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1c00134a29e3fa0a9c793b1b39d3facf
+_md5_=b4cbd591952e624e23d17027a75c8f77
diff --git a/metadata/md5-cache/app-misc/khard-0.11.4 b/metadata/md5-cache/app-misc/khard-0.11.4
index b84ae5f4cb52..4ff144bc0ed8 100644
--- a/metadata/md5-cache/app-misc/khard-0.11.4
+++ b/metadata/md5-cache/app-misc/khard-0.11.4
@@ -4,11 +4,11 @@ DESCRIPTION=Console CardDAV client
 EAPI=6
 HOMEPAGE=https://github.com/scheibler/khard
 IUSE=zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/atomicwrites[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/configobj[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[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/vobject-0.9.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.11.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_=9168103de8a7473c38be237f9d178e49
+_md5_=70d32a149aa6b3a756de979964a44eea
diff --git a/metadata/md5-cache/app-misc/linux-logo-5.11-r4 b/metadata/md5-cache/app-misc/linux-logo-5.11-r4
index 5835cbd91590..5c1e63061714 100644
--- a/metadata/md5-cache/app-misc/linux-logo-5.11-r4
+++ b/metadata/md5-cache/app-misc/linux-logo-5.11-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A utility that displays an ANSI/ASCII logo and some system informati
 EAPI=6
 HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
 IUSE=nls
-KEYWORDS=~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b3c53946d7d04e10f987fb92152bbad
+_md5_=b5c4ab175f1aeddbeb2a9467101368b9
diff --git a/metadata/md5-cache/app-misc/mepl-0.45-r1 b/metadata/md5-cache/app-misc/mepl-0.45-r1
index cedb9861496d..66ef7f288b4b 100644
--- a/metadata/md5-cache/app-misc/mepl-0.45-r1
+++ b/metadata/md5-cache/app-misc/mepl-0.45-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Self-employed-mode software for 3COM/USR message modems
 EAPI=6
 HOMEPAGE=https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hof-berlin.de/mepl/mepl0.45.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=76ad7d5bb7522d0fc3bdcf23a27bd8b1
+_md5_=4531680c1e518aaf6f47b6115db52b0d
diff --git a/metadata/md5-cache/app-misc/pipeworks-0.4-r1 b/metadata/md5-cache/app-misc/pipeworks-0.4-r1
index 4b7114afb84e..569be53df574 100644
--- a/metadata/md5-cache/app-misc/pipeworks-0.4-r1
+++ b/metadata/md5-cache/app-misc/pipeworks-0.4-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A small utility that measures throughput between stdin and stdout
 EAPI=6
 HOMEPAGE=http://pipeworks.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pipeworks/pipeworks-0.4.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d5759d6f64bc5dc3410fd185c44b9af
+_md5_=77fa843035aa183ca89bd9d5a9032da6
diff --git a/metadata/md5-cache/app-misc/timestamp-1.1-r1 b/metadata/md5-cache/app-misc/timestamp-1.1-r1
index dcb48daad071..cf6563bb3fa6 100644
--- a/metadata/md5-cache/app-misc/timestamp-1.1-r1
+++ b/metadata/md5-cache/app-misc/timestamp-1.1-r1
@@ -3,9 +3,9 @@ DEPEND=!sys-apps/moreutils
 DESCRIPTION=A text filtering pipe that marks each line with a timestamp
 EAPI=6
 HOMEPAGE=http://math.smsu.edu/~erik/software.php?id=95
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=!sys-apps/moreutils
 SLOT=0
 SRC_URI=http://math.smsu.edu/~erik/files/timestamp-1.1.tar.gz
-_md5_=1b2c051ef2991d66685bf72e489012e5
+_md5_=47206918165b2c776116a90666b00203
diff --git a/metadata/md5-cache/app-misc/tmux-2.6 b/metadata/md5-cache/app-misc/tmux-2.6
index 448ecace89ce..dfdeb253c1cd 100644
--- a/metadata/md5-cache/app-misc/tmux-2.6
+++ b/metadata/md5-cache/app-misc/tmux-2.6
@@ -4,10 +4,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=6
 HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz
 _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	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=afda762259c004c9ac16154b24366656
+_md5_=14305ec650493ba98820aede39249fe9
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.2 b/metadata/md5-cache/app-misc/xmind-3.7.2
deleted file mode 100644
index 59d9ae591fd2..000000000000
--- a/metadata/md5-cache/app-misc/xmind-3.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=>=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=6
-HOMEPAGE=http://www.xmind.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update2-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d416d8d0a9f1269a9386e44d3cce1d7d
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6 b/metadata/md5-cache/app-misc/xmind-3.7.6
deleted file mode 100644
index 1ee7a11b488b..000000000000
--- a/metadata/md5-cache/app-misc/xmind-3.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=>=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A brainstorming and mind mapping software tool
-EAPI=6
-HOMEPAGE=http://www.xmind.net
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=EPL-1.0 LGPL-3
-RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update6-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4933b47b2ce2b0e5ee1636214ef5e3b
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
new file mode 100644
index 000000000000..8a77d0e17934
--- /dev/null
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=>=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=A brainstorming and mind mapping software tool
+EAPI=6
+HOMEPAGE=http://www.xmind.net
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0 LGPL-3
+RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce41f30fe4b1048c80808e77b70fba42
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index fa192f94dfe4..0565fbac7bd8 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/past-0.0.4 b/metadata/md5-cache/app-mobilephone/past-0.0.4
deleted file mode 100644
index e868d424001f..000000000000
--- a/metadata/md5-cache/app-mobilephone/past-0.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-mobilephone/gnokii[sms] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Simple SMS tool
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/content/show.php/past+-+SMS+Tool?content=74036
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-mobilephone/gnokii[sms] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466626318/74036-past-0.0.4.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	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=308eead13e0c7787d913ae520c8552d1
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index b586061524f7..c5b047cc34d8 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/calligra-3.1.0 b/metadata/md5-cache/app-office/calligra-3.1.0
deleted file mode 100644
index f89995ee8d72..000000000000
--- a/metadata/md5-cache/app-office/calligra-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-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/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-apps/kholidays-17.12.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=KDE Office Suite
-EAPI=6
-HOMEPAGE=https://www.calligra.org/
-IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-apps/kholidays-17.12.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n: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
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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_=8c4ca874309b89a1d8b1ff08b551b534
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r1 b/metadata/md5-cache/app-office/calligra-3.1.0-r1
new file mode 100644
index 000000000000..7c3f4614adbe
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=KDE Office Suite
+EAPI=6
+HOMEPAGE=https://www.calligra.org/
+IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n: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
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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_=1284666b9482b053cf8707038c93a620
diff --git a/metadata/md5-cache/app-office/ledger-3.1.1 b/metadata/md5-cache/app-office/ledger-3.1.1
index 0e18c7a0cce0..e1f5559dc44e 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.1
+++ b/metadata/md5-cache/app-office/ledger-3.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup t
 DEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= emacs? ( virtual/emacs ) python? ( dev-libs/boost:=[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/cheetah 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/utfcpp doc? ( sys-apps/texinfo virtual/texi2dvi dev-texlive/texlive-fontsrecommended ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A double-entry accounting system with a command-line reporting interface
 EAPI=5
-HOMEPAGE=http://ledger-cli.org/
+HOMEPAGE=https://www.ledger-cli.org/
 IUSE=doc emacs python python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a6599270abf6d0d5dc719ceacdece40a
+_md5_=1f5fe91e87a6a5e38aae52f720940f88
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-5.4.5.1
index 1142af689f2e..5ed34c2d09ce 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.5.1
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.5.1
@@ -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.5.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-help-5.4.5.1.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_=9a3b9398a96826ce6f275186cd7b5435
+_md5_=02fe588f37c02f9a12686d8f90ba9c96
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2
deleted file mode 100644
index a752a17b7873..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig >=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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=gnome java kde kde 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
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-5.4.2.2*
-RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.63.0 dev-libs/icu:0/58.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-5.4.0-r3 >=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_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 >=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-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) !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 ) 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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_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 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.2.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.2.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.2.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.2.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.2.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.2.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.2.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.2.2.xd3 ) ) ) )
-_eclasses_=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	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d2fdf74938983128dbe286b0583265e4
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1
deleted file mode 100644
index 72b19c19f203..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.4.2.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 kde? ( dev-util/automoc virtual/pkgconfig >=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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=gnome java kde kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-5.4.2.2*
-RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.63.0 dev-libs/icu:0/58.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-extra/evolution-data-server ) gnome? ( gnome-base/dconf ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection x11-libs/gtk+:3 ) !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 ) 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 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) )
-_eclasses_=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	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c5f6d8758b8166dcb0ca7c6058df8fb
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1
new file mode 100644
index 000000000000..d9cf3cdc0c53
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
+KEYWORDS=-* ~amd64 x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-5.4.5.1*
+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 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.5.1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.5.1.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
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2
deleted file mode 100644
index dcfd8506bb09..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-5.4.2.2[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.2.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.2.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.2.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.2.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.2.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.2.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.2.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.2.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.2.2.xd3 ) ) ) )
-_md5_=d9144d3c9cb99dfe5d6b0defdf502aaa
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1
deleted file mode 100644
index 9b075561e941..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-5.4.2.2-r1[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.2.2-r1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.2.2-r1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.2.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.2.2-r1.xd3 ) ) ) )
-_md5_=d9144d3c9cb99dfe5d6b0defdf502aaa
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1
new file mode 100644
index 000000000000..c1903043d1b9
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=6
+HOMEPAGE=http://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-5.4.5.1[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.5.1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.5.1.xd3 ) ) ) )
+_md5_=07f70bc9962278d1bffa67f57e62e179
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.2.2 b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.2.2
deleted file mode 100644
index 2b039e574e5e..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=6
-HOMEPAGE=http://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm ~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? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-US.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_af.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ar.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_as.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_be.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_br.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_brx.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cy.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dgo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fa.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ga.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kok.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ks.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mai.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ml.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mni.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_my.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nso.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_oc.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_or.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ro.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_rw.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sat.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sid.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ss.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_st.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ta.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_te.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_th.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ts.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ve.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_xh.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( http://download.documentfoundation.org/libreoffice/stable/5.4.2/rpm/x86/LibreOffice_5.4.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.4.2.2_Linux_x86_rpm_langpack_zu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.4.2/rpm/x86/LibreOffice_5.4.2.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_=0cda6fff6ea4d0f7346dd62726d7dbef
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1
index 87b44cd341c5..8dfdff66fa6d 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1
@@ -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.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_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_=90d20d65c156742febded9ceda8ca7da
+_md5_=ebcc748aec09bacac268bd23e80a544a
diff --git a/metadata/md5-cache/app-office/lyx-2.0.8.1-r1 b/metadata/md5-cache/app-office/lyx-2.0.8.1-r1
deleted file mode 100644
index b52ca2da466b..000000000000
--- a/metadata/md5-cache/app-office/lyx-2.0.8.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=dev-libs/boost-1.34 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(+)] virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
-EAPI=5
-HOMEPAGE=https://www.lyx.org/
-IUSE=cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he X python_targets_python2_7
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=dev-libs/boost-1.34 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-texlive/texlive-fontsextra virtual/imagemagick-tools[png,svg?] cups? ( net-print/cups ) latex? ( app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht[java] ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) l10n_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( <dev-vcs/subversion-1.7.0 ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.8.1.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/2.0.8.1/lyx-2.0.8.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3b6096eea08e4011506ba578d21f5f4
diff --git a/metadata/md5-cache/app-office/lyx-2.2.2-r1 b/metadata/md5-cache/app-office/lyx-2.2.2-r1
deleted file mode 100644
index 27bcf9d9fa6b..000000000000
--- a/metadata/md5-cache/app-office/lyx-2.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/boost-1.34:= 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(+)] qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
-EAPI=5
-HOMEPAGE=https://www.lyx.org/
-IUSE=cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he X python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.34:= 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(+)] qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 ) dev-texlive/texlive-fontsextra virtual/imagemagick-tools[png,svg?] cups? ( net-print/cups ) latex? ( app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht[java] ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) l10n_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( dev-vcs/subversion ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant )
-REQUIRED_USE=python_targets_python2_7 qt4? ( !qt5 ) qt5? ( !qt4 )
-SLOT=0
-SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.2.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.2/lyx-2.2.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4832864b985e403a9cfe5d640d5b0f9d
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3 b/metadata/md5-cache/app-office/lyx-2.2.3
deleted file mode 100644
index b658589752f1..000000000000
--- a/metadata/md5-cache/app-office/lyx-2.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/boost-1.34:= 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(+)] qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
-EAPI=5
-HOMEPAGE=https://www.lyx.org/
-IUSE=cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he X python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.34:= 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(+)] qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 ) dev-texlive/texlive-fontsextra virtual/imagemagick-tools[png,svg?] cups? ( net-print/cups ) latex? ( app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht[java] ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) l10n_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( dev-vcs/subversion ) rcs? ( dev-vcs/rcs ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) gnumeric? ( app-office/gnumeric ) hunspell? ( app-text/hunspell ) aspell? ( app-text/aspell ) enchant? ( app-text/enchant )
-REQUIRED_USE=python_targets_python2_7 qt4? ( !qt5 ) qt5? ( !qt4 )
-SLOT=0
-SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4832864b985e403a9cfe5d640d5b0f9d
diff --git a/metadata/md5-cache/app-office/odeskteam-3.12.19 b/metadata/md5-cache/app-office/odeskteam-3.12.19
deleted file mode 100644
index fecbd8463011..000000000000
--- a/metadata/md5-cache/app-office/odeskteam-3.12.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for oDesk.com
-EAPI=5
-HOMEPAGE=https://www.odesk.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ODESK
-RDEPEND=media-libs/phonon[qt4] >=dev-libs/glib-2 app-arch/bzip2 dev-libs/libxml2 dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 media-libs/glu media-libs/mesa sys-libs/glibc x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXi
-SLOT=0
-SRC_URI=amd64? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.19.x86_64.rpm ) x86? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.19.i386.rpm )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=91374d811a7ae78edf0d94594ef8122a
diff --git a/metadata/md5-cache/app-office/odeskteam-3.12.9 b/metadata/md5-cache/app-office/odeskteam-3.12.9
deleted file mode 100644
index 6148ae1a3f5a..000000000000
--- a/metadata/md5-cache/app-office/odeskteam-3.12.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for oDesk.com
-EAPI=5
-HOMEPAGE=https://www.odesk.com/
-KEYWORDS=amd64 x86
-LICENSE=ODESK
-RDEPEND=media-libs/phonon[qt4] >=dev-libs/glib-2 app-arch/bzip2 dev-libs/libxml2 dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtscript:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 media-libs/glu media-libs/mesa sys-libs/glibc x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXi
-SLOT=0
-SRC_URI=amd64? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.9.x86_64.rpm ) x86? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.12.9.i386.rpm )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3be377430a2cec7765c9ab3e6834d318
diff --git a/metadata/md5-cache/app-office/odeskteam-3.6.1 b/metadata/md5-cache/app-office/odeskteam-3.6.1
deleted file mode 100644
index d5fcb8f9e287..000000000000
--- a/metadata/md5-cache/app-office/odeskteam-3.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for oDesk.com
-EAPI=4
-HOMEPAGE=https://www.odesk.com/
-KEYWORDS=amd64 x86
-LICENSE=ODESK
-RDEPEND=>=dev-libs/glib-2 media-video/ffmpeg media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/openjpeg:0 app-arch/bzip2 dev-libs/expat dev-libs/libxml2 dev-libs/openssl:0 dev-libs/icu sys-apps/util-linux sys-apps/dbus sys-libs/zlib virtual/libffi x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender dev-qt/qtcore:4[ssl] dev-qt/qtgui:4
-SLOT=0
-SRC_URI=amd64? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.6.1-1fc17.x86_64.rpm ) x86? ( https://www.odesk.com/downloads/linux/beta/odeskteam-3.6.1-1fc17.i386.rpm )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9dd13882267b12e7b4f1afcd463b48e6
diff --git a/metadata/md5-cache/app-office/orage-4.12.1 b/metadata/md5-cache/app-office/orage-4.12.1
index 72a7fb3e7edc..fa9409768742 100644
--- a/metadata/md5-cache/app-office/orage-4.12.1
+++ b/metadata/md5-cache/app-office/orage-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=A time managing application (and panel plug-in) for the Xfce desktop
 EAPI=5
 HOMEPAGE=https://git.xfce.org/apps/orage/
 IUSE=berkdb dbus debug libnotify +xfce_plugins_clock
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) xfce_plugins_clock? ( >=xfce-base/xfce4-panel-4.10:= )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.12/orage-4.12.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=aa251d904575804067f5ec1b784db675
+_md5_=b969525078a7dc2ecdc9e35753021569
diff --git a/metadata/md5-cache/app-office/orage-4.12.1-r1 b/metadata/md5-cache/app-office/orage-4.12.1-r1
index 2441c677a514..9666ce93ac45 100644
--- a/metadata/md5-cache/app-office/orage-4.12.1-r1
+++ b/metadata/md5-cache/app-office/orage-4.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A time managing application (and panel plug-in) for the Xfce desktop
 EAPI=6
 HOMEPAGE=https://git.xfce.org/apps/orage/
 IUSE=berkdb +clock-panel-plugin dbus libnotify
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) clock-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.12/orage-4.12.1.tar.bz2
 _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_=de8be812eb24a11fee1205d18962bb75
+_md5_=48fd98e983daad07615fa433634ab734
diff --git a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21 b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21
deleted file mode 100644
index edbabacf9bed..000000000000
--- a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst setup unpack
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4
-DESCRIPTION=WPS Office is an office productivity suite
-EAPI=6
-HOMEPAGE=http://linux.wps.cn/ http://wps-community.org/
-IUSE=+sharedfonts X
-KEYWORDS=~amd64 ~x86
-LICENSE=WPS-EULA
-RDEPEND=media-libs/phonon app-arch/bzip2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi dev-libs/libxml2:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-libs/libpng:1.2 virtual/opengl media-libs/tiff:3 sys-apps/util-linux sys-libs/zlib x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXxf86vm media-libs/libmng net-print/cups net-nds/openldap dev-db/sqlite:3
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=x86? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_i386.deb ) amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_amd64.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6154a804330b3c09226ec4d7ee262f75
diff --git a/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1 b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1
new file mode 100644
index 000000000000..3ca20452f7d4
--- /dev/null
+++ b/metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=WPS Office is an office productivity suite
+EAPI=6
+HOMEPAGE=http://linux.wps.cn/ http://wps-community.org/
+IUSE=+sharedfonts X
+KEYWORDS=~amd64 ~x86
+LICENSE=WPS-EULA
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb sys-devel/gcc sys-libs/glibc media-libs/fontconfig:1.0 media-libs/freetype:2 dev-libs/glib:2 sys-libs/zlib:0 net-print/cups media-libs/libpng:1.2 virtual/glu dev-libs/libpcre:3 dev-libs/libffi media-sound/pulseaudio app-arch/bzip2:0 media-libs/libpng:0 dev-libs/expat sys-apps/util-linux dev-libs/libbsd x11-libs/libXau x11-libs/libXdmcp sys-apps/dbus x11-libs/libXtst sys-apps/systemd sys-apps/tcp-wrappers media-libs/libsndfile net-libs/libasyncns dev-libs/libgcrypt:0 app-arch/xz-utils app-arch/lz4 sys-libs/libcap media-libs/flac media-libs/libogg media-libs/libvorbis dev-libs/libgpg-error sys-apps/attr
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=x86? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_i386.deb ) amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5707~a21_amd64.deb )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2628b0ab5c7ad99f15c25040f805caff
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 4f958282606b..84a7b4509b73 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gemato-11.2 b/metadata/md5-cache/app-portage/gemato-11.2
new file mode 100644
index 000000000000..2c24d85fb6ea
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( blake2? ( 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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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/pysha3[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/pysha3[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/pysha3[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_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma sha3 test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=blake2? ( 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(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[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/pysha3[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/pysha3[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/pysha3[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(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gemato/gemato-11.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_=4ca4fd5d05985fc7bd658dbb31c32579
diff --git a/metadata/md5-cache/app-portage/kuroo-9999 b/metadata/md5-cache/app-portage/kuroo-9999
index 4132b4fab94f..866d2c95a9ac 100644
--- a/metadata/md5-cache/app-portage/kuroo-9999
+++ b/metadata/md5-cache/app-portage/kuroo-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 sys-devel/make >=dev-util/cmake-3.7.2 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 kde-frameworks/extra-cmake-modules:5 sys-devel/make >=dev-util/cmake-3.7.2 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Graphical Portage frontend based on KDE Frameworks
 EAPI=6
 HOMEPAGE=http://kuroo.sourceforge.net/
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
+RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
 SLOT=0
 _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	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e25b58fc7291c8c22f01c186073021f1
+_md5_=277394ca64cf16737cbf6ca26690ac91
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.26 b/metadata/md5-cache/app-portage/portpeek-2.1.26
new file mode 100644
index 000000000000..936410f94973
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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-portage/gentoolkit-0.4.0 >=sys-apps/portage-2.3.19-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.26.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8f3104e18072f10e1116088d1a99d827
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 76fe25b2cc61..4a313da31cb5 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/ksh-93.20180213 b/metadata/md5-cache/app-shells/ksh-93.20180213
new file mode 100644
index 000000000000..887af42daa29
--- /dev/null
+++ b/metadata/md5-cache/app-shells/ksh-93.20180213
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=The Original Korn Shell, 1993 revision (ksh93)
+EAPI=6
+HOMEPAGE=http://www.kornshell.com/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=CPL-1.0 EPL-1.0
+RDEPEND=!app-shells/pdksh
+SLOT=0
+SRC_URI=https://github.com/att/ast/archive/b6aaffac8880000a9f5343e9dfd78ff2a7964b51/ksh-93.20180213.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4c9889c4427adcaf3fe1901318544570
diff --git a/metadata/md5-cache/app-shells/zsh-completions-0.27.0 b/metadata/md5-cache/app-shells/zsh-completions-0.27.0
index ed3645dae8f8..11ffc73b5b97 100644
--- a/metadata/md5-cache/app-shells/zsh-completions-0.27.0
+++ b/metadata/md5-cache/app-shells/zsh-completions-0.27.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Additional completion definitions for Zsh
 EAPI=6
 HOMEPAGE=https://github.com/zsh-users/zsh-completions
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~sparc ~x86
 LICENSE=BSD
 RDEPEND=app-shells/zsh
 SLOT=0
 SRC_URI=https://github.com/zsh-users/zsh-completions/archive/0.27.0.tar.gz -> zsh-completions-0.27.0.tar.gz
-_md5_=c06ce855ec141e069279621cf6b78ad6
+_md5_=51d4ef6ccdfc4a9b5ff433e0bbb68a09
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7b1c21b67539..16d1e94093bf 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/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index da9b290826b2..6e5f23b6383a 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
 DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
 EAPI=6
 HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libtommath-0.36-r1
 SLOT=0
 SRC_URI=http://www.convertlit.com/clit18src.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c257fe3d556f339abc1f9d7913c84894
+_md5_=f96413f0347aae27dce312a6fddec1ef
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
index a6a0eb97f925..6906c5ba5758 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) >=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
+DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) >=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=Shell scripts to manage DocBook documents
 EAPI=5
 HOMEPAGE=https://sourceware.org/docbook-tools/
 IUSE=jadetex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a03158a808f6b42ea139ae166aa9ff27
+_md5_=f820a451f4fd58d12113f80d087523c5
diff --git a/metadata/md5-cache/app-text/tabler-2-r1 b/metadata/md5-cache/app-text/tabler-2-r1
index 67acb3a34a9e..ea4f9e4a0bdf 100644
--- a/metadata/md5-cache/app-text/tabler-2-r1
+++ b/metadata/md5-cache/app-text/tabler-2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A utility to create text art tables from delimited input
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/tabler/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tabler/tabler-2.tar.gz
-_md5_=05b281eaefb104299acdb5644fb79490
+_md5_=41977784d199fce072e06c0f305247dd
diff --git a/metadata/md5-cache/app-text/texlive-2017 b/metadata/md5-cache/app-text/texlive-2017
index 7b8c4c44421d..8f7e77f3fc2e 100644
--- a/metadata/md5-cache/app-text/texlive-2017
+++ b/metadata/md5-cache/app-text/texlive-2017
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=5
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_en-GB l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2017 app-text/psutils >=dev-texlive/texlive-fontutils-2017 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 luatex? ( >=dev-texlive/texlive-luatex-2017 ) >=dev-texlive/texlive-latexrecommended-2017 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2017 dev-tex/feynmf ) >=dev-texlive/texlive-plaingeneric-2017 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2017 >=dev-texlive/texlive-fontsextra-2017 >=dev-texlive/texlive-formatsextra-2017 >=dev-texlive/texlive-latexextra-2017 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 ) xetex? ( >=dev-texlive/texlive-xetex-2017 ) graphics? ( >=dev-texlive/texlive-pictures-2017 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2017 ) publishers? ( >=dev-texlive/texlive-publishers-2017 ) music? ( >=dev-texlive/texlive-music-2017 ) pstricks? ( >=dev-texlive/texlive-pstricks-2017 ) context? ( >=dev-texlive/texlive-context-2017 ) games? ( >=dev-texlive/texlive-games-2017 ) humanities? ( >=dev-texlive/texlive-humanities-2017 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2017 >=dev-texlive/texlive-langother-2017 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2017 ) cjk? ( >=dev-texlive/texlive-langcjk-2017 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2017 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2017 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_en-GB? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2017 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2017 ) l10n_he? ( >=dev-texlive/texlive-langother-2017 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_as? ( >=dev-texlive/texlive-langother-2017 ) l10n_bn? ( >=dev-texlive/texlive-langother-2017 ) l10n_gu? ( >=dev-texlive/texlive-langother-2017 ) l10n_hi? ( >=dev-texlive/texlive-langother-2017 ) l10n_kn? ( >=dev-texlive/texlive-langother-2017 ) l10n_ml? ( >=dev-texlive/texlive-langother-2017 ) l10n_mr? ( >=dev-texlive/texlive-langother-2017 ) l10n_or? ( >=dev-texlive/texlive-langother-2017 ) l10n_pa? ( >=dev-texlive/texlive-langother-2017 ) l10n_sa? ( >=dev-texlive/texlive-langother-2017 ) l10n_ta? ( >=dev-texlive/texlive-langother-2017 ) l10n_te? ( >=dev-texlive/texlive-langother-2017 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2017 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2017 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2017 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eo? ( >=dev-texlive/texlive-langother-2017 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2017 ) l10n_ia? ( >=dev-texlive/texlive-langother-2017 ) l10n_id? ( >=dev-texlive/texlive-langother-2017 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lo? ( >=dev-texlive/texlive-langother-2017 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2017 >=dev-texlive/texlive-langcyrillic-2017 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2017 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2017 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_vi? ( >=dev-texlive/texlive-langother-2017 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2017 ) xindy? ( app-text/xindy )
 SLOT=0
-_md5_=1cf91973ab1c8f1cbb1c430fc00fff3c
+_md5_=9d6bce4caf240c50a6a0db96d317748b
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
index 2dd5e28ebf7e..c7efe0dd1256 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r3
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -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-1.4.5[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.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.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_=d683c734d02cd2dd9b88efcf095773e1
+_md5_=3a25e2568471b6f012c45a99421d44a5
diff --git a/metadata/md5-cache/app-text/tuxcards-2.2.1-r1 b/metadata/md5-cache/app-text/tuxcards-2.2.1-r1
deleted file mode 100644
index 38c58634cf13..000000000000
--- a/metadata/md5-cache/app-text/tuxcards-2.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=A hierarchical notebook
-EAPI=6
-HOMEPAGE=http://www.tuxcards.de/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://www.tuxcards.de/src/tuxcards-2.2.1/tuxcards-2.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ff7bf018fc6fffa34e3eea995599b0eb
diff --git a/metadata/md5-cache/app-text/yagf-0.9.5 b/metadata/md5-cache/app-text/yagf-0.9.5
deleted file mode 100644
index e82e330712bf..000000000000
--- a/metadata/md5-cache/app-text/yagf-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 app-text/aspell sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Graphical front-end for cuneiform and tesseract OCR tools
-EAPI=6
-HOMEPAGE=http://sourceforge.net/projects/yagf-ocr/
-IUSE=scanner cuneiform +tesseract pdf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 app-text/aspell cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) scanner? ( media-gfx/xsane ) pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )
-REQUIRED_USE=|| ( cuneiform tesseract )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/yagf-ocr/yagf-0.9.5.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=500d18bb8ebefe0bb89b37b28152fe4a
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
index da312c61f244..55ea863e5caf 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b4e2951479e9bb00db31a55662311fe
+_md5_=771c4598f5d7423078e90a83541354c8
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
index 4a7722d60b35..f15c41fe834c 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.8
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f604fbdfcd71dc951fd1d6e9f60f762
+_md5_=803ac953fda3ec79f54de1620500dae6
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index cf352cb2937f..6c28f5d1d781 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -7,4 +7,4 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f604fbdfcd71dc951fd1d6e9f60f762
+_md5_=803ac953fda3ec79f54de1620500dae6
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index d0f74449a80e..9110453791a4 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/aunit-2016 b/metadata/md5-cache/dev-ada/aunit-2016
deleted file mode 100644
index 52ba20e0124f..000000000000
--- a/metadata/md5-cache/dev-ada/aunit-2016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-DESCRIPTION=Ada unit testing framework
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> aunit-gpl-2016-src.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=11088a59fcb5e2a6639af8bc881b8135
diff --git a/metadata/md5-cache/dev-ada/aunit-2017 b/metadata/md5-cache/dev-ada/aunit-2017
index 5643b3f6fe6b..696fede0dff7 100644
--- a/metadata/md5-cache/dev-ada/aunit-2017
+++ b/metadata/md5-cache/dev-ada/aunit-2017
@@ -4,11 +4,11 @@ DESCRIPTION=Ada unit testing framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
 IUSE=gnat_2016 +gnat_2017
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000 -> aunit-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=54d69625f2f1e74af11d1038c17369af
+_md5_=27c8490ac87202b51a6572cbe75e5dd7
diff --git a/metadata/md5-cache/dev-ada/aws-2016 b/metadata/md5-cache/dev-ada/aws-2016
deleted file mode 100644
index e63728291833..000000000000
--- a/metadata/md5-cache/dev-ada/aws-2016
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-DESCRIPTION=A complete Web development framework
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> aws-gpl-2016-src.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=32dd0d26ce05805874f2b3f57f2e224e
diff --git a/metadata/md5-cache/dev-ada/aws-2017 b/metadata/md5-cache/dev-ada/aws-2017
index 6788b197ae94..7b66ba6c7c9d 100644
--- a/metadata/md5-cache/dev-ada/aws-2017
+++ b/metadata/md5-cache/dev-ada/aws-2017
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 -> aws-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=f5ca6c499055d6c20f50768cea76ad4f
+_md5_=a36288c305f0cf6925e69f8741f10816
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2016 b/metadata/md5-cache/dev-ada/gnat_util-2016
index 6a6c67a9901c..7fdea6b3282f 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2016
+++ b/metadata/md5-cache/dev-ada/gnat_util-2016
@@ -3,7 +3,7 @@ DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=+gnat_2016 gnat_2017 +shared static static-pic
+IUSE=+gnat_2016 gnat_2017 +shared static-libs static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 -> gnat_util-gpl-2016-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b6776503854bee01653e0ccbe03767e5
+_md5_=ba187e4dad692de6a09485fb92eeef81
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017 b/metadata/md5-cache/dev-ada/gnat_util-2017
index 85114d46278d..1fe4b9abf463 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2017
+++ b/metadata/md5-cache/dev-ada/gnat_util-2017
@@ -3,7 +3,7 @@ DEPEND=dev-lang/gnat-gpl:6.3.0 dev-ada/gprbuild[gnat_2017]
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 +gnat_2017 +shared static static-pic
+IUSE=gnat_2016 +gnat_2017 +shared static-libs static-pic
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=dev-lang/gnat-gpl:6.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=!gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d9191b3f7c57cd00019c45983091ffe
+_md5_=1682b374a69dd020cd2e35992a94d03b
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-2016 b/metadata/md5-cache/dev-ada/gnatcoll-2016
index f297aae3f8e7..a46fcbf83296 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-2016
+++ b/metadata/md5-cache/dev-ada/gnatcoll-2016
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] static? ( dev-ada/libgpr[static-libs] ) ) dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=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
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=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=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static syslog tools python_targets_python2_7
+IUSE=gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] static? ( dev-ada/libgpr[static-libs] ) )
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] )
 REQUIRED_USE=python_targets_python2_7 pygobject? ( gtk ) ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 -> gnatcoll-gpl-2016-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2daf8948e58290555365180de29bf377
+_md5_=db76d66296d9dd961c628638a38fdb69
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-2017 b/metadata/md5-cache/dev-ada/gnatcoll-2017
index 7a9191a7f261..9d8a93ba097f 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-2017
+++ b/metadata/md5-cache/dev-ada/gnatcoll-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-lang/gnat-gpl:6.3.0 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?] static? ( dev-ada/libgpr[static-libs] ) ) dev-ada/gprbuild[gnat_2017] >=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
+DEPEND=dev-lang/gnat-gpl:6.3.0 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] ) dev-ada/gprbuild[gnat_2017] >=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=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static syslog tools python_targets_python2_7
+IUSE=gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=dev-lang/gnat-gpl:6.3.0 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?] static? ( dev-ada/libgpr[static-libs] ) )
+RDEPEND=dev-lang/gnat-gpl:6.3.0 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(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[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(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] )
 REQUIRED_USE=python_targets_python2_7 pygobject? ( gtk ) !gnat_2016 gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016 -> gnatcoll-gpl-2017-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fd7b1ab346ad03ab3d15669dd393cab1
+_md5_=4692b2af838ded7142e27dfa2d9d045f
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2016 b/metadata/md5-cache/dev-ada/gnatmem-2016
deleted file mode 100644
index 5aa6b60f5844..000000000000
--- a/metadata/md5-cache/dev-ada/gnatmem-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=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=Monitors dynamic allocation and deallocation activity in a program
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=+gnat_2016 gnat_2017
-KEYWORDS=~amd64
-LICENSE=GPL-3
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> gnatmem-gpl-2016-src.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=63af5f595f53500ef9e28ef3615003a9
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2017 b/metadata/md5-cache/dev-ada/gnatmem-2017
index 4e523cb9556a..913c16491fe1 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2017
+++ b/metadata/md5-cache/dev-ada/gnatmem-2017
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> gnatmem-gpl-2017-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b94e0206fd0b316a0ee3183f22cf1e75
+_md5_=01ef283c3cf2c1ef7dad4bed72da062e
diff --git a/metadata/md5-cache/dev-ada/gtkada-2016 b/metadata/md5-cache/dev-ada/gtkada-2016
deleted file mode 100644
index dd3fe8143643..000000000000
--- a/metadata/md5-cache/dev-ada/gtkada-2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=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=A complete Ada graphical toolkit
-EAPI=6
-HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=gnat_2016 gnat_2017 +shared static
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae -> gtkada-gpl-2016-src.tgz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0c39d734fd328bf602629ec832ac0d9b
diff --git a/metadata/md5-cache/dev-ada/gtkada-2017 b/metadata/md5-cache/dev-ada/gtkada-2017
index a0604c6637ba..4296501071a9 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2017
+++ b/metadata/md5-cache/dev-ada/gtkada-2017
@@ -3,11 +3,12 @@ DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=6
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=gnat_2016 gnat_2017 +shared static
+IUSE=gnat_2016 +gnat_2017 +shared static-libs
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9 -> gtkada-gpl-2017-src.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a2cc396e47394aa317f6aaca78dafa08
+_md5_=c297c69f54ceb40c5ef3ce9c8aa79bbe
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 675c7296425e..ad42738ebb08 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/gtest-1.8.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
index a8baea30bea0..55c5c5300d68 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=6
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	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	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdd91160277973a53bc22f302124fb45
+_md5_=88b4b0455c807e5960680d7d05c27d29
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index e1609dd19853..4f07475d1fff 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/dbmodel-0.3 b/metadata/md5-cache/dev-db/dbmodel-0.3
deleted file mode 100644
index 4a31fee426de..000000000000
--- a/metadata/md5-cache/dev-db/dbmodel-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4
-DESCRIPTION=Qt4 tool for drawing entity-relational diagrams
-EAPI=2
-HOMEPAGE=http://oxygene.sk/lukas/dbmodel/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtsvg:4
-SLOT=0
-SRC_URI=https://launchpad.net/dbmodel/trunk/0.3/+download/dbmodel-0.3.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3ffecd8ced3fa45e24be3717fe3736c6
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.1 b/metadata/md5-cache/dev-db/etcd-3.3.1
new file mode 100644
index 000000000000..9d298c83b8aa
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.1.tar.gz -> etcd-3.3.1.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d564c7474cf801f7e4c044519d0f1197
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.10 b/metadata/md5-cache/dev-db/mongodb-3.4.10
index 0de797dc2fe5..60a3a1ea922f 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.4.10
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.10
@@ -11,4 +11,4 @@ RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.10.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	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	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0ac0d094d3a325b9abb0107b259d585e
+_md5_=22a06b7ab80265d981020d4007964bec
diff --git a/metadata/md5-cache/dev-db/mongodb-3.4.13 b/metadata/md5-cache/dev-db/mongodb-3.4.13
new file mode 100644
index 000000000000..ea47142e9d4a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.4.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) 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-util/scons-3 sys-libs/ncurses sys-libs/readline debug? ( dev-util/valgrind ) kerberos? ( dev-libs/cyrus-sasl[kerberos] ) test? ( dev-python/pymongo[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/pyyaml[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-util/scons-2.3.0 virtual/pkgconfig
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=6
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=AGPL-3 Apache-2.0
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.4.13 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.4.13.tar.gz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	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-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=86110a70daadf078c2773bfc57b63f82
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.2 b/metadata/md5-cache/dev-db/mongodb-3.6.2
index 0f10f9054eac..ae950aefb72b 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.2
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2
@@ -11,4 +11,4 @@ RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	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-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=20155e5e91c8d161e2b5d37faa5696b5
+_md5_=55e5412a6d10705dfdf5b7c671b1b9f1
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.58 b/metadata/md5-cache/dev-db/mysql-5.5.58
deleted file mode 100644
index 830e28ae15c7..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.5.58
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/make >=dev-util/cmake-3.7.2 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=5
-HOMEPAGE=http://www.mysql.com/
-IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
-REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/18
-SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.58.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.58.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.58.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b730bdda4fece6f00410e0825ef5fbf
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.59 b/metadata/md5-cache/dev-db/mysql-5.5.59
index f54d831034f1..709bcf8a2bc3 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.59
+++ b/metadata/md5-cache/dev-db/mysql-5.5.59
@@ -11,6 +11,6 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
 RESTRICT=!bindist? ( bindist )
 SLOT=0/18
-SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.59.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.59.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.59.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2
+SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.59.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.59.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.59.tar.gz mirror://gentoo/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180214-0024Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-cmake	84b8e014a55adc91fb42dabaa0d7159e	mysql-v2	c498244d7e52726f86bb9c0a02e0f14b	mysql_fx	fd803e05287868299aac78823b68920e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fda36dc2f38bb76fa7a8a315d4c2edb0
+_md5_=07cbb0e0242e923123546310c177ca0f
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.39 b/metadata/md5-cache/dev-db/mysql-5.6.39
index 6e11eca23f12..5899814134ec 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.39
+++ b/metadata/md5-cache/dev-db/mysql-5.6.39
@@ -4,13 +4,13 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
 IUSE=numa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
 RDEPEND=numa? ( sys-process/numactl:= ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
 REQUIRED_USE=^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
-SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.39.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.39.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
+SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.39.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.39.tar.gz mirror://gentoo/mysql-extras-20180214-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180214-0024Z.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	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	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=436dd07f4bf39bd2e03c36851ce42ab6
+_md5_=02ec413e6c2d9fc8c788067b591db6b6
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2 b/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2
deleted file mode 100644
index 4b745ec9ca34..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.6.37.82.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-perl/JSON ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
-EAPI=6
-HOMEPAGE=http://www.percona.com/software/percona-server
-IUSE=numa pam tokudb tokudb-backup-plugin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
-RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.37-82.2/source/tarball/percona-server-5.6.37-82.2.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=146be181c5d63e377079035221b9bb36
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0 b/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0
deleted file mode 100644
index 9151befddf1d..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.6.38.83.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-perl/JSON ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
-DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
-EAPI=6
-HOMEPAGE=https://www.percona.com/software/percona-server
-IUSE=numa pam tokudb tokudb-backup-plugin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
-RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
-REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
-RESTRICT=libressl? ( test )
-SLOT=0/18
-SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.38-83.0/source/tarball/percona-server-5.6.38-83.0.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=79c52cf93b0d1ea94be800fec7565f47
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.39.83.1 b/metadata/md5-cache/dev-db/percona-server-5.6.39.83.1
new file mode 100644
index 000000000000..c538466a7b17
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.39.83.1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-perl/JSON ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL from the Percona team
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/percona-server
+IUSE=numa pam tokudb tokudb-backup-plugin abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
+RDEPEND=numa? ( sys-process/numactl:= ) server? ( pam? ( virtual/pam:0= ) ) tokudb? ( app-arch/snappy ) tokudb-backup-plugin? ( dev-util/valgrind ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.39-83.1/source/tarball/percona-server-5.6.39-83.1.tar.gz mirror://gentoo/mysql-extras-20171121-1518Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171121-1518Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171121-1518Z.tar.bz2
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	mysql-multilib-r1	5ea096b61538a07452de185eea4d1ad9	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79c52cf93b0d1ea94be800fec7565f47
diff --git a/metadata/md5-cache/dev-db/postgresql-10.2 b/metadata/md5-cache/dev-db/postgresql-10.2
index 2b6734428fbc..2933b3236aaf 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.2
+++ b/metadata/md5-cache/dev-db/postgresql-10.2
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.2/postgresql-10.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=687cf47f09e901100a6336efa76fb122
+_md5_=fe8d41d5ca3a72924cc73c1fa97c78b2
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.21 b/metadata/md5-cache/dev-db/postgresql-9.3.21
index 68bc675746e6..6dbebb160391 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.21
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.21
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.21/postgresql-9.3.21.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a4d018e9ad44a8a315a13c970a9116ae
+_md5_=6296952d1904086be9d58dde82c49fb4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.16 b/metadata/md5-cache/dev-db/postgresql-9.4.16
index daafb2f2d784..a9a0ad2b4f02 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.16
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.16
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.16/postgresql-9.4.16.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b0f4e9040eefad58e401c8b974b80d24
+_md5_=c1fa765a2b70ec44a16206678f3b4abc
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.11 b/metadata/md5-cache/dev-db/postgresql-9.5.11
index de2694a01fde..0f94b7f1f453 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.11
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.11
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.11/postgresql-9.5.11.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f514610e9418fe50b6ca6b4118607b5d
+_md5_=8afa3cbee09fdab224b93935c4fd89da
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.7 b/metadata/md5-cache/dev-db/postgresql-9.6.7
index 5ac1765e89c0..ba40055ebd40 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.7
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.7/postgresql-9.6.7.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ec15587ac0be7f42f3fe99d8b364dd35
+_md5_=803bf89fc20d6f45ac62f73ae614838e
diff --git a/metadata/md5-cache/dev-db/psqlodbc-10.01.0000 b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
index 009223b93a2b..f342fe82e5a6 100644
--- a/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
@@ -4,9 +4,9 @@ DESCRIPTION=Official ODBC driver for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc iodbc ssl threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
 SLOT=0
 SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.01.0000.tar.gz
-_md5_=2ed6b192584961914bedc43b81e90a70
+_md5_=db7b8d6ac36c76e7eff8ff7f25dce2ac
diff --git a/metadata/md5-cache/dev-db/qt5-sqlcipher-0.1.1_pre20171202 b/metadata/md5-cache/dev-db/qt5-sqlcipher-0.1.1_pre20171202
index 5e0f4dbaa144..9c0afd932945 100644
--- a/metadata/md5-cache/dev-db/qt5-sqlcipher-0.1.1_pre20171202
+++ b/metadata/md5-cache/dev-db/qt5-sqlcipher-0.1.1_pre20171202
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlcipher-3.4.1 >=dev-qt/qtcore-5.7.1:5= >=dev-qt/qtsql-5.7.1:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qt5-sqlcipher-0.1.1_pre20171202.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_=0d085ff6367b67f133205a4bc3a9b457
+_md5_=12ed9be2597d489c6e724cacde4a8164
diff --git a/metadata/md5-cache/dev-db/sqlite-3.21.0 b/metadata/md5-cache/dev-db/sqlite-3.21.0
index 28a6fcc49f95..460da5067b74 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.21.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.21.0
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu: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(-)?] ) readline? ( sys-libs/readline: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(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3210000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz ) ) )
 _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	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=65dc4230325d2c21afbe52eb01ba68e8
+_md5_=83d653d98ac2155f17eaf59c67640ae4
diff --git a/metadata/md5-cache/dev-db/sqlite-3.22.0 b/metadata/md5-cache/dev-db/sqlite-3.22.0
new file mode 100644
index 000000000000..c94fba430111
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlite-3.22.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib: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(-)?] icu? ( dev-libs/icu: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(-)?] ) readline? ( sys-libs/readline: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(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl: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(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl: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(-)?] ) tools? ( app-arch/unzip ) >=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=A SQL Database Engine in a C Library
+EAPI=6
+HOMEPAGE=https://sqlite.org/
+IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=sys-libs/zlib: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(-)?] icu? ( dev-libs/icu: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(-)?] ) readline? ( sys-libs/readline: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(-)?] ) tcl? ( dev-lang/tcl: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(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=3
+SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3220000.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) test? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz ) ) )
+_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	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=74501766097896039abca1cb95d83ea8
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 335d6577f603..8ec1c7d613a1 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/ant-antlr-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
index 982b38d80fe3..7f55b683931d 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=772840decfa67039e5fa7733dd0326d9
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
index 1cc5658a7341..7b50ed7dfc76 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=5e5e4de27e43d77a69d1a8952f0d128d
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
index 92d55fd0faa5..e21bf09e340f 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=20f3379021b410e4b55ba3edb8e0880b
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
index 7b3b22fa97c1..81c825181f3a 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=fa84590b04a16645844fce3695d63a24
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
index da3e5510142e..7365280bd386 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=d36b8acd72294695993afa1162670270
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
index ac5d83982c4d..d21232d64ce4 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=899786ac47ee607f6e11fff554870c9c
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
index 59eae275a159..98d1a85ab637 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=3cc1a9c6593a14efe6f2e1ef78cd6cef
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
index 5c103fc362f7..803049b37ba2 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=815f245d2a82da02300f1199fb1078f8
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
index 0288d30a5cf7..6888d6efae6f 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=d8763585ee3df0451112e6d93b2eea89
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
index 53e89b4619c8..0d794c92a8f2 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=aff675ffd55b6631947669a73f3feec4
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index 1dc047b752bf..15ea955559d4 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
 _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	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=31ebd33e388df9d19f0c8b3da8233910
+_md5_=1bf2bf7283dc465a57124194cf59275f
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.2 b/metadata/md5-cache/dev-java/ant-jai-1.9.2
index f888f7a1933b..8226443ffd15 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=db0150081d3ff862b5e68c0b7e1ff211
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
index 533c9da945be..cd1028ec9026 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=a466debf2bb5db1ef17e42db4f103774
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
index 1df97c5299a5..8539c5f020ad 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=2d33433c76f3b3b8b1222cf9e6a1a870
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.2 b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
index 62c64f9851c6..f9ac2cfd43d8 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=8f510965370ec7970384d2cdfd3cdaba
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.2 b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
index 2b3bffaf3698..26fea10a6b26 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=8496d8d85a5bf4e103d203a5ad64c6fa
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index 0abdd5da0900..ca1d50509115 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=fc5db791fd2dd740136104927d8040ba
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.2 b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
index 7d84615fc6db..24abcafd84a0 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=8fe33a9340a91a67ad5e37a0df4e8797
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index 22cb6fdcc0b7..11c2ecd1bbdb 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=15071f14bea1e7f6044878355b436f23
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.2 b/metadata/md5-cache/dev-java/ant-swing-1.9.2
index 78c47f44ba86..be068d2aaa7b 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=31c9c8fabdf2114246a1c487cf596138
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.2 b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
index f6d074d7e1c5..8c151d7f1155 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=027f93bdce483c1a051ae455c9adc99b
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index 42bf2d89cae8..5df62cbc1539 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-java/java-config-2.2.0-r3 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	2fb8fafa83d223f2b62c5716c2d12555	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
+SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
+_eclasses_=ant-tasks	2963378d098344fe05672f1145af1283	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_=1233f6c81bf08b9ffd4a957061c59f2e
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1 b/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
index 0f26a46eb85e..7de67c3fd443 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/15
 SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8ac793c13d68d12cdcc92cddf125df0d
+_md5_=2948be77cf8935494826827c95500107
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index 342ec03ba445..3c5390c1c327 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
 EAPI=0
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-osgi	c90eda970384b702459d01fc288d647d	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4978578701f0ed16cc4b29713f3bc1cd
+_md5_=41930aa430842f8a0a39fa811ac38e81
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
index 80023561d1f6..c32431dbece4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
 EAPI=5
 HOMEPAGE=http://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~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=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.53/src/apache-tomcat-6.0.53-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_=4ff03783b673a6cee16a664b0ca19714
+_md5_=71eef836c28f2b1067c2a9441c3c575a
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47
deleted file mode 100644
index ec05d071ad4f..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47
+++ /dev/null
@@ -1,13 +0,0 @@
-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.47/src/apache-tomcat-8.0.47-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_=f0194f60f306a251c3c109de69bbcefa
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
index 1e1cf6a0fda1..88a34d80bdf8 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.48
@@ -4,10 +4,10 @@ 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
+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.48/src/apache-tomcat-8.0.48-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_=51bb4d8efc5d28f8596a04d3e562eca6
+_md5_=c723f61f44d1b2061694794618ee249f
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
index cfcc6fe1f084..02f6192baae4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
@@ -4,10 +4,10 @@ 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
+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.24/src/apache-tomcat-8.5.24-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_=10be5b9b53560f29825aff61e435aec2
+_md5_=4cfda164f0b164c0f139e060345d003b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
new file mode 100644
index 000000000000..e696f676c38e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
@@ -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.28/src/apache-tomcat-8.5.28-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-java/tomcat-servlet-api-9.0.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
new file mode 100644
index 000000000000..78b367b4e769
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=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 4.0/JSP API 2.4?/EL API 3.1? implementation
+EAPI=6
+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.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-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_=f0c82578764bdd338c9b64240bde8b20
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 0ec97893871c..138fb0de277c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/erlang-19.3 b/metadata/md5-cache/dev-lang/erlang-19.3
index c314dd6e388c..c3c6a95cbeea 100644
--- a/metadata/md5-cache/dev-lang/erlang-19.3
+++ b/metadata/md5-cache/dev-lang/erlang-19.3
@@ -4,11 +4,11 @@ DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
 EAPI=5
 HOMEPAGE=http://www.erlang.org/
 IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dirty-schedulers? ( smp )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_19.3.tar.gz http://erlang.org/download/otp_doc_man_19.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.3.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=3a4c8deb45a04450d86cd9c89334dba6
+_md5_=42c651f29d39a7e2a620c045c06f6f4b
diff --git a/metadata/md5-cache/dev-lang/go-1.9.4 b/metadata/md5-cache/dev-lang/go-1.9.4
new file mode 100644
index 000000000000..00bf17d3e0de
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install pretend test unpack
+DEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=6
+HOMEPAGE=https://golang.org
+IUSE=gccgo
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.9.4
+SRC_URI=https://storage.googleapis.com/golang/go1.9.4.src.tar.gz !gccgo? ( amd64? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz ) arm? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz ) arm64? ( https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz ) ppc64? ( https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz ) s390? ( https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz ) x86? ( https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz ) amd64-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz ) x86-fbsd? ( https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz ) x64-macos? ( https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz ) x64-solaris? ( https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b0bb1d4c22b38ee9ad5d695e59d2ba4b
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.01 b/metadata/md5-cache/dev-lang/moarvm-2018.01
new file mode 100644
index 000000000000..fdad2651e2fb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:0[deprecated] dev-lua/LuaBitOp virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=6
+HOMEPAGE=http://moarvm.org
+IUSE=asan clang debug doc +jit static-libs optimize ubsan
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:0[deprecated] dev-lua/LuaBitOp virtual/libffi
+RESTRICT=test
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2018.01.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_=fad9e8a58d3d7a29021014b6e73ae10c
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.01 b/metadata/md5-cache/dev-lang/nqp-2018.01
new file mode 100644
index 000000000000..1a23cc307d0b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2018.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.01[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=5
+HOMEPAGE=http://rakudo.org/
+IUSE=doc clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.01[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2018.01 -> nqp-2018.01.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c9ccc5809054be3cde5f686e81b9ab9e
diff --git a/metadata/md5-cache/dev-lang/rakudo-2018.01 b/metadata/md5-cache/dev-lang/rakudo-2018.01
new file mode 100644
index 000000000000..43a22004cd2c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2018.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=~dev-lang/nqp-2018.01:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=5
+HOMEPAGE=http://rakudo.org
+IUSE=clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=~dev-lang/nqp-2018.01:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.01.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=75d1d3c0e7efb9a79e4f0b1b9bbabac6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b16d3cd47f8b..fa9e681dbd34 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.62.0-r1 b/metadata/md5-cache/dev-libs/boost-1.62.0-r1
deleted file mode 100644
index bd5b86da92df..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.62.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=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 ) >=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(-)] ) 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 =dev-util/boost-build-1.62*
-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 abi_x86_32 abi_x86_64 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=hppa
-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 ) >=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(-)] ) 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 ) )
-RESTRICT=test
-SLOT=0/1.62.0
-SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_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_=f48b33a3b6e917129336c9bc18e148b8
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.110 b/metadata/md5-cache/dev-libs/dbus-glib-0.110
new file mode 100644
index 000000000000..d963a0cb659e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.110
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig
+DESCRIPTION=D-Bus bindings for glib
+EAPI=6
+HOMEPAGE=https://dbus.freedesktop.org/
+IUSE=debug static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 AFL-2.1 )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<app-emulation/emul-linux-x86-baselibs-20131008-r8 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=603bca6179a6e2e2cf05d98cf2293622
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.4.0 b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
index f8ab2b86ad00..d3486afd180e 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.4.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422
 DESCRIPTION=Library set needed for build sssd
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/sssd
+HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.4.0.tar.gz
+SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.4.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=947d63f402af209b636e9bdb5b2f8aec
+_md5_=e10ad19212ec18d0361263a972096f81
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.5.0 b/metadata/md5-cache/dev-libs/ding-libs-0.5.0
index d2ef9dd80d97..d9fff59d7a9a 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.5.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.5.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170422
 DESCRIPTION=set of utility libraries (mostly used by sssd)
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/sssd
+HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.5.0.tar.gz
+SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.5.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4ed14b8a33481298533b16ad016953b2
+_md5_=3f433abe8c9af6a9274dbb88e8b895dd
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.0 b/metadata/md5-cache/dev-libs/ding-libs-0.6.0
index 0783406ac0a8..3d0183e28feb 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install test
 DEPEND=virtual/pkgconfig test? ( dev-libs/check )
 DESCRIPTION=set of utility libraries (mostly used by sssd)
 EAPI=6
-HOMEPAGE=https://fedorahosted.org/sssd
+HOMEPAGE=https://pagure.io/SSSD/ding-libs
 IUSE=test 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 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.6.0.tar.gz
+SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.0.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=91c2cd95a8a7c4f53cb47c0032ac84d5
+_md5_=f9b5f6bd9a1d30c1d2279ff7be2292a9
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.6.1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
new file mode 100644
index 000000000000..275e93ddf79e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=virtual/pkgconfig test? ( dev-libs/check )
+DESCRIPTION=set of utility libraries (mostly used by sssd)
+EAPI=6
+HOMEPAGE=https://pagure.io/SSSD/ding-libs
+IUSE=test 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=LGPL-3 GPL-3
+SLOT=0
+SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=17f46872e449d6568218682e7bd04ea8
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.1-r201 b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r201
new file mode 100644
index 000000000000..c1238f9474f3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r201
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection ) lua? ( >=dev-lang/lua-5.1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/pygobject-2.15.3: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.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig
+DESCRIPTION=A library for registering global keyboard shortcuts
+EAPI=6
+HOMEPAGE=https://github.com/engla/keybinder
+IUSE=+introspection lua python python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection ) lua? ( >=dev-lang/lua-5.1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/pygobject-2.15.3: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.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/engla/keybinder/releases/download/v0.3.1/keybinder-0.3.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f64d2323d087313d5968a24cc44d6c91
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300 b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
new file mode 100644
index 000000000000..a81bc539fa54
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.2-r300
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DEPEND=x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection ) virtual/pkgconfig
+DESCRIPTION=A library for registering global keyboard shortcuts
+EAPI=6
+HOMEPAGE=https://github.com/engla/keybinder
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection )
+SLOT=3
+SRC_URI=https://github.com/engla/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
+_md5_=2edd62d467c41dda69890fc20c9658ea
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.2.2 b/metadata/md5-cache/dev-libs/leatherman-1.2.2
deleted file mode 100644
index ffc3b20b8274..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.54[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A C++ toolkit
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.2.2.tar.gz -> leatherman-1.2.2.tar.gz
-_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_=643c4b82e075349bdc427a65dc585919
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1 b/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1
deleted file mode 100644
index 5b266f6715aa..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.54[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A C++ toolkit
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.3.0.tar.gz
-_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_=62d2febfab34fbc5074b25c4c2c4d37a
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.0 b/metadata/md5-cache/dev-libs/leatherman-1.4.0
new file mode 100644
index 000000000000..50745ce840d5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/leatherman-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.54[nls] net-misc/curl >=sys-devel/gcc-4.8:* sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A C++ toolkit
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/leatherman
+IUSE=debug static-libs test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=net-misc/curl
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.0.tar.gz -> leatherman-1.4.0.tar.gz
+_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_=62d2febfab34fbc5074b25c4c2c4d37a
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.8-r1 b/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
deleted file mode 100644
index 6b32210ba2e0..000000000000
--- a/metadata/md5-cache/dev-libs/libburn-1.4.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Open-source library for reading, mastering and writing optical discs
-EAPI=6
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
-IUSE=debug static-libs track-src-odirect
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
-_md5_=242d292b5d8b57d11ef26189f96ce744
diff --git a/metadata/md5-cache/dev-libs/libburn-1.4.8-r2 b/metadata/md5-cache/dev-libs/libburn-1.4.8-r2
new file mode 100644
index 000000000000..7b0e24e917c1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libburn-1.4.8-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Open-source library for reading, mastering and writing optical discs
+EAPI=6
+HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
+IUSE=debug static-libs
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
+_md5_=1da4c59f2589dc2ec6c539e66a1d62e1
diff --git a/metadata/md5-cache/dev-libs/libical-1.0.1 b/metadata/md5-cache/dev-libs/libical-1.0.1
deleted file mode 100644
index cbf88718b966..000000000000
--- a/metadata/md5-cache/dev-libs/libical-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=introspection? ( dev-libs/gobject-introspection ) dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=An implementation of basic iCAL protocols
-EAPI=5
-HOMEPAGE=https://github.com/libical/libical
-IUSE=doc examples introspection static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( MPL-1.0 LGPL-2.1 )
-RDEPEND=introspection? ( dev-libs/gobject-introspection )
-SLOT=0/1
-SRC_URI=https://github.com/libical/libical/archive/v1.0.1.tar.gz -> libical-1.0.1.tar.gz
-_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_=0964f132bdad6fff5d573ec24e82217b
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.0 b/metadata/md5-cache/dev-libs/libinput-1.10.0
new file mode 100644
index 000000000000..48052b3252d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.0.tar.xz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
+_md5_=484d2f0cbb20d0933c658186d540892f
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.14 b/metadata/md5-cache/dev-libs/libmemcached-1.0.14
deleted file mode 100644
index 94c1df9e013e..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-misc/memcached dev-libs/cyrus-sasl libevent? ( dev-libs/libevent )
-DESCRIPTION=a C client library to the memcached server
-EAPI=4
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached dev-libs/cyrus-sasl libevent? ( dev-libs/libevent )
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.14/+download/libmemcached-1.0.14.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f6a4cec29770404302e0f9eb8727e648
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18
deleted file mode 100644
index a50ae55472b5..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=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=a C client library to the memcached server
-EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.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_=5cb3f9b0369ff435742a4758f02bc2b7
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1
deleted file mode 100644
index 0ae73833fc1c..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=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=a C client library to the memcached server
-EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.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_=e9961a67fa71b0924c39eda6653d40d4
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2
deleted file mode 100644
index 3085a5158bdd..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a C client library to the memcached server
-EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.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_=083dc1d0502afde078035f72d5d06974
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.22 b/metadata/md5-cache/dev-libs/libpcre2-10.22
deleted file mode 100644
index 2a2b6b7a5718..000000000000
--- a/metadata/md5-cache/dev-libs/libpcre2-10.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Perl-compatible regular expression library
-EAPI=6
-HOMEPAGE=http://www.pcre.org/
-IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
-REQUIRED_USE=?? ( libedit readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/pcre/pcre2-10.22.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.22.tar.bz2
-_eclasses_=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_=80d729e8bbbca9ddfbb1eccc33430931
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.23 b/metadata/md5-cache/dev-libs/libpcre2-10.23
deleted file mode 100644
index 8f6e975c02c5..000000000000
--- a/metadata/md5-cache/dev-libs/libpcre2-10.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Perl-compatible regular expression library
-EAPI=6
-HOMEPAGE=http://www.pcre.org/
-IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
-REQUIRED_USE=?? ( libedit readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/pcre/pcre2-10.23.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.23.tar.bz2
-_eclasses_=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_=294453764367af58b9a629b82f071a24
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.31 b/metadata/md5-cache/dev-libs/libpcre2-10.31
new file mode 100644
index 000000000000..0ec0f0216ee0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=6
+HOMEPAGE=http://www.pcre.org/
+IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
+REQUIRED_USE=?? ( libedit readline )
+SLOT=0
+SRC_URI=mirror://sourceforge/pcre/pcre2-10.31.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.31.tar.bz2
+_eclasses_=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_=a7b859828cbc4112aae88b14e4217893
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.15 b/metadata/md5-cache/dev-libs/newt-0.52.15
index fec82571c89f..9cfef2de6ff9 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.15
+++ b/metadata/md5-cache/dev-libs/newt-0.52.15
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5: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
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/newt/
+HOMEPAGE=https://pagure.io/newt
 IUSE=gpm tcl nls python_targets_python2_7
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.15.tar.gz
+SRC_URI=https://releases.pagure.org/newt/newt-0.52.15.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f03887f5ff80fbc74943d4bfcd2bf1d4
+_md5_=3a4091b0c74eb51f93c88f3dc3ff9f09
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.18 b/metadata/md5-cache/dev-libs/newt-0.52.18
index 9f000f3c6f56..caffed16b309 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.18
+++ b/metadata/md5-cache/dev-libs/newt-0.52.18
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5: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
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=5
-HOMEPAGE=https://fedorahosted.org/newt/
+HOMEPAGE=https://pagure.io/newt
 IUSE=gpm tcl nls python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.18.tar.gz
+SRC_URI=https://releases.pagure.org/newt/newt-0.52.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4db88009a1481bcc78b8237b9133c67a
+_md5_=5b282814855dce9567bfb967493b720c
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.20 b/metadata/md5-cache/dev-libs/newt-0.52.20
index e9055b30514e..03ab89659a29 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.20
+++ b/metadata/md5-cache/dev-libs/newt-0.52.20
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install 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/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5: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
 DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=6
-HOMEPAGE=https://fedorahosted.org/newt/
+HOMEPAGE=https://pagure.io/newt
 IUSE=gpm nls tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-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/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses:0= ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5:0 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.20.tar.gz
+SRC_URI=https://releases.pagure.org/newt/newt-0.52.20.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d84f4c58e0c5c392f31b0320a312aecb
+_md5_=07e20a0f77d90c81db84aeaf1bd9c155
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
index 119850741be2..0d423568e175 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8
@@ -11,4 +11,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
 _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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bc873a44180f79a09393bb1a74d0f7fd
+_md5_=533831cdf272b4602cc088301ac3dcdc
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
index a3fab182f83c..eda0643c180c 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zh.tar.gz
 _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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f018874e3b10bb7bff9bb78280e2e4af
+_md5_=64f0549839cccf08a533ddfaa54cd410
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2n b/metadata/md5-cache/dev-libs/openssl-1.0.2n
index 87e6e170b057..902c5bc86a32 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2n
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2n
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2n.tar.gz mirror://gentoo/openssl-1.0.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.0.tar.xz
 _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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9279df49b4c9c762c97def521b82ec41
+_md5_=39c7c75b446affcd60a6295163787653
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2 b/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
index 0bd0abfc4338..e72cc6c27474 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0g-r2
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.0g.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f27 -> openssl-1.1.0g_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f27 -> openssl-1.1.0g_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f27 -> openssl-1.1.0g_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f27 -> openssl-1.1.0-build.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f27 -> openssl-1.1.0-ec-curves.patch )
 _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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de1cc1ccbdbe4e3426c0f2e290059038
+_md5_=53bc67874b6d65e7a77871a7b6f38d67
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1 b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
index 7f5819a187e8..7bc635297160 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
 SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	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_=674f9678e326dbe62691ba6f6beb1a9a
+_md5_=b50d946716bc545ecd2e63705f81951e
diff --git a/metadata/md5-cache/dev-libs/univalue-1.0.3 b/metadata/md5-cache/dev-libs/univalue-1.0.3
new file mode 100644
index 000000000000..a540d69045a7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/univalue-1.0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=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=C++ universal value object and JSON library
+EAPI=6
+HOMEPAGE=https://github.com/jgarzik/univalue
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+SLOT=0/0
+SRC_URI=https://codeload.github.com/jgarzik/univalue/tar.gz/v1.0.3 -> univalue-1.0.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4bb5678e7168447aa04c28c71f78d493
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
new file mode 100644
index 000000000000..9a3a10ed7ecc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.10.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure test
+DEPEND=test? ( sys-process/time )
+DESCRIPTION=userspace RCU (read-copy-update) library
+EAPI=6
+HOMEPAGE=http://lttng.org/urcu
+IUSE=static-libs regression-test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0/6
+SRC_URI=http://lttng.org/files/urcu/userspace-rcu-0.10.1.tar.bz2
+_md5_=cb5f172dfe28cc2ecb906ef386d0a278
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.12-r1 b/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
new file mode 100644
index 000000000000..e6f9615cea0a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.12-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library.
+EAPI=6
+HOMEPAGE=http://hardysimpson.github.io/zlog/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+SLOT=0
+SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz -> zlog-v1.2.12.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=12d15f9bc9c4b3ade5565328ef699788
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 43ab7d1952d2..25a120226592 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/clisp-2.49.90 b/metadata/md5-cache/dev-lisp/clisp-2.49.90
new file mode 100644
index 000000000000..a676a3606b03
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/clisp-2.49.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 ) X? ( x11-misc/imake x11-proto/xextproto )
+DESCRIPTION=A portable, bytecode-compiled implementation of Common Lisp
+EAPI=6
+HOMEPAGE=http://clisp.sourceforge.net/
+IUSE=hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lisp/asdf-2.33-r3 virtual/libiconv >=dev-libs/libsigsegv-2.10 >=dev-libs/ffcall-1.10 dbus? ( sys-apps/dbus ) fastcgi? ( dev-libs/fcgi ) gdbm? ( sys-libs/gdbm ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) pari? ( <sci-mathematics/pari-2.5.0 ) postgres? ( >=dev-db/postgresql-8.0:* ) readline? ( >=sys-libs/readline-7.0:0= ) pcre? ( dev-libs/libpcre:3 ) svm? ( sci-libs/libsvm ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXpm ) hyperspec? ( dev-lisp/hyperspec ) berkdb? ( sys-libs/db:4.8 )
+SLOT=2/8
+SRC_URI=https://haible.de/bruno/gnu/clisp-2.49.90.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
+_md5_=70d800806d1a565c31ec91e9d71246f4
diff --git a/metadata/md5-cache/dev-ml/ANSITerminal-0.7 b/metadata/md5-cache/dev-ml/ANSITerminal-0.7
index 88ab88fff673..2c1bf0ecd0b9 100644
--- a/metadata/md5-cache/dev-ml/ANSITerminal-0.7
+++ b/metadata/md5-cache/dev-ml/ANSITerminal-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Module which offers basic control of ANSI compliant terminals
 EAPI=5
 HOMEPAGE=https://github.com/Chris00/ANSITerminal
 IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.7
 SRC_URI=https://github.com/Chris00/ANSITerminal/archive/0.7.tar.gz -> ANSITerminal-0.7.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4cff3f41c76f47f0dfccbd87add22a65
+_md5_=8f35873f8817de25af38fab1b3f49e6b
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index b56f2f9fc6b9..8cd2e700c173 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/base-0.9.3 b/metadata/md5-cache/dev-ml/base-0.9.3
index 9b5bebab95e4..1b7742490c28 100644
--- a/metadata/md5-cache/dev-ml/base-0.9.3
+++ b/metadata/md5-cache/dev-ml/base-0.9.3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/
 DESCRIPTION=Standard library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
 SLOT=0/0.9.3
 SRC_URI=https://github.com/janestreet/base/archive/v0.9.3.tar.gz -> base-0.9.3.tar.gz
-_md5_=605fd23606e4d363de76675e4a8511bc
+_md5_=145714d16353d161bc07df1ca450d0d9
diff --git a/metadata/md5-cache/dev-ml/base-0.9.4 b/metadata/md5-cache/dev-ml/base-0.9.4
index 68ec129601a7..d08c427d96a2 100644
--- a/metadata/md5-cache/dev-ml/base-0.9.4
+++ b/metadata/md5-cache/dev-ml/base-0.9.4
@@ -3,9 +3,9 @@ DEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100 dev-ml/opam dev-ml/
 DESCRIPTION=Standard library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/base
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= <dev-ml/sexplib-100
 SLOT=0/0.9.4
 SRC_URI=https://github.com/janestreet/base/archive/v0.9.4.tar.gz -> base-0.9.4.tar.gz
-_md5_=605fd23606e4d363de76675e4a8511bc
+_md5_=145714d16353d161bc07df1ca450d0d9
diff --git a/metadata/md5-cache/dev-ml/batteries-2.7.0 b/metadata/md5-cache/dev-ml/batteries-2.7.0
index 1c00ce0a5bf3..5a101193c564 100644
--- a/metadata/md5-cache/dev-ml/batteries-2.7.0
+++ b/metadata/md5-cache/dev-ml/batteries-2.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=The community-maintained foundation library for your OCaml projects
 EAPI=5
 HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included/
 IUSE=test +ocamlopt debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.7.0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.7.0.tar.gz -> batteries-2.7.0.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=688741a21db085f47ee0d1aa3816b41c
+_md5_=3bb20054f840efe54ab07376895c7c5a
diff --git a/metadata/md5-cache/dev-ml/configurator-0.9.1 b/metadata/md5-cache/dev-ml/configurator-0.9.1
index 2a4a12171727..01d586cc23f9 100644
--- a/metadata/md5-cache/dev-ml/configurator-0.9.1
+++ b/metadata/md5-cache/dev-ml/configurator-0.9.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-
 DESCRIPTION=Helper library for gathering system configuration
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/configurator
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/configurator/archive/v0.9.1.tar.gz -> configurator-0.9.1.tar.gz
-_md5_=95d7041e00f643b9f61ad09723fbf255
+_md5_=fe39bc023608a20f675256fc67021e7e
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.5 b/metadata/md5-cache/dev-ml/iTeML-2.5
index 9a3b72f6c85f..c6e9fbba1b32 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.5
+++ b/metadata/md5-cache/dev-ml/iTeML-2.5
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/oc
 DESCRIPTION=Inline (Unit) Tests for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.5
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.5.tar.gz -> iTeML-2.5.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=64791a0334976198e619084ea8526f82
+_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.6 b/metadata/md5-cache/dev-ml/iTeML-2.6
index 04ad1b1f041e..fe9a6a1d14fd 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.6
+++ b/metadata/md5-cache/dev-ml/iTeML-2.6
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/oc
 DESCRIPTION=Inline (Unit) Tests for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.6
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.6.tar.gz -> iTeML-2.6.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=75e326b613628e3130de6dd6dc351b24
+_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.7 b/metadata/md5-cache/dev-ml/iTeML-2.7
index a81ed531be3d..46376fed3a93 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.7
+++ b/metadata/md5-cache/dev-ml/iTeML-2.7
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/oc
 DESCRIPTION=Inline (Unit) Tests for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.7
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.7.tar.gz -> iTeML-2.7.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=75e326b613628e3130de6dd6dc351b24
+_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/integers-0.2.2 b/metadata/md5-cache/dev-ml/integers-0.2.2
index 460ab872fce5..0e68b1c8abfd 100644
--- a/metadata/md5-cache/dev-ml/integers-0.2.2
+++ b/metadata/md5-cache/dev-ml/integers-0.2.2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/ocaml:= dev-ml/ocamlbuild dev-ml/opam dev-ml/topkg dev-ml/findli
 DESCRIPTION=Various signed and unsigned integer types for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/0.2.2
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz
-_md5_=c9f52e4d63e2dc33d610bb508d1fea34
+_md5_=248014a6fbf873cfe7f96fb16208c3c6
diff --git a/metadata/md5-cache/dev-ml/lwt-3.0.0 b/metadata/md5-cache/dev-ml/lwt-3.0.0
index 5116ca9f7265..9333a2837d42 100644
--- a/metadata/md5-cache/dev-ml/lwt-3.0.0
+++ b/metadata/md5-cache/dev-ml/lwt-3.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cooperative light-weight thread library for OCaml
 EAPI=5
 HOMEPAGE=http://ocsigen.org/lwt
 IUSE=+camlp4 +ppx +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-libs/libev >=dev-lang/ocaml-4.02:= dev-ml/result:= ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/3.0.0.tar.gz -> lwt-3.0.0.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=079ee373ea9256ee795074c1c89a2d21
+_md5_=b8a6a71729d9afb887a489da2be768ae
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.10 b/metadata/md5-cache/dev-ml/oasis-0.4.10
index d9f15535a9e3..e28262b393a8 100644
--- a/metadata/md5-cache/dev-ml/oasis-0.4.10
+++ b/metadata/md5-cache/dev-ml/oasis-0.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to integrate a configure, build and install system in OCaml pro
 EAPI=5
 HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
 IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.4.10
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=683dd30b4d7a738fef974207a78c8513
+_md5_=93b545ae74e64fbe378935d5af0319c9
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.8 b/metadata/md5-cache/dev-ml/oasis-0.4.8
index 7cb06d9e18a7..73125562c2b1 100644
--- a/metadata/md5-cache/dev-ml/oasis-0.4.8
+++ b/metadata/md5-cache/dev-ml/oasis-0.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to integrate a configure, build and install system in OCaml pro
 EAPI=5
 HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
 IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.4.8
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1669/oasis-0.4.8.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=597e282e18da29c628fd194709703c67
+_md5_=49a6d3aa7edd861745eccd659a6eb873
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
index 9fffcf2e2247..2b1c77689bb4 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.9.0.tar.gz -> ocaml-compiler-libs-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=71682a5e3a28fb0b2b096f94d678b639
+_md5_=85278258dffbf8bdfe72848d2ed4c816
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
index c3ae9875bd35..f2c48a124304 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
 SLOT=0/0.12.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.12.1.tar.gz -> ocaml-ctypes-0.12.1.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=c990252540e48e10c21d681a0a28f772
+_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
index c1f25a57c3a9..94d9869b1ce1 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
 SLOT=0/0.13.0
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.13.0.tar.gz -> ocaml-ctypes-0.13.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=c990252540e48e10c21d681a0a28f772
+_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
diff --git a/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1 b/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
index 1693f3bd7dbe..159a90d866f9 100644
--- a/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Use type-conv to dump OCaml data structure using OCaml data notation
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/odn
 IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-ml/type-conv-108.07.01:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.0.11
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=91fd039e77c8c087979aef74a3996773
+_md5_=005d13437cf9b8e2ce34595884e8d793
diff --git a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5 b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
index 849a736d2887..8e29f864347c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Ocaml implementation of expect to help building unitary testing
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-expect/
 IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.0.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1372/ocaml-expect-0.0.5.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f6a398572cb2fd5d42fe90adc4bb2ac0
+_md5_=9b484d41378ba0439ba4eaedc218a31b
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
index 0df0e8b79c3f..948c122cec3f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/con
 DESCRIPTION=A package for ocaml that provides access to SQLite databases
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.2.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.2.0/sqlite3-4.2.0.tbz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3151202785656ee90b34ed6925efbcdd
+_md5_=450d9c798a78265f250486f3434cfcd2
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
index c71c9313e302..8589ccbc9827 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/con
 DESCRIPTION=A package for ocaml that provides access to SQLite databases
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.3.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.3.0/sqlite3-4.3.0.tbz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=3151202785656ee90b34ed6925efbcdd
+_md5_=450d9c798a78265f250486f3434cfcd2
diff --git a/metadata/md5-cache/dev-ml/ocamlify-0.0.2 b/metadata/md5-cache/dev-ml/ocamlify-0.0.2
index 114ebcec7511..0337493e78a8 100644
--- a/metadata/md5-cache/dev-ml/ocamlify-0.0.2
+++ b/metadata/md5-cache/dev-ml/ocamlify-0.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=OCamlify creates OCaml code by including files into strings or strin
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlify
 IUSE=+ocamlopt debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c4437e1266d12736ac3a793699c95a16
+_md5_=1104e7686a98f98111717ffb264f98bc
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
index 6c64426bf322..eb0f9406f3c1 100644
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
+++ b/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Generate OCaml modules from source files
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
 IUSE=+ocamlopt debug
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.0.8
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c438360aa6f5035e0e9e9fc85f11d9ee
+_md5_=20706d559ae5cb0a85aacb0b824c9bc8
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
index 24a9ddcfa16a..0aaad2b2ce44 100644
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
+++ b/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=Generate OCaml modules from source files
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
 IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.0.9
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d5de55f3499e4ebbbbbc2ffdb8b6f8d8
+_md5_=1e615c70dc38b42b07a2670a01fadde5
diff --git a/metadata/md5-cache/dev-ml/octavius-1.1.0 b/metadata/md5-cache/dev-ml/octavius-1.1.0
index 50d41ab72ea3..f7efdf501bf8 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.1.0
+++ b/metadata/md5-cache/dev-ml/octavius-1.1.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/oc
 DESCRIPTION=ocamldoc comment syntax parser
 EAPI=6
 HOMEPAGE=https://github.com/ocaml-doc/octavius
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.1.0.tar.gz -> octavius-1.1.0.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=7e580a7f262ac28d1e85e67a5392040f
+_md5_=cbcb5b3732af72b5c28797739eaf0f15
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.6.1 b/metadata/md5-cache/dev-ml/ocurl-0.6.1
index d452f659f458..ad0126908062 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.6.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/
 IUSE=examples
-KEYWORDS=amd64 ppc
+KEYWORDS=amd64 ppc ~x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.6.1
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1374/ocurl-0.6.1.tgz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=cfb18eff7afab978b9598a2f8a9379dd
+_md5_=28592b96d0c635adbf2afa54351e7dd1
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.7.9 b/metadata/md5-cache/dev-ml/ocurl-0.7.9
index fcbb9b58687c..62339d219464 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.7.9
+++ b/metadata/md5-cache/dev-ml/ocurl-0.7.9
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~ppc
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.7.9
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.9.tar.gz -> ocurl-0.7.9.tar.gz
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=99e508fcffe2afb26e5d1006dac9ab49
+_md5_=cef4fc8d040f9de44dce8425e438effa
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
index f179e188535f..b99776518924 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.0
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.0/pcre-7.3.0.tbz -> pcre-ocaml-7.3.0.tbz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=8d340d10c285485541fa018abe0be3d7
+_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
index 2ff0869986d2..88d1825abc98 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.2
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.2/pcre-7.3.2.tbz -> pcre-ocaml-7.3.2.tbz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=8d340d10c285485541fa018abe0be3d7
+_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
index 41dee27df8bb..730fe59d2bc2 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
 IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.3
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.3/pcre-7.3.3.tbz -> pcre-ocaml-7.3.3.tbz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=8d340d10c285485541fa018abe0be3d7
+_md5_=cdd1c35b287d7ea819942b36346cf6d8
diff --git a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1 b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
index 508cd26dcde3..c3bebe5ce2b7 100644
--- a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbui
 DESCRIPTION=AST used in Jane Street ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_ast
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_ast/archive/v0.9.1.tar.gz -> ppx_ast-0.9.1.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e35f3188a2d7715800e03095fbec913b
+_md5_=2f8970af9000908999d6184d066c41bb
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.9.0 b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
index a194d6343643..dab2b9fa16b9 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/pp
 DESCRIPTION=Base set of ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_base
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.9.0.tar.gz -> ppx_base-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=64ff34d877d7aba65a0aa88bb9b692f5
+_md5_=d2eda158fb743ca8beea2f0c327bd1ef
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
index ec8b46491284..6fc0c66ceaca 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:
 DESCRIPTION=Generation of comparison functions from types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_compare
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.9.0.tar.gz -> ppx_compare-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=231d0511af0912b2f46d11a629a7678b
+_md5_=2dca3048f5f3c64b14e7150d0c45c0ea
diff --git a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
index a2fa7f5d00a8..86157aa00120 100644
--- a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_tr
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_core
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_core/archive/v0.9.0.tar.gz -> ppx_core-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=7a43cc34ad34baa7f4d4d33feb8c0c4d
+_md5_=39357472dfc94cf45b643e5eb2246f52
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.0 b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
index b51b9c339dcc..6bace8a504e3 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.0
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Shared [@@deriving] plugin registry
 EAPI=6
 HOMEPAGE=https://github.com/diml/ppx_derivers
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.0
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.0.tar.gz -> ppx_derivers-1.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a5583cb14f29bff67299dfabcb97ff64
+_md5_=db65d659fb2c39bbe68597337ed82d5d
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1 b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
index cce896f1561b..852801190645 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Type-driven code generation for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
 IUSE=doc +ocamlopt test
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.tar.gz -> ppx_deriving-4.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	opam	24b4a2529c1fd12f1304856d6c5a690d	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=85e78e6c3b1dc0765e0496ba674040d1
+_md5_=bbdb709ad564fae109ed33a00089b2a9
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
index 9d0f4799e627..82b97adada2d 100644
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrat
 DESCRIPTION=Feature-full driver for OCaml AST transformers
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_driver
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.1.tar.gz -> ppx_driver-0.9.1.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=1b138638ed8470f7528e5da3fc98ff9b
+_md5_=5eebc7208b78283faaf55e931f0c6ec1
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
index 41302d89d684..da5a61d0b6ec 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_ty
 DESCRIPTION=Generate a list containing all values of a finite type
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_enumerate
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.9.0.tar.gz -> ppx_enumerate-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ee3abdd66abd44cb6e863ee39149a899
+_md5_=5d2b37c4d7c7350ca9bfee645c938f02
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
index c12540ce4f23..869f585fe826 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:=
 DESCRIPTION=PPX rewriter that generates hash functions from type expressions and definitions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_hash
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.9.0.tar.gz -> ppx_hash-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=e2ee5b92c1464b2f572de422a8e07792
+_md5_=6f24bade222da199f0aac381d0540358
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
index a94d39509966..43ec3c622d8e 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-
 DESCRIPTION=Code style checker for Jane Street Packages
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_js_style
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.9.0.tar.gz -> ppx_js_style-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=6f62f60ba386c7b7ce645d1e55d8a708
+_md5_=2c76d118f31c13292ce2ccc5461e0f61
diff --git a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0 b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
index 093544f8591c..29939c8d148e 100644
--- a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-
 DESCRIPTION=Write OCaml AST fragment using OCaml syntax
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_metaquot
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_metaquot/archive/v0.9.0.tar.gz -> ppx_metaquot-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=ea4cbbebca4b9b95c4ec1e77bd567694
+_md5_=b48d9680cabd3835456dd060028f00fc
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
index 02ab03979e29..354809ea9bad 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/
 DESCRIPTION=Optional compilation for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.9.0.tar.gz -> ppx_optcomp-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=a63ac8bbce86cf52514baed3e4e632af
+_md5_=a9c5ecff4f30e97f0ce2a20248452e78
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
index 60fd43a8fcfb..7159016e897d 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_m
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_metaquot:= dev-ml/ppx_optcomp:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.9.0.tar.gz -> ppx_sexp_conv-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=cac7cadf8f0d3ddbe48d78f79fcf4aae
+_md5_=e35c4add784e5c4d871a691fc4cd8ead
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
index 171d4a368fcd..e6473510413a 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=5
 HOMEPAGE=https://github.com/alainfrisch/ppx_tools
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.03.0:=[ocamlopt?]
 SLOT=0/5.0.4.03.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.03.0.tar.gz -> ppx_tools-5.0.4.03.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c5d8e7f2f3bc8357ffa2e0a8cb04291e
+_md5_=19bc294b0f7923cfef422d2c35425091
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
index 2301e55bce1c..2297b4170582 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=5
 HOMEPAGE=https://github.com/alainfrisch/ppx_tools
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?]
 SLOT=0/5.0.4.05.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.05.0.tar.gz -> ppx_tools-5.0.4.05.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9814ffe602c9459df695cb9f89bb7a00
+_md5_=c193ba9c6fdd8bf0a266528231a15eb2
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
index 49b4a3c5e0a6..84dc36895a38 100644
--- a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Builtins for ppx_traverse
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_traverse_builtins
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_traverse_builtins/archive/v0.9.0.tar.gz -> ppx_traverse_builtins-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=7ad61c9fd6af702c159c45f66fb63afa
+_md5_=53f213a132b85b86d9c2c24544a9f989
diff --git a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
index ec45b91c5308..2e2d9816631b 100644
--- a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_type_conv
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_type_conv/archive/v0.9.0.tar.gz -> ppx_type_conv-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=37e3a536f1c1c1f0cfff9378275d8ffc
+_md5_=afeb46c8e96915695f5d12fe37b59a9f
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.2 b/metadata/md5-cache/dev-ml/sexplib-0.9.2
index 660a2b35ec81..d60aedc2a8ac 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.2
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.2
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/sexplib
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.2.tar.gz -> sexplib-0.9.2.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=50f0595f707d1de175d84c22f289161d
+_md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.3 b/metadata/md5-cache/dev-ml/sexplib-0.9.3
index edc3f1f51817..a65e284aa06b 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.3
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.3
@@ -3,10 +3,10 @@ DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/sexplib
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.3
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.3.tar.gz -> sexplib-0.9.3.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=50f0595f707d1de175d84c22f289161d
+_md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1 b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
index 4fc6c05f314b..bdb92abeab3f 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-m
 DESCRIPTION=Standard IO Library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/stdio
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.0.tar.gz -> stdio-0.9.0.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5375624b1d04e1386135809c492607c3
+_md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.1 b/metadata/md5-cache/dev-ml/stdio-0.9.1
index 984962750a00..4dd3e724367d 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.1
@@ -3,10 +3,10 @@ DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-m
 DESCRIPTION=Standard IO Library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/stdio
-KEYWORDS=~amd64 ~ppc
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.1.tar.gz -> stdio-0.9.1.tar.gz
 _eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
-_md5_=5375624b1d04e1386135809c492607c3
+_md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
index 555d244ad60f..359fc7cda0e3 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl DES encryption module
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-DES/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=DES
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=576b5cadd9fc4d92b0ffc338794a6d4e
+_md5_=5778d745c73b688d29ab78ad385bbb69
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-0.940.0 b/metadata/md5-cache/dev-perl/IPC-Run-0.940.0
deleted file mode 100644
index 270b53c27380..000000000000
--- a/metadata/md5-cache/dev-perl/IPC-Run-0.940.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/IO-Tty-1.80.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=system() and background procs w/ piping, redirs, ptys
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/IPC-Run/
-IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.94.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=f5a1fbe1b1b5a2de6986a8f5467c1ea0
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e6f7189e99d4..81a51572580c 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/SVN-Simple-0.280.0-r1 b/metadata/md5-cache/dev-perl/SVN-Simple-0.280.0-r1
deleted file mode 100644
index 239b81980e1a..000000000000
--- a/metadata/md5-cache/dev-perl/SVN-Simple-0.280.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/subversion-0.31[perl] dev-lang/perl:=[-build(-)]
-DESCRIPTION=SVN::Simple::Edit - Simple interface to SVN::Delta::Editor
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/SVN-Simple/
-KEYWORDS=amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-vcs/subversion-0.31[perl] dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=8ec94bfd0c35bcbbbd707967629284eb
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index b4ea37ce4471..d50d47825179 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2 b/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2
new file mode 100644
index 000000000000..0550480b0263
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( >=dev-php/PEAR-PEAR-1.10.1 )
+DESCRIPTION=Fast and safe little cache system
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Cache_Lite
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Cache_Lite-1.8.2.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=a1fb2f7dec0b59220199f9e9df9ca846
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.3.5-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.3.5-r1
deleted file mode 100644
index 5c15af1aac1e..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.3.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=A command-line arguments parser
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Console_Getargs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Console_Getargs-1.3.5.tgz
-_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=aa888e1d7db4b64c27a716e5e28cdd11
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0 b/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
new file mode 100644
index 000000000000..357fd673b55c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Getargs-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/phpunit )
+DESCRIPTION=A command-line arguments parser
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Console_Getargs
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Console_Getargs-1.4.0.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=0c38c6296df43fe68bcfe814726ab4b9
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.1.6 b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.1.6
deleted file mode 100644
index 3fd231313b59..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Class that makes it easy to build console style tables
-EAPI=4
-HOMEPAGE=http://pear.php.net/Console_Table
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Console_Table-1.1.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5ad084417ead3013304098fb48b32daf
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
index 584b3b919a2d..366015bc12ba 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Class that makes it easy to build console style tables
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Console_Table
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Table-1.3.0.tgz
 _eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=b5be22e955c108b23665f0a10d31a289
+_md5_=3624c607cde5cdc27d72b669ab720e31
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r1 b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r1
deleted file mode 100644
index 2bdb9f37e873..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-lang/php:*[crypt,hash] dev-php/PEAR-PEAR )
-DESCRIPTION=Generating CHAP packets
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Crypt_CHAP
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[crypt,hash] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
-_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=c454a25786f7e15ab313cd79291d8dae
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2 b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
new file mode 100644
index 000000000000..ac6531877cdf
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-lang/php:*[crypt,hash] dev-php/PEAR-PEAR )
+DESCRIPTION=Generating CHAP packets
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Crypt_CHAP
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[crypt,hash] >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=05ea73ff7099c66c2af5a2e26927af5c
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r1 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r1
deleted file mode 100644
index afa20e12f349..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Calculates RFC 2104 compliant hashes
-EAPI=5
-HOMEPAGE=http://pear.php.net/Crypt_HMAC
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Crypt_HMAC-1.0.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f047744c608ff1e784ea866910125e92
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
new file mode 100644
index 000000000000..9013eab783df
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR )
+DESCRIPTION=Calculates RFC 2104 compliant hashes
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Crypt_HMAC
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Crypt_HMAC-1.0.1.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=2514f19059ee9698bd2f1c8ae480c7d4
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0
deleted file mode 100644
index 8cdb448496a2..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Implementation of Hashed Message Authentication Code for PHP5
-EAPI=4
-HOMEPAGE=http://pear.php.net/Crypt_HMAC2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Crypt_HMAC2-1.0.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a83b3e58313cb5be8c24adf2e9e45c44
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1 b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
new file mode 100644
index 000000000000..0e3d47f84535
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR dev-php/phpunit )
+DESCRIPTION=Implementation of Hashed Message Authentication Code for PHP5
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Crypt_HMAC2
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Crypt_HMAC2-1.0.0.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=55f186496b38544a65d963b26304b138
diff --git a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1 b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
index e51ca0707897..0c6b33e67f3f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Pure-PHP arbitrary precision integer arithmetic library
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/Math_BigInteger http://phpseclib.sourceforge.net/documentation/math.html
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Math_BigInteger-1.0.3.tgz
-_md5_=4c31f3008d92b270b5016d2c74153092
+_md5_=a40cb9d59561fc6ac5760d749ec60727
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.3.1 b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.3.1
deleted file mode 100644
index 1234fc8f7724..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Object-oriented PHP5 resolver library used to communicate with a DNS server
-EAPI=5
-HOMEPAGE=http://pear.php.net/Net_DNS2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php[sockets] dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Net_DNS2-1.3.1.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7466a701b3b1aa062e5a1a8a7e22568f
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3 b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3
deleted file mode 100644
index 33ac7eb94501..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Object-oriented PHP5 resolver library used to communicate with a DNS server
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_DNS2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_DNS2-1.4.3.tgz
-_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
-_md5_=f59bf8287116690fac1db089f2fc7b79
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.4 b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.4
new file mode 100644
index 000000000000..a5ecc3b131f0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Object-oriented PHP5 resolver library used to communicate with a DNS server
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Net_DNS2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets] >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Net_DNS2-1.4.4.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=a64e39679efda95f9517507c1d207773
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.16.4 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.16.4
deleted file mode 100644
index 7747549fd3b8..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.16.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Provides methods for spelling numerals in words
-EAPI=0
-HOMEPAGE=http://pear.php.net/Numbers_Words
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Numbers_Words-0.16.4.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=599026d3d64d40886551755325f4b8ef
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
index 09b3531fb08e..0d57a4b0d0b5 100644
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Provides methods for spelling numerals in words
 EAPI=6
 HOMEPAGE=http://pear.php.net/package/Numbers_Words
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Math_BigInteger
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Numbers_Words-0.18.1.tgz
-_md5_=ac4801c671b2422a38232af29871968b
+_md5_=11027944426635bf6bcf10cc191ba218
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2
new file mode 100644
index 000000000000..d19c78a33a5c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-Math_BigInteger dev-php/phpunit )
+DESCRIPTION=Provides methods for spelling numerals in words
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Numbers_Words
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-php/PEAR-Math_BigInteger >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Numbers_Words-0.18.2.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=067caeaf3d714cfc9e37e487484f3b7f
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2
deleted file mode 100644
index f531cf63ac8d..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Abstracts parsing and rendering rules for Wiki markup in structured plain text
-EAPI=5
-HOMEPAGE=http://pear.php.net/Text_Wiki
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1 PHP-2.02
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/Text_Wiki/archive/1.2.2.tar.gz -> PEAR-Text_Wiki-1.2.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bbf20002411de7ba87adddb11dee72d
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
new file mode 100644
index 000000000000..3c0440a04ab4
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test unpack
+DEPEND=test? ( dev-php/phpunit dev-php/PEAR-PEAR )
+DESCRIPTION=Abstracts parsing and rendering rules for Wiki markup in structured plain text
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Text_Wiki
+IUSE=test
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://github.com/pear/Text_Wiki/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> Text_Wiki-1.2.2_p20170904.tar.gz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=adc191a0b325f7b85b6e5003e5ea76e9
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0-r1 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0-r1
deleted file mode 100644
index 21928efaba88..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Mediawiki parser for Text_Wiki
-EAPI=5
-HOMEPAGE=http://pear.php.net/Text_Wiki_Mediawiki
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/PEAR-Text_Wiki-1.1.0 dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Text_Wiki_Mediawiki-0.2.0.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	php-pear-r1	0093cb21d97586741eb5800ab65bd467	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c431cd949ece880d504e26891c843af2
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
new file mode 100644
index 000000000000..9608b81deb25
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test unpack
+DEPEND=test? ( >=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 dev-php/phpunit )
+DESCRIPTION=Mediawiki parser for Text_Wiki
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Text_Wiki_Mediawiki
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010fb97b825d66345143e4dc.tar.gz -> Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=325124f60446464f4fc3508066524d62
diff --git a/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1 b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
new file mode 100644
index 000000000000..b3d5aed6dcb9
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )
+DESCRIPTION=Validation class
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/Validate
+IUSE=minimal test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!minimal? ( dev-php/PEAR-Date ) >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Validate-0.8.5.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=785087846937039afa3f1ba798ea4e31
diff --git a/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
new file mode 100644
index 000000000000..6bcc8f0271b9
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Simple OO wrapper interface for the Subversion command-line client
+EAPI=6
+HOMEPAGE=https://pear.php.net/package/VersionControl_SVN
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/VersionControl_SVN-0.5.2.tgz
+_eclasses_=php-pear-r2	eb6928c33771db74564e814c5ca6c1b3
+_md5_=21e64be16a43d80fce2383d335e333cc
diff --git a/metadata/md5-cache/dev-php/phar-io-manifest-1.0.1 b/metadata/md5-cache/dev-php/phar-io-manifest-1.0.1
new file mode 100644
index 000000000000..d3922f85ed08
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-io-manifest-1.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Reading phar.io manifest information from a PHP Archive (PHAR)
+EAPI=6
+HOMEPAGE=https://github.com/phar-io/manifest
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader dev-php/phar-io-version dev-lang/php:*[phar]
+SLOT=0
+SRC_URI=https://github.com/phar-io/manifest/archive/1.0.1.tar.gz -> phar-io-manifest-1.0.1.tar.gz
+_md5_=1d0c8ccd24fcc1b7486ef613540d284d
diff --git a/metadata/md5-cache/dev-php/phar-io-version-1.0.1 b/metadata/md5-cache/dev-php/phar-io-version-1.0.1
new file mode 100644
index 000000000000..df3a03e5befb
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-io-version-1.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Library for handling version information and constraints
+EAPI=6
+HOMEPAGE=https://github.com/phar-io/version
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/phar-io/version/archive/1.0.1.tar.gz -> phar-io-version-1.0.1.tar.gz
+_md5_=23f9d230584af3e711404a4a9b3871ef
diff --git a/metadata/md5-cache/dev-python/ImageHash-4.0 b/metadata/md5-cache/dev-python/ImageHash-4.0
new file mode 100644
index 000000000000..d459e4bbf606
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ImageHash-4.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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( 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(-)] dev-python/pillow[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/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[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(-)] sci-libs/scipy[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=Image Hashing library
+EAPI=6
+HOMEPAGE=https://github.com/JohannesBuchner/imagehash
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=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(-)] dev-python/pillow[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/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[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(-)] sci-libs/scipy[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/I/ImageHash/ImageHash-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_=6245b383cf04d013c6945f5d2aae0179
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 17440649ed01..fac9a15f29c8 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/boto3-1.5.27 b/metadata/md5-cache/dev-python/boto3-1.5.27
new file mode 100644
index 000000000000..4991fb7d5ac2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.5.27
@@ -0,0 +1,14 @@
+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(-)] doc? ( >=dev-python/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/botocore-1.8.20[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/jmespath-0.7.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/jmespath-1.0.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/s3transfer-0.1.10[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/s3transfer-0.2.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/mock[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=The AWS SDK for Python
+EAPI=6
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc 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=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.8.20[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/jmespath-0.7.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/jmespath-1.0.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/s3transfer-0.1.10[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/s3transfer-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.5.27.tar.gz -> boto3-1.5.27.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d8659c46a067a5f99a2d65e4f13cad70
diff --git a/metadata/md5-cache/dev-python/boto3-1.5.6 b/metadata/md5-cache/dev-python/boto3-1.5.6
index fdadbebc414b..c0968b419e2e 100644
--- a/metadata/md5-cache/dev-python/boto3-1.5.6
+++ b/metadata/md5-cache/dev-python/boto3-1.5.6
@@ -4,11 +4,11 @@ DESCRIPTION=The AWS SDK for Python
 EAPI=6
 HOMEPAGE=https://github.com/boto/boto3
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.8.20[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/jmespath-0.7.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/jmespath-1.0.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/s3transfer-0.1.10[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/s3transfer-0.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.5.6.tar.gz -> boto3-1.5.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3bcc1303cfc3839dc297f23fc9bbe414
+_md5_=004612da4b2652039e0707efe93b3a2a
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index c809a05b9712..47c53ca374f7 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -1,5 +1,5 @@
 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(-)] doc? ( >=dev-python/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/botocore-1.8.20[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/jmespath-0.7.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/jmespath-1.0.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/s3transfer-0.1.10[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/s3transfer-0.2.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/mock-1.3.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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+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/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/botocore-1.8.20[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/jmespath-0.7.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/jmespath-1.0.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/s3transfer-0.1.10[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/s3transfer-0.2.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/mock[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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=The AWS SDK for Python
 EAPI=6
 HOMEPAGE=https://github.com/boto/boto3
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/botocore-1.8.20[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3bcc1303cfc3839dc297f23fc9bbe414
+_md5_=d8659c46a067a5f99a2d65e4f13cad70
diff --git a/metadata/md5-cache/dev-python/botocore-1.8.41 b/metadata/md5-cache/dev-python/botocore-1.8.41
new file mode 100644
index 000000000000..851a8fbf3401
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.8.41
@@ -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/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/docutils-0.10[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/jmespath-0.7.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/jmespath-1.0.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/python-dateutil-2.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/python-dateutil-3.0.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/mock[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/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(-)] dev-python/jsonschema[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=Low-level, data-driven core of boto 3.
+EAPI=6
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc 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=Apache-2.0
+RDEPEND=>=dev-python/docutils-0.10[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/jmespath-0.7.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/jmespath-1.0.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/python-dateutil-2.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/python-dateutil-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.8.41.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_=a8630c22217dac4b9e728dccac8c288c
diff --git a/metadata/md5-cache/dev-python/botocore-9999 b/metadata/md5-cache/dev-python/botocore-9999
index 77937deaee6c..28bf430bde1d 100644
--- a/metadata/md5-cache/dev-python/botocore-9999
+++ b/metadata/md5-cache/dev-python/botocore-9999
@@ -1,5 +1,5 @@
 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(-)] doc? ( >=dev-python/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/docutils-0.10[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/jmespath-0.7.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/jmespath-1.0.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/python-dateutil-2.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/python-dateutil-3.0.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/mock-1.3.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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+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/guzzle_sphinx_theme-0.7.10[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/guzzle_sphinx_theme-0.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/sphinx-1.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(-)] <dev-python/sphinx-1.7[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/docutils-0.10[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/jmespath-0.7.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/jmespath-1.0.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/python-dateutil-2.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/python-dateutil-3.0.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/mock[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/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(-)] dev-python/jsonschema[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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Low-level, data-driven core of boto 3.
 EAPI=6
 HOMEPAGE=https://github.com/boto/botocore
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_p
 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_=a920c76f56ed48d9e68c175c10e0bd42
+_md5_=a8630c22217dac4b9e728dccac8c288c
diff --git a/metadata/md5-cache/dev-python/bpython-0.17.1 b/metadata/md5-cache/dev-python/bpython-0.17.1
new file mode 100644
index 000000000000..91b21ec7212e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bpython-0.17.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[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/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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[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/six-1.5[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/urwid[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/watchdog[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/mock[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=Syntax highlighting and autocompletion for the Python interpreter
+EAPI=6
+HOMEPAGE=http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/curtsies-0.2.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jedi[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/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[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[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/six-1.5[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/urwid[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/watchdog[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/b/bpython/bpython-0.17.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_=a517c073b74bd4aa369f9bed09c47bb9
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.22 b/metadata/md5-cache/dev-python/configshell-fb-1.1.22
deleted file mode 100644
index 1afc80745874..000000000000
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.22
+++ /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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A Python library for building configuration shells
-EAPI=6
-HOMEPAGE=https://github.com/open-iscsi/configshell-fb
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[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/urwid[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/configshell python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/open-iscsi/configshell-fb/archive/v1.1.fb22.tar.gz -> configshell-fb-1.1.22.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e687e0f78e68b9e5dec2c4daa65672e
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.23 b/metadata/md5-cache/dev-python/configshell-fb-1.1.23
deleted file mode 100644
index 88e8adcf0dd9..000000000000
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.23
+++ /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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A Python library for building configuration shells
-EAPI=6
-HOMEPAGE=https://github.com/open-iscsi/configshell-fb
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyparsing[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/six[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/urwid[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/configshell 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/c/configshell-fb/configshell-fb-1.1.23.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_=7c814a16193d6023ef426109aa43e3cf
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.24 b/metadata/md5-cache/dev-python/configshell-fb-1.1.24
new file mode 100644
index 000000000000..6eaa252ea96e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.24
@@ -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=A Python library for building configuration shells
+EAPI=6
+HOMEPAGE=https://github.com/open-iscsi/configshell-fb
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyparsing[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/six[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/urwid[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/configshell 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/c/configshell-fb/configshell-fb-1.1.24.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_=ae10c8761ae82a49bd1389e4cd89101d
diff --git a/metadata/md5-cache/dev-python/dbus-python-1.2.6 b/metadata/md5-cache/dev-python/dbus-python-1.2.6
new file mode 100644
index 000000000000..481c52933662
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dbus-python-1.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/dbus-glib-0.108:= >=sys-apps/dbus-1.8:= >=dev-libs/glib-2.40 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/pkgconfig doc? ( dev-python/docutils[python_targets_python2_7?] =dev-python/epydoc-3*[python_targets_python2_7?] ) test? ( 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(-)] ) >=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=Python bindings for the D-Bus messagebus
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+LICENSE=MIT
+RDEPEND=>=dev-libs/dbus-glib-0.108:= >=sys-apps/dbus-1.8:= >=dev-libs/glib-2.40 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) doc? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=866cea0726d07c048bf5543555bdc9f5
diff --git a/metadata/md5-cache/dev-python/docker-py-2.4.2 b/metadata/md5-cache/dev-python/docker-py-2.4.2
index aab55f151535..340222079103 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.4.2
+++ b/metadata/md5-cache/dev-python/docker-py-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for Docker
 EAPI=6
 HOMEPAGE=https://github.com/docker/docker-py
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.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/requests-2.12.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.11.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/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/docker/docker-py/archive/2.4.2.tar.gz -> docker-py-2.4.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_=a1a337b93047954cbd95cc7cc31b3c82
+_md5_=ec9d92e72f4f81f04e0cbb0a0d0afffe
diff --git a/metadata/md5-cache/dev-python/docker-py-2.7.0 b/metadata/md5-cache/dev-python/docker-py-2.7.0
index 6ae227c2d801..dc2dd8c935fd 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.7.0
+++ b/metadata/md5-cache/dev-python/docker-py-2.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for Docker
 EAPI=6
 HOMEPAGE=https://github.com/docker/docker-py
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.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/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/docker/docker-py/archive/2.7.0.tar.gz -> docker-py-2.7.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_=6d3936250ed851c3cc533de77af41161
+_md5_=a816ab74ba78d4d1daa9e26176a3dd41
diff --git a/metadata/md5-cache/dev-python/docker-py-3.0.1 b/metadata/md5-cache/dev-python/docker-py-3.0.1
new file mode 100644
index 000000000000..a4504d6f0c38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docker-py-3.0.1
@@ -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(-)] test? ( >=dev-python/docker-pycreds-0.2.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/requests-2.18.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/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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-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.9.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(-)] ) doc? ( dev-python/recommonmark[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/sphinx-1.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python client for Docker
+EAPI=6
+HOMEPAGE=https://github.com/docker/docker-py
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/docker-pycreds-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/requests-2.18.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/requests-2.14.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/docker/docker-py/archive/3.0.1.tar.gz -> docker-py-3.0.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_=0b6a29acb062def89a6d555a561fd6c3
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.3 b/metadata/md5-cache/dev-python/ebuildtester-0.1.3
index a300dd764420..2e831d4ee41a 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.3
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.3
@@ -2,7 +2,7 @@ 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=A dockerized approach to test a Gentoo package within a clean stage3
 EAPI=6
-HOMEPAGE=https://github.com/nicolasbock/ebuildtester
+HOMEPAGE=http://ebuildtester.readthedocs.io/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.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_=4183313662ce34baec35c601d1b40aed
+_md5_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.4 b/metadata/md5-cache/dev-python/ebuildtester-0.1.4
new file mode 100644
index 000000000000..a8f68edae5d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.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=A dockerized approach to test a Gentoo package within a clean stage3
+EAPI=6
+HOMEPAGE=http://ebuildtester.readthedocs.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.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_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.5 b/metadata/md5-cache/dev-python/ebuildtester-0.1.5
new file mode 100644
index 000000000000..2a1382c8626a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.5
@@ -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=A dockerized approach to test a Gentoo package within a clean stage3
+EAPI=6
+HOMEPAGE=http://ebuildtester.readthedocs.io/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-emulation/docker 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/e/ebuildtester/ebuildtester-0.1.5.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_=45570432ff64dffcd44577047d1782ec
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.1 b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.1
deleted file mode 100644
index 8e90c6607cbc..000000000000
--- a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.22[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretty-yaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=official Python low-level client for Elasticsearch
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-py
-IUSE=examples doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.22[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/5.5.1.tar.gz -> elasticsearch-py-5.5.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.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_=fe4c4d25b673df2481b6fe51cac78b90
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2 b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2
new file mode 100644
index 000000000000..850072d3f70c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-5.5.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretty-yaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=official Python low-level client for Elasticsearch
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-py
+IUSE=examples doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/5.5.2.tar.gz -> elasticsearch-py-5.5.2.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.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_=460c62739a72df4667cd557bbcf7f685
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
index d93d9473ca40..22c85129f3ff 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.0.0
@@ -10,6 +10,6 @@ RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.0.0.tar.gz -> elasticsearch-py-6.0.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.tar.gz )
+SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.0.0.tar.gz -> elasticsearch-py-6.0.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.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_=eb3d193dfc55c81c6b2149b27cfce819
+_md5_=661b39e925fd09cfa8e664a05c4b58a4
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1 b/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1
new file mode 100644
index 000000000000..5b76bd4e33e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretty-yaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=official Python low-level client for Elasticsearch
+EAPI=6
+HOMEPAGE=https://github.com/elastic/elasticsearch-py
+IUSE=examples doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/urllib3-1.23[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.1.1.tar.gz -> elasticsearch-py-6.1.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.1.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_=6ea73a87fe98e954c71fa2ca9e4f0a41
diff --git a/metadata/md5-cache/dev-python/fixtures-1.4.0 b/metadata/md5-cache/dev-python/fixtures-1.4.0
index 6e672a52df76..a585571859ec 100644
--- a/metadata/md5-cache/dev-python/fixtures-1.4.0
+++ b/metadata/md5-cache/dev-python/fixtures-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Fixtures, reusable state for writing clean tests and more
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/pbr-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-0.9.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-1.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_=ddaec3ceed69471d63c39860d8a341d4
+_md5_=a8290b022d7dbdab0a18dff4cbaf2eb4
diff --git a/metadata/md5-cache/dev-python/fonttools-3.0 b/metadata/md5-cache/dev-python/fonttools-3.0
index 27993ec74d19..89c9ee1878df 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.0
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/numpy-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=5
-HOMEPAGE=https://github.com/behdad/fonttools/
+HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=python_targets_python2_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/behdad/fonttools/archive/3.0.tar.gz -> fonttools-3.0.tar.gz
+SRC_URI=https://github.com/fonttools/fonttools/archive/3.0.tar.gz -> fonttools-3.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_=d7966c8825d01fbe703a5f8a70661059
+_md5_=b0f773c64bf8d2aaeabbe178bc511f01
diff --git a/metadata/md5-cache/dev-python/fonttools-3.20.1 b/metadata/md5-cache/dev-python/fonttools-3.20.1
index 1a4659cedebc..4205cd17fd97 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.20.1
+++ b/metadata/md5-cache/dev-python/fonttools-3.20.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=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/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(-)] ) 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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=6
-HOMEPAGE=https://github.com/behdad/fonttools/
+HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=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=https://github.com/behdad/fonttools/archive/3.20.1.tar.gz -> fonttools-3.20.1.tar.gz
+SRC_URI=https://github.com/fonttools/fonttools/archive/3.20.1.tar.gz -> fonttools-3.20.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_=afe9d9d0a7f3ceb4faff6e1683c4ae6e
+_md5_=32cdfec320381e2c0814e50e1524b9b0
diff --git a/metadata/md5-cache/dev-python/fonttools-3.21.1 b/metadata/md5-cache/dev-python/fonttools-3.21.1
index 95a9ead612da..d1e71e65d09c 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.21.1
+++ b/metadata/md5-cache/dev-python/fonttools-3.21.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=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/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(-)] ) 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=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=6
-HOMEPAGE=https://github.com/behdad/fonttools/
+HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=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=https://github.com/behdad/fonttools/archive/3.21.1.tar.gz -> fonttools-3.21.1.tar.gz
+SRC_URI=https://github.com/fonttools/fonttools/archive/3.21.1.tar.gz -> fonttools-3.21.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_=afe9d9d0a7f3ceb4faff6e1683c4ae6e
+_md5_=32cdfec320381e2c0814e50e1524b9b0
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.7 b/metadata/md5-cache/dev-python/git-python-2.1.7
index b5d9972fbaa8..0dc85f094fed 100644
--- a/metadata/md5-cache/dev-python/git-python-2.1.7
+++ b/metadata/md5-cache/dev-python/git-python-2.1.7
@@ -4,7 +4,7 @@ DESCRIPTION=Library used to interact with Git repositories
 EAPI=6
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython
 IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/gitdb2-2.0.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(-)] python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.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_=82f8f6d160485253b452c07e5f6cbac6
+_md5_=e3d80d751eb3951f300611f50728ed67
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.2 b/metadata/md5-cache/dev-python/gitdb2-2.0.2
deleted file mode 100644
index 2bbc484ab0b0..000000000000
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-python/gitdb[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/smmap2-2.0.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(-)] dev-vcs/git ) 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=GitDB is a pure-Python git object database
-EAPI=6
-HOMEPAGE=https://github.com/gitpython-developers/gitdb https://pypi.python.org/pypi/gitdb2
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!dev-python/gitdb[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/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.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_=77c56c80bd8ce9cf7752fc6df23afcbf
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
new file mode 100644
index 000000000000..f4a358661fdc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-python/gitdb[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/smmap2-2.0.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(-)] dev-vcs/git ) 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=GitDB is a pure-Python git object database
+EAPI=6
+HOMEPAGE=https://github.com/gitpython-developers/gitdb https://pypi.python.org/pypi/gitdb2
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=!dev-python/gitdb[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/smmap2-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.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_=d7556004e7c54d56085c9b96ad3aea4d
diff --git a/metadata/md5-cache/dev-python/grafanalib-0.4.0 b/metadata/md5-cache/dev-python/grafanalib-0.4.0
new file mode 100644
index 000000000000..69519153f865
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grafanalib-0.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/attrs[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(-)] 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(-)] ) 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=Library for building Grafana dashboards
+EAPI=6
+HOMEPAGE=https://github.com/weaveworks/grafanalib
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/attrs[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/g/grafanalib/grafanalib-0.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_=1f6126cf8407fea6697d5951e7b4b3b9
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.14 b/metadata/md5-cache/dev-python/httpretty-0.8.14
index 7f99744d4103..6184adc877e7 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.14
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.14
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=6
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[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/h/httpretty/httpretty-0.8.14.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_=c8595a34aba13bdfc42749838381a273
+_md5_=9dfe97be862246bd702e527cd8e9a2c7
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.4 b/metadata/md5-cache/dev-python/kitchen-1.2.4
index 0e3a4e25ec0b..4adf9bb4cf05 100644
--- a/metadata/md5-cache/dev-python/kitchen-1.2.4
+++ b/metadata/md5-cache/dev-python/kitchen-1.2.4
@@ -2,7 +2,7 @@ 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A cornucopia of useful code
 EAPI=6
-HOMEPAGE=https://fedorahosted.org/kitchen/ https://pypi.python.org/pypi/kitchen
+HOMEPAGE=https://pypi.python.org/pypi/kitchen
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-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_=a87c98672642d6a0aa9779ae6f069dd9
+_md5_=3d8c260e4f5bcb9088282550dd249e1e
diff --git a/metadata/md5-cache/dev-python/kombu-4.1.0-r1 b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
new file mode 100644
index 000000000000..2dedfbe80fca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/py-amqp-2.1.4[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/py-amqp-3.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/pyro:4[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(-)] sqs? ( >=dev-python/boto3-1.4.4[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(-)] ) msgpack? ( >=dev-python/msgpack-0.3.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(-)] ) mongodb? ( >=dev-python/pymongo-3.0.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(-)] ) redis? ( >=dev-python/redis-py-2.10.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(-)] ) yaml? ( >=dev-python/pyyaml-3.10[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-20.6.7[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/case-1.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] dev-python/pytz[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/unittest2[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(-)] dev-python/couchdb-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/sphinx_celery-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=AMQP Messaging Framework for Python
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/kombu https://github.com/celery/kombu
+IUSE=doc examples mongodb msgpack redis sqs test yaml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/py-amqp-2.1.4[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/py-amqp-3.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/pyro:4[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(-)] sqs? ( >=dev-python/boto3-1.4.4[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(-)] ) msgpack? ( >=dev-python/msgpack-0.3.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(-)] ) mongodb? ( >=dev-python/pymongo-3.0.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(-)] ) redis? ( >=dev-python/redis-py-2.10.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(-)] ) yaml? ( >=dev-python/pyyaml-3.10[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/k/kombu/kombu-4.1.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_=ba798dcc27b4895a34f1e996372a0ea9
diff --git a/metadata/md5-cache/dev-python/libvirt-python-3.10.0 b/metadata/md5-cache/dev-python/libvirt-python-3.10.0
deleted file mode 100644
index ab02fffcbfd7..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-3.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/libvirt:0/3.10.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=libvirt Python bindings
-EAPI=6
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/3.10.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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/python/libvirt-python-3.10.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_=1600c568824cad8a6aa8972817e20907
diff --git a/metadata/md5-cache/dev-python/libvirt-python-3.8.0 b/metadata/md5-cache/dev-python/libvirt-python-3.8.0
deleted file mode 100644
index ca3c63ff97f3..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/libvirt:0/3.8.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=libvirt Python bindings
-EAPI=6
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/3.8.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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/python/libvirt-python-3.8.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_=c6fc64214fa9f554ee7cbaf42e466574
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.0.0 b/metadata/md5-cache/dev-python/libvirt-python-4.0.0
index 593255de7988..63debacaa9d5 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.0.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=libvirt Python bindings
 EAPI=6
 HOMEPAGE=https://www.libvirt.org
 IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/4.0.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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/python/libvirt-python-4.0.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_=9253a5da46c2afbdcec04227ce54017e
+_md5_=23e65cd75ce751a33fae8abe3c14f179
diff --git a/metadata/md5-cache/dev-python/networkx-1.11-r1 b/metadata/md5-cache/dev-python/networkx-1.11-r1
new file mode 100644
index 000000000000..915991ee20c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/networkx-1.11-r1
@@ -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(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/numpydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) ) test? ( dev-python/matplotlib[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(-)] scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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-python/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python tools to manipulate graphs and complex networks
+EAPI=6
+HOMEPAGE=http://networkx.github.io/ https://github.com/networkx/networkx
+IUSE=doc examples scipy test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] examples? ( dev-python/matplotlib[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(-)] scipy? ( sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/pygraphviz[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/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[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=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/n/networkx/networkx-1.11.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc0466a49e5b999a29123504d574d893
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.2 b/metadata/md5-cache/dev-python/nnpy-1.4.2
new file mode 100644
index 000000000000..fed50f319cde
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nnpy-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cffi:=[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/nanomsg:= 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=cffi-based Python bindings for nanomsg
+EAPI=5
+HOMEPAGE=https://github.com/nanomsg/nnpy
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-python/cffi:=[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/nanomsg:= 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/nanomsg/nnpy/archive/1.4.2.tar.gz -> nnpy-1.4.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_=7b515ceceb335e732f7fdfe8ebe73244
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.25.1 b/metadata/md5-cache/dev-python/oslo-db-4.25.1
deleted file mode 100644
index 331fb65a1185..000000000000
--- a/metadata/md5-cache/dev-python/oslo-db-4.25.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(-)?,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=OpenStack Common DB Code
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=+sqlite mysql postgres 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[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/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.25.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_=471a776f744939fa7bf4036a2dd0a7cd
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1 b/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1
new file mode 100644
index 000000000000..33e0d6292902
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-db-4.25.1-r1
@@ -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_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(-)?,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=OpenStack Common DB Code
+EAPI=6
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=+sqlite mysql postgres 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[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/alembic-0.8.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( || ( dev-python/pymysql[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/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( dev-python/psycopg: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/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.25.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_=9bc73acc66fe86377aaeb79b32bcf2c7
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.0 b/metadata/md5-cache/dev-python/paramiko-2.4.0
index 258666c99bf0..04bfd1540dbf 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.0
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=6
 HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/bcrypt-3.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(-)] >=dev-python/cryptography-1.5[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/pynacl-1.0.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/pyasn1-0.1.7[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[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 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/paramiko/paramiko/archive/2.4.0.tar.gz -> paramiko-2.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_=4c4622d4f63321966556bfd62cd1f525
+_md5_=3601b5fe766afe5ae473ff02f797e1fc
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1 b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
index 1c1d4194101d..c828fa5381ce 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.5.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/protobuf-3.5.1.1 dev-python/namespace-google[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[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/six[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/protobuf-3[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0/15
 SRC_URI=https://github.com/google/protobuf/archive/v3.5.1.1.tar.gz -> protobuf-3.5.1.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_=b0900bc7f3f2a6ba12ca761a58f918b0
+_md5_=ebe1cb254c8f3ddea2d19d4fee595651
diff --git a/metadata/md5-cache/dev-python/pyicu-2.0.2 b/metadata/md5-cache/dev-python/pyicu-2.0.2
index 35451b83f74b..0347762aec40 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.0.2
+++ b/metadata/md5-cache/dev-python/pyicu-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for dev-libs/icu
 EAPI=6
 HOMEPAGE=https://github.com/ovalhub/pyicu
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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/icu 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 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.0.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_=88fc999772bbcc356d5e8acdc040f7ce
+_md5_=67922e4d8942a9ccef64039601efb67b
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
index a7b85dc38f35..96c148b44ee8 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=py.test plugin for relaxed test discovery and organization
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pytest-relaxed https://github.com/bitprophet/pytest-relaxed
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-python/pytest-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/six-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/decorator-4[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-relaxed/pytest-relaxed-1.1.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_=e57473b25f9d6914ba075845d8969361
+_md5_=af9c387048f07bd492e4a05051908c96
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 3fd071dea060..10ec29bb8d9a 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05
@@ -4,11 +4,11 @@ DESCRIPTION=Alternative regular expression module to replace re
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
 IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2017.04.05.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2f8368d59254c79f12dc688652dcf1a
+_md5_=2e31b36c4416a545bb6a2732275bef94
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index 504fe8efdc3b..93b4558f5ba0 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.7
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=5
 HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.python.org/pypi/rfc3987
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_targets_pypy? ( dev-python/regex[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/regex[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-python/regex[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/regex[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/regex[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_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.7.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_=c95f13eed04763a789814f227452aae8
+_md5_=fa5451bdd3a820d2a4b19b0f036d8343
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.4 b/metadata/md5-cache/dev-python/rospkg-1.1.4
index 001583af4d7d..723cad24f5e9 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.4
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[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(-)]
+DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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=Standalone Python library for the ROS package system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospkg
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.4.tar.gz -> rospkg-1.1.4.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_=eee118a41ec64157405fe3c541f1ffb7
+_md5_=c3b268dd93d6d16f4ee2dfc2325c0b42
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index 1fae3b36b25a..2b48fd54cd3c 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 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(-)]
+DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 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=Standalone Python library for the ROS package system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospkg
@@ -9,4 +9,4 @@ RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	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_=eee118a41ec64157405fe3c541f1ffb7
+_md5_=c3b268dd93d6d16f4ee2dfc2325c0b42
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.1.12 b/metadata/md5-cache/dev-python/s3transfer-0.1.12
index 8d6ddb74fffe..e4a20805f689 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.1.12
+++ b/metadata/md5-cache/dev-python/s3transfer-0.1.12
@@ -4,11 +4,11 @@ DESCRIPTION=An Amazon S3 Transfer Manager
 EAPI=6
 HOMEPAGE=https://github.com/boto/s3transfer
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/futures-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/futures-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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/s/s3transfer/s3transfer-0.1.12.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_=3ae7d97a24cec4de7638d34030f31d47
+_md5_=0f6a1c58f126ca7074bf698ee2a0a9c1
diff --git a/metadata/md5-cache/dev-python/scandir-1.6 b/metadata/md5-cache/dev-python/scandir-1.6
index 2d123803eaa0..ac7c8d575a14 100644
--- a/metadata/md5-cache/dev-python/scandir-1.6
+++ b/metadata/md5-cache/dev-python/scandir-1.6
@@ -4,11 +4,11 @@ DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=6
 HOMEPAGE=https://github.com/benhoyt/scandir
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.6.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_=eb5a94c7d3de4575590a880740496cde
+_md5_=a4f492d86dcc6daaaea1686c022216eb
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.6 b/metadata/md5-cache/dev-python/scrypt-0.8.6
new file mode 100644
index 000000000000..cde98c1210b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Bindings for the scrypt key derivation function library
+EAPI=6
+HOMEPAGE=https://bitbucket.org/mhallin/py-scrypt/wiki/Home/
+IUSE=test doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.6.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_=42a53978213ab1c39b50757fd4bf3493
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1 b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
new file mode 100644
index 000000000000..eb2d806dbe49
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-1.15.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) test? ( dev-python/pytest[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=package to manage versions by scm tags via setuptools
+EAPI=6
+HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm
+IUSE=git mercurial test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+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 )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.6.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_=7546fd93e5fdeea412599bba72a29d6d
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index 2f787905f634..230c20902da9 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A pure python implementation of a sliding window memory map manager
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/smmap2 https://github.com/gitpython-developers/smmap
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=!dev-python/smmap[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/s/smmap2/smmap2-2.0.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_=372b51f77293d7beac2269c77a02ecf1
+_md5_=fac26dc38b326e384d3ca48184c683f0
diff --git a/metadata/md5-cache/dev-python/sure-1.2.5-r1 b/metadata/md5-cache/dev-python/sure-1.2.5-r1
index 7b47897b8b5d..9cf4ab1703c3 100644
--- a/metadata/md5-cache/dev-python/sure-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/sure-1.2.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Utility belt for automated testing in python for python
 EAPI=5
 HOMEPAGE=https://github.com/gabrielfalcao/sure
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=>=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/rednose-0.4.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gabrielfalcao/sure/archive/1.2.5.tar.gz -> sure-1.2.5-r1.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	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ae9b3bd5f227658d77e3607f59ee3b2
+_md5_=10aaa62913ae08c7d5634895d99c011d
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.5.1 b/metadata/md5-cache/dev-python/thunarx-python-0.5.1
new file mode 100644
index 000000000000..c4c8be1bcc81
--- /dev/null
+++ b/metadata/md5-cache/dev-python/thunarx-python-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)?] >=xfce-base/thunar-1.7.0 virtual/pkgconfig
+DESCRIPTION=Python bindings for the Thunar file manager
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[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(+)?] >=xfce-base/thunar-1.7.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://xfce/src/bindings/thunarx-python/0.5/thunarx-python-0.5.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b51c97fed620dee0afed80981370e521
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.37.0 b/metadata/md5-cache/dev-python/websocket-client-0.37.0
index 2e3db0374d2e..962522fea79c 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.37.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.37.0
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=5
 HOMEPAGE=https://github.com/liris/websocket-client
 IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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/w/websocket-client/websocket_client-0.37.0.tar.gz -> websocket-client-0.37.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	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=980b9db6aecd6139da319a1bb482ee7c
+_md5_=2bf1bf57416367a562902b2a5055c06d
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index d3a94805eeb2..01a95d2cfd97 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
new file mode 100644
index 000000000000..c01571c1c610
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_dev
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
new file mode 100644
index 000000000000..4f6bbcbcaca4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1f44b59ab4536a33899d94f44491e3d
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4
new file mode 100644
index 000000000000..5b2e90968473
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_plugins
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
new file mode 100644
index 000000000000..24e38dce4bc9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
new file mode 100644
index 000000000000..c4b372dcc001
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS control plugins for gazebo
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.0 b/metadata/md5-cache/dev-ros/gencpp-0.6.0
new file mode 100644
index 000000000000..84fb7d26524f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS C++ message definition and serialization generators
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gencpp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0/0.6.0
+SRC_URI=https://github.com/ros/gencpp/archive/0.6.0.tar.gz -> gencpp-0.6.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5efa01a0811fcab4cb3de2f07a2ce78f
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.10 b/metadata/md5-cache/dev-ros/genmsg-0.5.10
new file mode 100644
index 000000000000..901462974404
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python library for generating ROS message and service data structures for various languages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/genmsg
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/genmsg/archive/0.5.10.tar.gz -> genmsg-0.5.10.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3acf5c3dc6e21586d8d04d5521bf1ebf
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.8 b/metadata/md5-cache/dev-ros/genmsg-0.5.8
deleted file mode 100644
index 46867a09b31a..000000000000
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python library for generating ROS message and service data structures for various languages
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/genmsg
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/genmsg/archive/0.5.8.tar.gz -> genmsg-0.5.8.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=640424a46fe1fe2bbdc4c35f9e44889e
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.10 b/metadata/md5-cache/dev-ros/gmapping-1.3.10
index 21552dd3cc04..3021a369be32 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.10
+++ b/metadata/md5-cache/dev-ros/gmapping-1.3.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gmapping
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage 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(-)]
+RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.10.tar.gz -> slam_gmapping-1.3.10.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b42108678fd198949ea3c97dce517f6d
+_md5_=647914d504ce7107968266bb04b6f792
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.8 b/metadata/md5-cache/dev-ros/gmapping-1.3.8
deleted file mode 100644
index d1ff17421ee7..000000000000
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/gmapping
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.8.tar.gz -> slam_gmapping-1.3.8.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a5937683d661b138ed7132c8306ecdb
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.9 b/metadata/md5-cache/dev-ros/gmapping-1.3.9
deleted file mode 100644
index 22d981f0eed2..000000000000
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/gmapping
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.9.tar.gz -> slam_gmapping-1.3.9.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c132d40c9be2ce1b98e96d6358263280
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 427a77bf9ee7..80673ba8f7f3 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gmapping
 IUSE=python_targets_python2_7 test
 LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage 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(-)]
+RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping 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
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a5937683d661b138ed7132c8306ecdb
+_md5_=647914d504ce7107968266bb04b6f792
diff --git a/metadata/md5-cache/dev-ros/map_server-1.13.0 b/metadata/md5-cache/dev-ros/map_server-1.13.0
deleted file mode 100644
index 29cbb12d4ff7..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/map_server
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f922247eefa65fc63e5204f20999fc4a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.13.1 b/metadata/md5-cache/dev-ros/map_server-1.13.1
deleted file mode 100644
index a4aaa6c0278e..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/map_server
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f922247eefa65fc63e5204f20999fc4a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.14.0 b/metadata/md5-cache/dev-ros/map_server-1.14.0
deleted file mode 100644
index 75a4fea70f08..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/map_server
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b7e549d354cb310d0d4334f5f2ab92d
diff --git a/metadata/md5-cache/dev-ros/map_server-1.14.2 b/metadata/md5-cache/dev-ros/map_server-1.14.2
deleted file mode 100644
index 2c0f1e3e390d..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/map_server
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.2.tar.gz -> navigation-1.14.2.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aca602a29d7fe3044d0dd276f751d6a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.15.1 b/metadata/md5-cache/dev-ros/map_server-1.15.1
deleted file mode 100644
index 1b4b16cf04c2..000000000000
--- a/metadata/md5-cache/dev-ros/map_server-1.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Offers map data as a ROS service
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/map_server
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7aca602a29d7fe3044d0dd276f751d6a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.15.1-r1 b/metadata/md5-cache/dev-ros/map_server-1.15.1-r1
new file mode 100644
index 000000000000..72dab15f91cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/map_server-1.15.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Offers map data as a ROS service
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/map_server
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8012cae7d600e3b893be3000c60d0226
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index 82e9923c798f..67c035a12978 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Offers map data as a ROS service
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_server
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 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(-)]
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 sci-physics/bullet:= 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
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f922247eefa65fc63e5204f20999fc4a
+_md5_=8012cae7d600e3b893be3000c60d0226
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.1-r1 b/metadata/md5-cache/dev-ros/move_base-1.15.1-r1
deleted file mode 100644
index 6e67eb6ee9d5..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.15.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/move_base
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eac6dbafd8c171daf54c7de28709eb1f
diff --git a/metadata/md5-cache/dev-ros/move_base-1.15.1-r2 b/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
new file mode 100644
index 000000000000..f995346ce4b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_base-1.15.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/move_base
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.1.tar.gz -> navigation-1.15.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index d2ad7a4f0e0f..211c03f985d1 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_base
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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(-)]
+RDEPEND=>=dev-ros/costmap_2d-1.15.1 dev-ros/roscpp dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/actionlib dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= 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
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eac6dbafd8c171daf54c7de28709eb1f
+_md5_=46710ec6d0524eb750b4aa7d223c556f
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
new file mode 100644
index 000000000000..960b1710bba1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc9605e47fb2e2f047e0df2958b80bd6
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.1 b/metadata/md5-cache/dev-ros/pr2_description-1.12.1
new file mode 100644
index 000000000000..bbece2473b59
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pr2_description
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9a38f2cf273cf4553b1c97c90da1e66
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.1 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
new file mode 100644
index 000000000000..10e1d904c0da
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pr2_machine
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3fff3957bb7bdf1d38c2c3caa1720665
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
new file mode 100644
index 000000000000..d38aea5ad89f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pr2_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d5e40eb0de13ca39bc1e372824e19c98
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.7 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.7
deleted file mode 100644
index d2913ef1f444..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.7.tar.gz -> rqt_common_plugins-0.4.7.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45917430c2972d528cbd6ff46b6e5675
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
new file mode 100644
index 000000000000..30cf4702beda
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.4.9.tar.gz -> rqt_reconfigure-0.4.9.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abb6430a8c043b533006039f619744c6
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 9b2c83f94440..74265ec826f1 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/bcrypt_pbkdf-1.0.0 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
index 422c503ddc41..4fcfdc88024b 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/bcrypt_pbkdf-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+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=1
 SRC_URI=mirror://rubygems/bcrypt_pbkdf-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_=014c664f41ed4e5e881555868481ee9d
+_md5_=251830f9897ef8cf87603fd917498d3f
diff --git a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2 b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
index 743db0f62b82..f0c0ebe8485c 100644
--- a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
+++ b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rails-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=A popular and flexible JavaScript DatePicker for RubyOnRails
 EAPI=5
-HOMEPAGE=https://code.google.com/p/calendardateselect/
+HOMEPAGE=https://github.com/timcharper/calendar_date_select
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/calendar_date_select-2.1.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_=65f150f8f85072f7284a426f5e680bd7
+_md5_=0597069d298f7da95cdbc080cc5b011b
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.14.4 b/metadata/md5-cache/dev-ruby/capybara-2.14.4
deleted file mode 100644
index c424125a19f3..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-2.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0: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=2
-SRC_URI=mirror://rubygems/capybara-2.14.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	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=d81ab346620532a9df33bb9daf78ce7c
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.18.0 b/metadata/md5-cache/dev-ruby/capybara-2.18.0
new file mode 100644
index 000000000000..d5ec770c7cab
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-2.18.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] || ( dev-ruby/xpath:3[ruby_targets_ruby22] dev-ruby/xpath:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] || ( dev-ruby/xpath:3[ruby_targets_ruby23] dev-ruby/xpath:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] || ( dev-ruby/xpath:3[ruby_targets_ruby24] dev-ruby/xpath:2[ruby_targets_ruby24] ) ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=6
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] || ( dev-ruby/xpath:3[ruby_targets_ruby22] dev-ruby/xpath:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] || ( dev-ruby/xpath:3[ruby_targets_ruby23] dev-ruby/xpath:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] || ( dev-ruby/xpath:3[ruby_targets_ruby24] dev-ruby/xpath: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? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/capybara-2.18.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	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=3c76fb589308371340a434b8d5de60e2
diff --git a/metadata/md5-cache/dev-ruby/facter-3.10.0 b/metadata/md5-cache/dev-ruby/facter-3.10.0
new file mode 100644
index 000000000000..d3172e6837ad
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=6
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.10.0.tar.gz -> facter-3.10.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=899776969006853578826422853cd5cd
diff --git a/metadata/md5-cache/dev-ruby/facter-3.7.1 b/metadata/md5-cache/dev-ruby/facter-3.7.1
deleted file mode 100644
index 54a42c361c32..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=5
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.7.1.tar.gz -> facter-3.7.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d5bf294d9738d38ce963acf8ba8676d
diff --git a/metadata/md5-cache/dev-ruby/facter-3.8.0 b/metadata/md5-cache/dev-ruby/facter-3.8.0
deleted file mode 100644
index c9188ace20b4..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.8.0.tar.gz -> facter-3.8.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4058eb7bc8c44a7da00cde462109a8a3
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.0 b/metadata/md5-cache/dev-ruby/facter-3.9.0
deleted file mode 100644
index ab68ba0cd53f..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.0.tar.gz -> facter-3.9.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4058eb7bc8c44a7da00cde462109a8a3
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.1 b/metadata/md5-cache/dev-ruby/facter-3.9.1
deleted file mode 100644
index a1d8c23d7be5..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.1.tar.gz -> facter-3.9.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4058eb7bc8c44a7da00cde462109a8a3
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.3 b/metadata/md5-cache/dev-ruby/facter-3.9.3
deleted file mode 100644
index 1604449bf5ca..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.3.tar.gz -> facter-3.9.3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db838d7a8270cc2eec3188595625615f
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.4 b/metadata/md5-cache/dev-ruby/facter-3.9.4
deleted file mode 100644
index ac88bc9c97fa..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=6
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.4.tar.gz -> facter-3.9.4.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=899776969006853578826422853cd5cd
diff --git a/metadata/md5-cache/dev-ruby/facter-3.9.5 b/metadata/md5-cache/dev-ruby/facter-3.9.5
new file mode 100644
index 000000000000..3ef6847435eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/facter-3.9.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/leatherman-1.0.0 dev-cpp/cpp-hocon dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 sys-devel/make >=dev-util/cmake-3.7.2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
+EAPI=6
+HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:* sys-apps/util-linux app-emulation/virt-what net-misc/curl >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/puppetlabs/facter/archive/3.9.5.tar.gz -> facter-3.9.5.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=899776969006853578826422853cd5cd
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.2 b/metadata/md5-cache/dev-ruby/flog-4.6.2
new file mode 100644
index 000000000000..31fcd0bb3147
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.2
@@ -0,0 +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_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[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=Flog reports the most tortured code in an easy to read pain report
+EAPI=6
+HOMEPAGE=http://ruby.sadi.st/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/path_expander:1[ruby_targets_ruby22] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby22] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/path_expander:1[ruby_targets_ruby23] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.8:4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/path_expander:1[ruby_targets_ruby24] >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.8:4[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/flog-4.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_=65bab3194a4c63025836a6d420954fd7
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.30 b/metadata/md5-cache/dev-ruby/gettext-setup-0.30
new file mode 100644
index 000000000000..319ab0b48495
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby24] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby24] dev-ruby/locale[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 gem to ease i18n
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/gettext-setup-gem
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby24] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby24] dev-ruby/locale[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=https://github.com/puppetlabs/gettext-setup-gem/archive/0.30.tar.gz -> gettext-setup-0.30.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_=3c278ba4f49873e006a22247563eee96
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index c97ff7c78452..18174bc10c0b 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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? ( 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/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/qed[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/qed[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ae[ruby_targets_ruby24] >=dev-ruby/ansi-1.3[ruby_targets_ruby24] dev-ruby/rubytest[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? ( 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=Lemon is a unit testing framework
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/lemon/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[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/ae[ruby_targets_ruby22] >=dev-ruby/ansi-1.3[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ae[ruby_targets_ruby23] >=dev-ruby/ansi-1.3[ruby_targets_ruby23] dev-ruby/rubytest[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ae[ruby_targets_ruby24] >=dev-ruby/ansi-1.3[ruby_targets_ruby24] dev-ruby/rubytest[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/lemon-0.9.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_=cffa56a4fee38bd338e037261bc0f5cf
+_md5_=9b1f7fe3552ddbf1db1fa7159b4ac966
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
index a4eb14b0f45e..6e5366269d5a 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Non-interactive SSH processing in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 IUSE=sodium test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby22] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby23] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[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=https://github.com/net-ssh/net-ssh/archive/v4.1.0.tar.gz -> net-ssh-git-4.1.0.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_=6a13179b26c5b406cc34f5e0ce5134fd
+_md5_=95623d8c2157b7baa97d656fb0531314
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-4.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-4.2.0
index d72c5c00442f..3ecda6c28d57 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-4.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-4.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Non-interactive SSH processing in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 IUSE=sodium test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby22] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby23] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] sodium? ( dev-ruby/rbnacl:4[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[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=https://github.com/net-ssh/net-ssh/archive/v4.2.0.tar.gz -> net-ssh-git-4.2.0.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_=d643a2157c980ebbf3d1791f76c60323
+_md5_=5544cc02ad045b889a42b94fbc9d5a7f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index 7360afdd243d..0af9faa88e4f 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A simple library to assist in enabling tunneled Net::SSH connections
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/net-ssh-gateway
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/net-ssh-4.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/net-ssh-4.0.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 )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
 _eclasses_=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_=b6e14d18f29b444e1ec8e0ce5d0a5ebb
+_md5_=532bb024bca7442f67acdb9ff46a118e
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.0.2 b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
new file mode 100644
index 000000000000..07a1ec62ab7a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[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=Parse and decompose a domain name into top level domain, domain and subdomains
+EAPI=6
+HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~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=3
+SRC_URI=mirror://rubygems/public_suffix-3.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_=adceba2b127a27d6d648cb236f3fb449
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
index 10d57264baf4..aa2aaf8f6937 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and
 EAPI=5
 HOMEPAGE=https://github.com/cryptosphere/rbnacl
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_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/rbnacl-4.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_=f935e825fbba106482fc9ecef856a94b
+_md5_=1b992135cc679a465b5aa0414c23b72d
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-5.0.0 b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
index a242809195b8..85fa28d4994d 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
+++ b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and
 EAPI=6
 HOMEPAGE=https://github.com/cryptosphere/rbnacl
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_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=5
 SRC_URI=mirror://rubygems/rbnacl-5.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_=58a191e7be95d8c28eced7fcd38c3bba
+_md5_=ef67473f5bb06a0abb738df52f57a38f
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
index 09b2015a4a2e..325de2f6b1d0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Set of matchers and helpers to allow you test your APIs responses.
 EAPI=5
 HOMEPAGE=https://github.com/waterlink/rspec-json_expectations
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+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=1
 SRC_URI=mirror://rubygems/rspec-json_expectations-2.1.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_=4eae6ddc7b427146f51247ace1c85d38
+_md5_=2292400be3818af4813243607fab1631
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
index 3411356a3897..609604a88d22 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
@@ -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] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[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/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/test-unit:2[ruby_targets_ruby22] dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[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/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 module for profiling Ruby code
 EAPI=6
 HOMEPAGE=https://github.com/ruby-prof/ruby-prof
-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 ~ppc ~x86
 LICENSE=BSD
-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/ruby-prof/ruby-prof/archive/v0.17.0.tar.gz -> ruby-prof-0.17.0.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_=b39ca35a3837c7f6ba6ed8a45d70af74
+_md5_=b4e47cc6016ae430d5c05cb1348b377a
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
index 402f0add6725..4ce355d6ed74 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
@@ -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 )
+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 )
 DESCRIPTION=A Romaji <-> Kana conversion library for Ruby
 EAPI=5
 HOMEPAGE=http://0xcc.net/ruby-romkan/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 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 )
-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 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a107b67768d9c8fc12f594972f6d6326
+_md5_=d444889a9dd53fcc36b9719bdc1a3043
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
index fc5206add087..d553621ed7e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) 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 )
 DESCRIPTION=Ruby/SDL: Ruby bindings for SDL
 EAPI=5
 HOMEPAGE=http://www.kmc.gr.jp/~ohai/rubysdl.en.html
-IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=image mixer truetype mpeg sge elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
 KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image? ( >=media-libs/sdl-image-1.2.2 ) mixer? ( >=media-libs/sdl-mixer-1.2.4 ) mpeg? ( >=media-libs/smpeg-0.4.4-r1 ) sge? ( media-libs/sge ) 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 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bb54405b5ec666981a45c1c9cf9e9a4e
+_md5_=09245c199ade160148a513a1fece1ce3
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 2ab9ff030e2c..267873326496 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.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=ruby shadow bindings
 EAPI=5
 HOMEPAGE=https://github.com/apalmblad/ruby-shadow http://ttsky.net
-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 ~arm hppa ppc ~ppc64 ~sparc 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/ruby-shadow-2.5.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_=4a086f281429649cd7494ba0ffe3b4d8
+_md5_=9ba0ba4960df16b6579238bb4375f929
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 2ddd3aaa7a04..938e9a187866 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -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=A Ruby interface to termios
 EAPI=5
 HOMEPAGE=http://arika.org/ruby/termios
-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 ~hppa ~mips ~ppc ~x86 ~x86-macos
 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/ruby-termios-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_=30e37b6757d4d1ad23b4b7c19939fe61
+_md5_=4a5cf542cc51041d95410c076af1f711
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index 2d4c927add78..c6e0b269c587 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -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 ruby library for performing Yadis service discovery
 EAPI=5
 HOMEPAGE=http://yadis.rubyforge.org/
-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 ~ppc ~x86
 LICENSE=GPL-2
-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/ruby-yadis-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_=bc552c3c61e8630943ab6d543dae902b
+_md5_=7345b0dff45219ffa62a4e98c7203f02
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.6.0 b/metadata/md5-cache/dev-ruby/rubypants-0.6.0
index 43f5b0f4161d..269b64a8faf0 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.6.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.6.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? ( 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? ( 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 port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~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=mirror://rubygems/rubypants-0.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_=a98b4912ff979799cfc51c89bce8f708
+_md5_=0e5ef7bca9ac0753a3e34389f75ddb4e
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index 3dce5355bb19..63e4cb9dc04b 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/ae[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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? ( 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/ae[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ae[ruby_targets_ruby23] dev-ruby/qed[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/ae[ruby_targets_ruby24] dev-ruby/qed[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[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? ( 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 Test is a universal test harness for Ruby
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/rubytest/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[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/ansi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[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/rubytest-0.8.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_=6b7ae70dee8415f462e7f2006c0d4242
+_md5_=91af7ff504d9b1e1fdba9c9ac312eab0
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index 197d7439e73f..e95cdfd868b2 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.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? ( 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/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[ruby_targets_ruby24] >=dev-ruby/rubytest-0.8.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? ( 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=Rubytest CLI is a command-line interface for Rubytest
 EAPI=5
 HOMEPAGE=https://rubyworks.github.io/rubytest-cli/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.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/ansi[ruby_targets_ruby22] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ansi[ruby_targets_ruby23] >=dev-ruby/rubytest-0.8.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ansi[ruby_targets_ruby24] >=dev-ruby/rubytest-0.8.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
 SRC_URI=mirror://rubygems/rubytest-cli-0.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_=7924778cd9a67f0410f1dab089c55510
+_md5_=2193205b02edc6699426586fdc7bf5a6
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
index a6af31e43a06..39714e975883 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.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/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-3.13[ruby_targets_ruby22] dev-ruby/hoe-seattlerb[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby25] dev-ruby/hoe-seattlerb[ruby_targets_ruby25] >=dev-ruby/minitest-5.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/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=Processor for s-expressions created as part of the ParseTree project
 EAPI=6
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-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 ~arm ~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=GPL-2
-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=4
 SRC_URI=mirror://rubygems/sexp_processor-4.10.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_=becc77c2bb16365105e84302cc722a4b
+_md5_=b6f01be8c481d6b7ce5dd112f51c989b
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 9f6b1089bb23..6a16822c8cea 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/goosh-1.3 b/metadata/md5-cache/dev-scheme/goosh-1.3
deleted file mode 100644
index 7206815640c8..000000000000
--- a/metadata/md5-cache/dev-scheme/goosh-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-scheme/guile-1.6
-DESCRIPTION=Small process-control library for Guile
-EAPI=0
-HOMEPAGE=http://arglist.com/guile/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-scheme/guile-1.6
-SLOT=0
-SRC_URI=http://arglist.com/guile/goosh-1.3/goosh-1.3.tar.gz
-_md5_=e9bbe878b6fd67ed0a90ef6ec2af3bfd
diff --git a/metadata/md5-cache/dev-scheme/goosh-1.3-r1 b/metadata/md5-cache/dev-scheme/goosh-1.3-r1
new file mode 100644
index 000000000000..29ba12ddcba3
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=dev-scheme/guile-1.6
+DESCRIPTION=Small process-control library for Guile
+EAPI=6
+HOMEPAGE=http://arglist.com/guile/
+KEYWORDS=~amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-scheme/guile-1.6
+SLOT=0
+SRC_URI=http://arglist.com/guile/goosh-1.3/goosh-1.3.tar.gz
+_md5_=bd8b9d497a2120498ae5d7a2e6e6aaf1
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3 b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
index eb04869d8552..32db4730c051 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-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
+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
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.14.tar.gz
 _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_=be80e41ecdbb82818c2477e4e3952008
+_md5_=16c4b0e5dd33965b720dec9441204643
diff --git a/metadata/md5-cache/dev-scheme/net-http-0.3.1 b/metadata/md5-cache/dev-scheme/net-http-0.3.1
deleted file mode 100644
index deff58440230..000000000000
--- a/metadata/md5-cache/dev-scheme/net-http-0.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-scheme/guile
-DESCRIPTION=Library for doing HTTP client-side programming in Guile
-EAPI=0
-HOMEPAGE=http://evan.prodromou.name/software/net-http/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile
-SLOT=0
-SRC_URI=http://evan.prodromou.name/software/net-http/net-http-0.3.1.tar.gz
-_md5_=1533e4682531ba22ff884a0ad26aa5e1
diff --git a/metadata/md5-cache/dev-scheme/net-http-0.3.1-r1 b/metadata/md5-cache/dev-scheme/net-http-0.3.1-r1
index 103ece53e81c..9f5d5ed4781a 100644
--- a/metadata/md5-cache/dev-scheme/net-http-0.3.1-r1
+++ b/metadata/md5-cache/dev-scheme/net-http-0.3.1-r1
@@ -3,9 +3,9 @@ DEPEND=dev-scheme/guile
 DESCRIPTION=Library for doing HTTP client-side programming in Guile
 EAPI=4
 HOMEPAGE=http://evan.prodromou.name/software/net-http/
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-scheme/guile
 SLOT=0
 SRC_URI=http://evan.prodromou.name/software/net-http/net-http-0.3.1.tar.gz
-_md5_=d2775e4e5794153b7f78c5176a74a04e
+_md5_=85d980b4e048b0f7e1173b1e829ffe5a
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 580b73e15556..02547ed82fcb 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
index 0815e336b775..715fe845d85d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2017-r1
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-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-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=!<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-latexrecommended-2009 !dev-texlive/texlive-documentation-base !<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2015[luajittex?] !<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2017.tar.xz mirror://gentoo/texlive-module-bibtex-2017.tar.xz mirror://gentoo/texlive-module-cm-2017.tar.xz mirror://gentoo/texlive-module-enctex-2017.tar.xz mirror://gentoo/texlive-module-etex-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg-2017.tar.xz mirror://gentoo/texlive-module-graphics-def-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2017.tar.xz mirror://gentoo/texlive-module-ifluatex-2017.tar.xz mirror://gentoo/texlive-module-ifxetex-2017.tar.xz mirror://gentoo/texlive-module-knuth-lib-2017.tar.xz mirror://gentoo/texlive-module-knuth-local-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2017.tar.xz mirror://gentoo/texlive-module-luatex-2017.tar.xz mirror://gentoo/texlive-module-makeindex-2017.tar.xz mirror://gentoo/texlive-module-metafont-2017.tar.xz mirror://gentoo/texlive-module-mflogo-2017.tar.xz mirror://gentoo/texlive-module-mfware-2017.tar.xz mirror://gentoo/texlive-module-pdftex-2017.tar.xz mirror://gentoo/texlive-module-plain-2017.tar.xz mirror://gentoo/texlive-module-tex-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2017.tar.xz mirror://gentoo/texlive-module-texlive-common-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2017.tar.xz mirror://gentoo/texlive-module-texlive-en-2017.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2017.tar.xz mirror://gentoo/texlive-module-unicode-data-2017.tar.xz mirror://gentoo/texlive-module-updmap-map-2017.tar.xz mirror://gentoo/texlive-module-collection-basic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2017.tar.xz mirror://gentoo/texlive-module-cm.doc-2017.tar.xz mirror://gentoo/texlive-module-enctex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex.doc-2017.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex.doc-2017.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2017.tar.xz mirror://gentoo/texlive-module-mfware.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2017.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2017.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2017.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2017.tar.xz mirror://gentoo/texlive-module-mflogo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4cfccd45ac7e28c6a2bee99a8f1102c8
+_md5_=6bcfca747eb831931d6c62013ebce7aa
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
index 6a13d4a9a5ec..6d2036c70653 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Artistic GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !=dev-texlive/texlive-latexextra-2007* !<dev-texlive/texlive-latex-2009 !<dev-texlive/texlive-publishers-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2017.tar.xz mirror://gentoo/texlive-module-ajl-2017.tar.xz mirror://gentoo/texlive-module-amsrefs-2017.tar.xz mirror://gentoo/texlive-module-apacite-2017.tar.xz mirror://gentoo/texlive-module-apalike2-2017.tar.xz mirror://gentoo/texlive-module-archaeologie-2017.tar.xz mirror://gentoo/texlive-module-beebe-2017.tar.xz mirror://gentoo/texlive-module-besjournals-2017.tar.xz mirror://gentoo/texlive-module-bestpapers-2017.tar.xz mirror://gentoo/texlive-module-bibarts-2017.tar.xz mirror://gentoo/texlive-module-biber-2017.tar.xz mirror://gentoo/texlive-module-bibexport-2017.tar.xz mirror://gentoo/texlive-module-bibhtml-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2017.tar.xz mirror://gentoo/texlive-module-biblist-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2017.tar.xz mirror://gentoo/texlive-module-bibtopic-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2017.tar.xz mirror://gentoo/texlive-module-bibunits-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst-2017.tar.xz mirror://gentoo/texlive-module-bookdb-2017.tar.xz mirror://gentoo/texlive-module-breakcites-2017.tar.xz mirror://gentoo/texlive-module-cell-2017.tar.xz mirror://gentoo/texlive-module-chbibref-2017.tar.xz mirror://gentoo/texlive-module-chicago-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote-2017.tar.xz mirror://gentoo/texlive-module-chembst-2017.tar.xz mirror://gentoo/texlive-module-chscite-2017.tar.xz mirror://gentoo/texlive-module-citeall-2017.tar.xz mirror://gentoo/texlive-module-collref-2017.tar.xz mirror://gentoo/texlive-module-compactbib-2017.tar.xz mirror://gentoo/texlive-module-crossrefware-2017.tar.xz mirror://gentoo/texlive-module-custom-bib-2017.tar.xz mirror://gentoo/texlive-module-din1505-2017.tar.xz mirror://gentoo/texlive-module-dk-bib-2017.tar.xz mirror://gentoo/texlive-module-doipubmed-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2017.tar.xz mirror://gentoo/texlive-module-economic-2017.tar.xz mirror://gentoo/texlive-module-fbs-2017.tar.xz mirror://gentoo/texlive-module-figbib-2017.tar.xz mirror://gentoo/texlive-module-footbib-2017.tar.xz mirror://gentoo/texlive-module-francais-bst-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2017.tar.xz mirror://gentoo/texlive-module-harvard-2017.tar.xz mirror://gentoo/texlive-module-harvmac-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs-2017.tar.xz mirror://gentoo/texlive-module-ijqc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib-2017.tar.xz mirror://gentoo/texlive-module-iopart-num-2017.tar.xz mirror://gentoo/texlive-module-jneurosci-2017.tar.xz mirror://gentoo/texlive-module-jurabib-2017.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib-2017.tar.xz mirror://gentoo/texlive-module-listbib-2017.tar.xz mirror://gentoo/texlive-module-logreq-2017.tar.xz mirror://gentoo/texlive-module-margbib-2017.tar.xz mirror://gentoo/texlive-module-multibib-2017.tar.xz mirror://gentoo/texlive-module-multibibliography-2017.tar.xz mirror://gentoo/texlive-module-munich-2017.tar.xz mirror://gentoo/texlive-module-nar-2017.tar.xz mirror://gentoo/texlive-module-nmbib-2017.tar.xz mirror://gentoo/texlive-module-notes2bib-2017.tar.xz mirror://gentoo/texlive-module-notex-bst-2017.tar.xz mirror://gentoo/texlive-module-oscola-2017.tar.xz mirror://gentoo/texlive-module-perception-2017.tar.xz mirror://gentoo/texlive-module-pnas2009-2017.tar.xz mirror://gentoo/texlive-module-rsc-2017.tar.xz mirror://gentoo/texlive-module-showtags-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2017.tar.xz mirror://gentoo/texlive-module-splitbib-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2017.tar.xz mirror://gentoo/texlive-module-urlbst-2017.tar.xz mirror://gentoo/texlive-module-usebib-2017.tar.xz mirror://gentoo/texlive-module-vak-2017.tar.xz mirror://gentoo/texlive-module-xcite-2017.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2017.tar.xz mirror://gentoo/texlive-module-apacite.doc-2017.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2017.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2017.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2017.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2017.tar.xz mirror://gentoo/texlive-module-biber.doc-2017.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2017.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2017.tar.xz mirror://gentoo/texlive-module-biblist.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2017.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2017.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2017.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2017.tar.xz mirror://gentoo/texlive-module-cell.doc-2017.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2017.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2017.tar.xz mirror://gentoo/texlive-module-chembst.doc-2017.tar.xz mirror://gentoo/texlive-module-chscite.doc-2017.tar.xz mirror://gentoo/texlive-module-citeall.doc-2017.tar.xz mirror://gentoo/texlive-module-collref.doc-2017.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-din1505.doc-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2017.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2017.tar.xz mirror://gentoo/texlive-module-economic.doc-2017.tar.xz mirror://gentoo/texlive-module-figbib.doc-2017.tar.xz mirror://gentoo/texlive-module-footbib.doc-2017.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2017.tar.xz mirror://gentoo/texlive-module-harvard.doc-2017.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2017.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2017.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2017.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2017.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2017.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2017.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-listbib.doc-2017.tar.xz mirror://gentoo/texlive-module-logreq.doc-2017.tar.xz mirror://gentoo/texlive-module-margbib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibib.doc-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2017.tar.xz mirror://gentoo/texlive-module-munich.doc-2017.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2017.tar.xz mirror://gentoo/texlive-module-oscola.doc-2017.tar.xz mirror://gentoo/texlive-module-perception.doc-2017.tar.xz mirror://gentoo/texlive-module-rsc.doc-2017.tar.xz mirror://gentoo/texlive-module-showtags.doc-2017.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2017.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2017.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2017.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2017.tar.xz mirror://gentoo/texlive-module-usebib.doc-2017.tar.xz mirror://gentoo/texlive-module-vak.doc-2017.tar.xz mirror://gentoo/texlive-module-xcite.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2017.tar.xz mirror://gentoo/texlive-module-apacite.source-2017.tar.xz mirror://gentoo/texlive-module-bibarts.source-2017.tar.xz mirror://gentoo/texlive-module-biber.source-2017.tar.xz mirror://gentoo/texlive-module-bibexport.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.source-2017.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2017.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2017.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2017.tar.xz mirror://gentoo/texlive-module-bibunits.source-2017.tar.xz mirror://gentoo/texlive-module-chembst.source-2017.tar.xz mirror://gentoo/texlive-module-chscite.source-2017.tar.xz mirror://gentoo/texlive-module-collref.source-2017.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2017.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2017.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2017.tar.xz mirror://gentoo/texlive-module-footbib.source-2017.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2017.tar.xz mirror://gentoo/texlive-module-harvard.source-2017.tar.xz mirror://gentoo/texlive-module-jurabib.source-2017.tar.xz mirror://gentoo/texlive-module-ltb2bib.source-2017.tar.xz mirror://gentoo/texlive-module-listbib.source-2017.tar.xz mirror://gentoo/texlive-module-margbib.source-2017.tar.xz mirror://gentoo/texlive-module-multibib.source-2017.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2017.tar.xz mirror://gentoo/texlive-module-nmbib.source-2017.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2017.tar.xz mirror://gentoo/texlive-module-rsc.source-2017.tar.xz mirror://gentoo/texlive-module-splitbib.source-2017.tar.xz mirror://gentoo/texlive-module-urlbst.source-2017.tar.xz mirror://gentoo/texlive-module-usebib.source-2017.tar.xz mirror://gentoo/texlive-module-xcite.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=569e78c1afb91b17a1e61d9b262551e4
+_md5_=1cee55c6e08720d03baf31c054f76f3a
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2017 b/metadata/md5-cache/dev-texlive/texlive-context-2017
index f4f5087da596..94c099fcdaf5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2010 !<dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2017.tar.xz mirror://gentoo/texlive-module-jmn-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-context-account-2017.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2017.tar.xz mirror://gentoo/texlive-module-context-animation-2017.tar.xz mirror://gentoo/texlive-module-context-annotation-2017.tar.xz mirror://gentoo/texlive-module-context-bnf-2017.tar.xz mirror://gentoo/texlive-module-context-chromato-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2017.tar.xz mirror://gentoo/texlive-module-context-degrade-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2017.tar.xz mirror://gentoo/texlive-module-context-filter-2017.tar.xz mirror://gentoo/texlive-module-context-french-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage-2017.tar.xz mirror://gentoo/texlive-module-context-gantt-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2017.tar.xz mirror://gentoo/texlive-module-context-inifile-2017.tar.xz mirror://gentoo/texlive-module-context-layout-2017.tar.xz mirror://gentoo/texlive-module-context-letter-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets-2017.tar.xz mirror://gentoo/texlive-module-context-rst-2017.tar.xz mirror://gentoo/texlive-module-context-ruby-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2017.tar.xz mirror://gentoo/texlive-module-context-title-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator-2017.tar.xz mirror://gentoo/texlive-module-context-typearea-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts-2017.tar.xz mirror://gentoo/texlive-module-context-vim-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2017.tar.xz mirror://gentoo/texlive-module-collection-context-2017.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2017.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-context-account.doc-2017.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2017.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2017.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2017.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2017.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-french.doc-2017.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2017.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2017.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2017.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2017.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2017.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2017.tar.xz mirror://gentoo/texlive-module-context-title.doc-2017.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2017.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2017.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2017.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ba0497ab4b314e5975eae2d4b0c34cc7
+_md5_=6210cd63ce2c9b169d8ff4bca2ee2978
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
index 6e01f83e0d03..da963527525b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-langpolish-2007* !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2017.tar.xz mirror://gentoo/texlive-module-academicons-2017.tar.xz mirror://gentoo/texlive-module-accanthis-2017.tar.xz mirror://gentoo/texlive-module-adforn-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols-2017.tar.xz mirror://gentoo/texlive-module-aecc-2017.tar.xz mirror://gentoo/texlive-module-alegreya-2017.tar.xz mirror://gentoo/texlive-module-allrunes-2017.tar.xz mirror://gentoo/texlive-module-almfixed-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro-2017.tar.xz mirror://gentoo/texlive-module-antiqua-2017.tar.xz mirror://gentoo/texlive-module-antt-2017.tar.xz mirror://gentoo/texlive-module-archaic-2017.tar.xz mirror://gentoo/texlive-module-arev-2017.tar.xz mirror://gentoo/texlive-module-arimo-2017.tar.xz mirror://gentoo/texlive-module-asapsym-2017.tar.xz mirror://gentoo/texlive-module-ascii-font-2017.tar.xz mirror://gentoo/texlive-module-aspectratio-2017.tar.xz mirror://gentoo/texlive-module-astro-2017.tar.xz mirror://gentoo/texlive-module-augie-2017.tar.xz mirror://gentoo/texlive-module-auncial-new-2017.tar.xz mirror://gentoo/texlive-module-aurical-2017.tar.xz mirror://gentoo/texlive-module-b1encoding-2017.tar.xz mirror://gentoo/texlive-module-barcodes-2017.tar.xz mirror://gentoo/texlive-module-baskervald-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx-2017.tar.xz mirror://gentoo/texlive-module-baskervillef-2017.tar.xz mirror://gentoo/texlive-module-bbding-2017.tar.xz mirror://gentoo/texlive-module-bbm-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros-2017.tar.xz mirror://gentoo/texlive-module-bbold-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1-2017.tar.xz mirror://gentoo/texlive-module-belleek-2017.tar.xz mirror://gentoo/texlive-module-bera-2017.tar.xz mirror://gentoo/texlive-module-berenisadf-2017.tar.xz mirror://gentoo/texlive-module-beuron-2017.tar.xz mirror://gentoo/texlive-module-bguq-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1-2017.tar.xz mirror://gentoo/texlive-module-boisik-2017.tar.xz mirror://gentoo/texlive-module-bookhands-2017.tar.xz mirror://gentoo/texlive-module-boondox-2017.tar.xz mirror://gentoo/texlive-module-braille-2017.tar.xz mirror://gentoo/texlive-module-brushscr-2017.tar.xz mirror://gentoo/texlive-module-cabin-2017.tar.xz mirror://gentoo/texlive-module-caladea-2017.tar.xz mirror://gentoo/texlive-module-calligra-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1-2017.tar.xz mirror://gentoo/texlive-module-cantarell-2017.tar.xz mirror://gentoo/texlive-module-carlito-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2017.tar.xz mirror://gentoo/texlive-module-ccicons-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm-2017.tar.xz mirror://gentoo/texlive-module-cherokee-2017.tar.xz mirror://gentoo/texlive-module-chivo-2017.tar.xz mirror://gentoo/texlive-module-cinzel-2017.tar.xz mirror://gentoo/texlive-module-clearsans-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode-2017.tar.xz mirror://gentoo/texlive-module-cmbright-2017.tar.xz mirror://gentoo/texlive-module-cmexb-2017.tar.xz mirror://gentoo/texlive-module-cmll-2017.tar.xz mirror://gentoo/texlive-module-cmpica-2017.tar.xz mirror://gentoo/texlive-module-cmtiup-2017.tar.xz mirror://gentoo/texlive-module-cochineal-2017.tar.xz mirror://gentoo/texlive-module-comfortaa-2017.tar.xz mirror://gentoo/texlive-module-comicneue-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled-2017.tar.xz mirror://gentoo/texlive-module-crimson-2017.tar.xz mirror://gentoo/texlive-module-cryst-2017.tar.xz mirror://gentoo/texlive-module-cyklop-2017.tar.xz mirror://gentoo/texlive-module-dancers-2017.tar.xz mirror://gentoo/texlive-module-dantelogo-2017.tar.xz mirror://gentoo/texlive-module-dejavu-2017.tar.xz mirror://gentoo/texlive-module-dice-2017.tar.xz mirror://gentoo/texlive-module-dictsym-2017.tar.xz mirror://gentoo/texlive-module-dingbat-2017.tar.xz mirror://gentoo/texlive-module-doublestroke-2017.tar.xz mirror://gentoo/texlive-module-dozenal-2017.tar.xz mirror://gentoo/texlive-module-drm-2017.tar.xz mirror://gentoo/texlive-module-droid-2017.tar.xz mirror://gentoo/texlive-module-duerer-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex-2017.tar.xz mirror://gentoo/texlive-module-dutchcal-2017.tar.xz mirror://gentoo/texlive-module-ean-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2017.tar.xz mirror://gentoo/texlive-module-ecc-2017.tar.xz mirror://gentoo/texlive-module-eco-2017.tar.xz mirror://gentoo/texlive-module-eiad-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2017.tar.xz mirror://gentoo/texlive-module-electrum-2017.tar.xz mirror://gentoo/texlive-module-elvish-2017.tar.xz mirror://gentoo/texlive-module-epigrafica-2017.tar.xz mirror://gentoo/texlive-module-epsdice-2017.tar.xz mirror://gentoo/texlive-module-erewhon-2017.tar.xz mirror://gentoo/texlive-module-esrelation-2017.tar.xz mirror://gentoo/texlive-module-esstix-2017.tar.xz mirror://gentoo/texlive-module-esvect-2017.tar.xz mirror://gentoo/texlive-module-eulervm-2017.tar.xz mirror://gentoo/texlive-module-euxm-2017.tar.xz mirror://gentoo/texlive-module-fbb-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol-2017.tar.xz mirror://gentoo/texlive-module-fetamont-2017.tar.xz mirror://gentoo/texlive-module-feyn-2017.tar.xz mirror://gentoo/texlive-module-fge-2017.tar.xz mirror://gentoo/texlive-module-fira-2017.tar.xz mirror://gentoo/texlive-module-foekfont-2017.tar.xz mirror://gentoo/texlive-module-fonetika-2017.tar.xz mirror://gentoo/texlive-module-fontawesome-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-fourier-2017.tar.xz mirror://gentoo/texlive-module-fouriernc-2017.tar.xz mirror://gentoo/texlive-module-frcursive-2017.tar.xz mirror://gentoo/texlive-module-frederika2016-2017.tar.xz mirror://gentoo/texlive-module-genealogy-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos-2017.tar.xz mirror://gentoo/texlive-module-gillcm-2017.tar.xz mirror://gentoo/texlive-module-gillius-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2017.tar.xz mirror://gentoo/texlive-module-gofonts-2017.tar.xz mirror://gentoo/texlive-module-gothic-2017.tar.xz mirror://gentoo/texlive-module-greenpoint-2017.tar.xz mirror://gentoo/texlive-module-grotesq-2017.tar.xz mirror://gentoo/texlive-module-hacm-2017.tar.xz mirror://gentoo/texlive-module-hands-2017.tar.xz mirror://gentoo/texlive-module-heuristica-2017.tar.xz mirror://gentoo/texlive-module-hfbright-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty-2017.tar.xz mirror://gentoo/texlive-module-ifsym-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish-2017.tar.xz mirror://gentoo/texlive-module-inconsolata-2017.tar.xz mirror://gentoo/texlive-module-initials-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2017.tar.xz mirror://gentoo/texlive-module-iwona-2017.tar.xz mirror://gentoo/texlive-module-jablantile-2017.tar.xz mirror://gentoo/texlive-module-jamtimes-2017.tar.xz mirror://gentoo/texlive-module-junicode-2017.tar.xz mirror://gentoo/texlive-module-kixfont-2017.tar.xz mirror://gentoo/texlive-module-knuthotherfonts-2017.tar.xz mirror://gentoo/texlive-module-kpfonts-2017.tar.xz mirror://gentoo/texlive-module-kurier-2017.tar.xz mirror://gentoo/texlive-module-lato-2017.tar.xz mirror://gentoo/texlive-module-lfb-2017.tar.xz mirror://gentoo/texlive-module-libertine-2017.tar.xz mirror://gentoo/texlive-module-libertinegc-2017.tar.xz mirror://gentoo/texlive-module-libertinus-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville-2017.tar.xz mirror://gentoo/texlive-module-librebodoni-2017.tar.xz mirror://gentoo/texlive-module-librecaslon-2017.tar.xz mirror://gentoo/texlive-module-libris-2017.tar.xz mirror://gentoo/texlive-module-linearA-2017.tar.xz mirror://gentoo/texlive-module-lobster2-2017.tar.xz mirror://gentoo/texlive-module-lxfonts-2017.tar.xz mirror://gentoo/texlive-module-ly1-2017.tar.xz mirror://gentoo/texlive-module-mathabx-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2017.tar.xz mirror://gentoo/texlive-module-mathdesign-2017.tar.xz mirror://gentoo/texlive-module-mdputu-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol-2017.tar.xz mirror://gentoo/texlive-module-merriweather-2017.tar.xz mirror://gentoo/texlive-module-miama-2017.tar.xz mirror://gentoo/texlive-module-mintspirit-2017.tar.xz mirror://gentoo/texlive-module-missaali-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol-2017.tar.xz mirror://gentoo/texlive-module-montserrat-2017.tar.xz mirror://gentoo/texlive-module-mweights-2017.tar.xz mirror://gentoo/texlive-module-newpx-2017.tar.xz mirror://gentoo/texlive-module-newtx-2017.tar.xz mirror://gentoo/texlive-module-newtxsf-2017.tar.xz mirror://gentoo/texlive-module-newtxtt-2017.tar.xz mirror://gentoo/texlive-module-nimbus15-2017.tar.xz mirror://gentoo/texlive-module-nkarta-2017.tar.xz mirror://gentoo/texlive-module-noto-2017.tar.xz mirror://gentoo/texlive-module-obnov-2017.tar.xz mirror://gentoo/texlive-module-ocherokee-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2017.tar.xz mirror://gentoo/texlive-module-ogham-2017.tar.xz mirror://gentoo/texlive-module-oinuit-2017.tar.xz mirror://gentoo/texlive-module-old-arrows-2017.tar.xz mirror://gentoo/texlive-module-oldlatin-2017.tar.xz mirror://gentoo/texlive-module-oldstandard-2017.tar.xz mirror://gentoo/texlive-module-opensans-2017.tar.xz mirror://gentoo/texlive-module-orkhun-2017.tar.xz mirror://gentoo/texlive-module-overlock-2017.tar.xz mirror://gentoo/texlive-module-pacioli-2017.tar.xz mirror://gentoo/texlive-module-paratype-2017.tar.xz mirror://gentoo/texlive-module-phaistos-2017.tar.xz mirror://gentoo/texlive-module-phonetic-2017.tar.xz mirror://gentoo/texlive-module-pigpen-2017.tar.xz mirror://gentoo/texlive-module-playfair-2017.tar.xz mirror://gentoo/texlive-module-poltawski-2017.tar.xz mirror://gentoo/texlive-module-prodint-2017.tar.xz mirror://gentoo/texlive-module-punk-2017.tar.xz mirror://gentoo/texlive-module-punk-latex-2017.tar.xz mirror://gentoo/texlive-module-punknova-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2017.tar.xz mirror://gentoo/texlive-module-quattrocento-2017.tar.xz mirror://gentoo/texlive-module-raleway-2017.tar.xz mirror://gentoo/texlive-module-recycle-2017.tar.xz mirror://gentoo/texlive-module-roboto-2017.tar.xz mirror://gentoo/texlive-module-romande-2017.tar.xz mirror://gentoo/texlive-module-rosario-2017.tar.xz mirror://gentoo/texlive-module-rsfso-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2017.tar.xz mirror://gentoo/texlive-module-sauter-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts-2017.tar.xz mirror://gentoo/texlive-module-schulschriften-2017.tar.xz mirror://gentoo/texlive-module-semaphor-2017.tar.xz mirror://gentoo/texlive-module-skull-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2017.tar.xz mirror://gentoo/texlive-module-starfont-2017.tar.xz mirror://gentoo/texlive-module-staves-2017.tar.xz mirror://gentoo/texlive-module-stix-2017.tar.xz mirror://gentoo/texlive-module-superiors-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols-2017.tar.xz mirror://gentoo/texlive-module-tapir-2017.tar.xz mirror://gentoo/texlive-module-tempora-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript-2017.tar.xz mirror://gentoo/texlive-module-tfrupee-2017.tar.xz mirror://gentoo/texlive-module-tinos-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts-2017.tar.xz mirror://gentoo/texlive-module-trajan-2017.tar.xz mirror://gentoo/texlive-module-txfontsb-2017.tar.xz mirror://gentoo/texlive-module-txuprcal-2017.tar.xz mirror://gentoo/texlive-module-typicons-2017.tar.xz mirror://gentoo/texlive-module-umtypewriter-2017.tar.xz mirror://gentoo/texlive-module-universa-2017.tar.xz mirror://gentoo/texlive-module-universalis-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm-2017.tar.xz mirror://gentoo/texlive-module-urwchancal-2017.tar.xz mirror://gentoo/texlive-module-venturisadf-2017.tar.xz mirror://gentoo/texlive-module-wsuipa-2017.tar.xz mirror://gentoo/texlive-module-xcharter-2017.tar.xz mirror://gentoo/texlive-module-xits-2017.tar.xz mirror://gentoo/texlive-module-yfonts-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf-2017.tar.xz mirror://gentoo/texlive-module-zlmtt-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2017.tar.xz mirror://gentoo/texlive-module-academicons.doc-2017.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2017.tar.xz mirror://gentoo/texlive-module-adforn.doc-2017.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-aecc.doc-2017.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2017.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2017.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2017.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2017.tar.xz mirror://gentoo/texlive-module-antt.doc-2017.tar.xz mirror://gentoo/texlive-module-archaic.doc-2017.tar.xz mirror://gentoo/texlive-module-arev.doc-2017.tar.xz mirror://gentoo/texlive-module-arimo.doc-2017.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2017.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2017.tar.xz mirror://gentoo/texlive-module-astro.doc-2017.tar.xz mirror://gentoo/texlive-module-augie.doc-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2017.tar.xz mirror://gentoo/texlive-module-aurical.doc-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2017.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2017.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2017.tar.xz mirror://gentoo/texlive-module-bbding.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm.doc-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold.doc-2017.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-belleek.doc-2017.tar.xz mirror://gentoo/texlive-module-bera.doc-2017.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-beuron.doc-2017.tar.xz mirror://gentoo/texlive-module-bguq.doc-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2017.tar.xz mirror://gentoo/texlive-module-boisik.doc-2017.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2017.tar.xz mirror://gentoo/texlive-module-boondox.doc-2017.tar.xz mirror://gentoo/texlive-module-braille.doc-2017.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2017.tar.xz mirror://gentoo/texlive-module-cabin.doc-2017.tar.xz mirror://gentoo/texlive-module-caladea.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2017.tar.xz mirror://gentoo/texlive-module-carlito.doc-2017.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-chivo.doc-2017.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2017.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2017.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2017.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2017.tar.xz mirror://gentoo/texlive-module-cmll.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2017.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2017.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2017.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2017.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2017.tar.xz mirror://gentoo/texlive-module-crimson.doc-2017.tar.xz mirror://gentoo/texlive-module-cryst.doc-2017.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2017.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2017.tar.xz mirror://gentoo/texlive-module-dice.doc-2017.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2017.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2017.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2017.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2017.tar.xz mirror://gentoo/texlive-module-drm.doc-2017.tar.xz mirror://gentoo/texlive-module-droid.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer.doc-2017.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2017.tar.xz mirror://gentoo/texlive-module-ean.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2017.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2017.tar.xz mirror://gentoo/texlive-module-ecc.doc-2017.tar.xz mirror://gentoo/texlive-module-eco.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad.doc-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-electrum.doc-2017.tar.xz mirror://gentoo/texlive-module-elvish.doc-2017.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2017.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2017.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2017.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2017.tar.xz mirror://gentoo/texlive-module-esstix.doc-2017.tar.xz mirror://gentoo/texlive-module-esvect.doc-2017.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbb.doc-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2017.tar.xz mirror://gentoo/texlive-module-feyn.doc-2017.tar.xz mirror://gentoo/texlive-module-fge.doc-2017.tar.xz mirror://gentoo/texlive-module-fira.doc-2017.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2017.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2017.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2017.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-fourier.doc-2017.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2017.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2017.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2017.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2017.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2017.tar.xz mirror://gentoo/texlive-module-gillius.doc-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2017.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2017.tar.xz mirror://gentoo/texlive-module-gothic.doc-2017.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2017.tar.xz mirror://gentoo/texlive-module-hacm.doc-2017.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2017.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2017.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2017.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2017.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2017.tar.xz mirror://gentoo/texlive-module-initials.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-iwona.doc-2017.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2017.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2017.tar.xz mirror://gentoo/texlive-module-junicode.doc-2017.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2017.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-kurier.doc-2017.tar.xz mirror://gentoo/texlive-module-lato.doc-2017.tar.xz mirror://gentoo/texlive-module-lfb.doc-2017.tar.xz mirror://gentoo/texlive-module-libertine.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2017.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2017.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2017.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2017.tar.xz mirror://gentoo/texlive-module-libris.doc-2017.tar.xz mirror://gentoo/texlive-module-linearA.doc-2017.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ly1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2017.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2017.tar.xz mirror://gentoo/texlive-module-miama.doc-2017.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2017.tar.xz mirror://gentoo/texlive-module-missaali.doc-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-montserrat.doc-2017.tar.xz mirror://gentoo/texlive-module-mweights.doc-2017.tar.xz mirror://gentoo/texlive-module-newpx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtx.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2017.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2017.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2017.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2017.tar.xz mirror://gentoo/texlive-module-noto.doc-2017.tar.xz mirror://gentoo/texlive-module-obnov.doc-2017.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-ogham.doc-2017.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2017.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2017.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2017.tar.xz mirror://gentoo/texlive-module-opensans.doc-2017.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2017.tar.xz mirror://gentoo/texlive-module-overlock.doc-2017.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2017.tar.xz mirror://gentoo/texlive-module-paratype.doc-2017.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2017.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2017.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2017.tar.xz mirror://gentoo/texlive-module-playfair.doc-2017.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2017.tar.xz mirror://gentoo/texlive-module-prodint.doc-2017.tar.xz mirror://gentoo/texlive-module-punk.doc-2017.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-punknova.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2017.tar.xz mirror://gentoo/texlive-module-raleway.doc-2017.tar.xz mirror://gentoo/texlive-module-recycle.doc-2017.tar.xz mirror://gentoo/texlive-module-roboto.doc-2017.tar.xz mirror://gentoo/texlive-module-romande.doc-2017.tar.xz mirror://gentoo/texlive-module-rosario.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2017.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2017.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2017.tar.xz mirror://gentoo/texlive-module-starfont.doc-2017.tar.xz mirror://gentoo/texlive-module-staves.doc-2017.tar.xz mirror://gentoo/texlive-module-stix.doc-2017.tar.xz mirror://gentoo/texlive-module-superiors.doc-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-tapir.doc-2017.tar.xz mirror://gentoo/texlive-module-tempora.doc-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2017.tar.xz mirror://gentoo/texlive-module-tinos.doc-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2017.tar.xz mirror://gentoo/texlive-module-trajan.doc-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2017.tar.xz mirror://gentoo/texlive-module-txuprcal.doc-2017.tar.xz mirror://gentoo/texlive-module-typicons.doc-2017.tar.xz mirror://gentoo/texlive-module-universa.doc-2017.tar.xz mirror://gentoo/texlive-module-universalis.doc-2017.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2017.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2017.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2017.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2017.tar.xz mirror://gentoo/texlive-module-xits.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2017.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2017.tar.xz mirror://gentoo/texlive-module-archaic.source-2017.tar.xz mirror://gentoo/texlive-module-arev.source-2017.tar.xz mirror://gentoo/texlive-module-asapsym.source-2017.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2017.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2017.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2017.tar.xz mirror://gentoo/texlive-module-barcodes.source-2017.tar.xz mirror://gentoo/texlive-module-baskervald.source-2017.tar.xz mirror://gentoo/texlive-module-bbding.source-2017.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2017.tar.xz mirror://gentoo/texlive-module-bbold.source-2017.tar.xz mirror://gentoo/texlive-module-belleek.source-2017.tar.xz mirror://gentoo/texlive-module-bguq.source-2017.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2017.tar.xz mirror://gentoo/texlive-module-bookhands.source-2017.tar.xz mirror://gentoo/texlive-module-cantarell.source-2017.tar.xz mirror://gentoo/texlive-module-ccicons.source-2017.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2017.tar.xz mirror://gentoo/texlive-module-chivo.source-2017.tar.xz mirror://gentoo/texlive-module-cmbright.source-2017.tar.xz mirror://gentoo/texlive-module-cmll.source-2017.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2017.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-dingbat.source-2017.tar.xz mirror://gentoo/texlive-module-dozenal.source-2017.tar.xz mirror://gentoo/texlive-module-drm.source-2017.tar.xz mirror://gentoo/texlive-module-droid.source-2017.tar.xz mirror://gentoo/texlive-module-eco.source-2017.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2017.tar.xz mirror://gentoo/texlive-module-electrum.source-2017.tar.xz mirror://gentoo/texlive-module-epsdice.source-2017.tar.xz mirror://gentoo/texlive-module-esrelation.source-2017.tar.xz mirror://gentoo/texlive-module-esvect.source-2017.tar.xz mirror://gentoo/texlive-module-eulervm.source-2017.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-fetamont.source-2017.tar.xz mirror://gentoo/texlive-module-feyn.source-2017.tar.xz mirror://gentoo/texlive-module-fge.source-2017.tar.xz mirror://gentoo/texlive-module-fourier.source-2017.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2017.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2017.tar.xz mirror://gentoo/texlive-module-gothic.source-2017.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2017.tar.xz mirror://gentoo/texlive-module-lato.source-2017.tar.xz mirror://gentoo/texlive-module-libris.source-2017.tar.xz mirror://gentoo/texlive-module-linearA.source-2017.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2017.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-miama.source-2017.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-nkarta.source-2017.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2017.tar.xz mirror://gentoo/texlive-module-oinuit.source-2017.tar.xz mirror://gentoo/texlive-module-opensans.source-2017.tar.xz mirror://gentoo/texlive-module-pacioli.source-2017.tar.xz mirror://gentoo/texlive-module-phaistos.source-2017.tar.xz mirror://gentoo/texlive-module-romande.source-2017.tar.xz mirror://gentoo/texlive-module-rosario.source-2017.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2017.tar.xz mirror://gentoo/texlive-module-skull.source-2017.tar.xz mirror://gentoo/texlive-module-staves.source-2017.tar.xz mirror://gentoo/texlive-module-stix.source-2017.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2017.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2017.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2017.tar.xz mirror://gentoo/texlive-module-trajan.source-2017.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2017.tar.xz mirror://gentoo/texlive-module-universa.source-2017.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2017.tar.xz mirror://gentoo/texlive-module-xits.source-2017.tar.xz mirror://gentoo/texlive-module-yfonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fae041e67cfebe8d02085c17744c2603
+_md5_=e185e88ff24a00f1ee7462f59d3f8c35
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
index 11b6c3a552b8..9bb6fb556a28 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Recommended fonts
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-fontsextra-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2017.tar.xz mirror://gentoo/texlive-module-bookman-2017.tar.xz mirror://gentoo/texlive-module-charter-2017.tar.xz mirror://gentoo/texlive-module-cm-super-2017.tar.xz mirror://gentoo/texlive-module-cmextra-2017.tar.xz mirror://gentoo/texlive-module-courier-2017.tar.xz mirror://gentoo/texlive-module-ec-2017.tar.xz mirror://gentoo/texlive-module-euro-2017.tar.xz mirror://gentoo/texlive-module-euro-ce-2017.tar.xz mirror://gentoo/texlive-module-eurosym-2017.tar.xz mirror://gentoo/texlive-module-fpl-2017.tar.xz mirror://gentoo/texlive-module-helvetic-2017.tar.xz mirror://gentoo/texlive-module-lm-2017.tar.xz mirror://gentoo/texlive-module-lm-math-2017.tar.xz mirror://gentoo/texlive-module-marvosym-2017.tar.xz mirror://gentoo/texlive-module-mathpazo-2017.tar.xz mirror://gentoo/texlive-module-manfnt-font-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font-2017.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2017.tar.xz mirror://gentoo/texlive-module-palatino-2017.tar.xz mirror://gentoo/texlive-module-pxfonts-2017.tar.xz mirror://gentoo/texlive-module-rsfs-2017.tar.xz mirror://gentoo/texlive-module-symbol-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2017.tar.xz mirror://gentoo/texlive-module-times-2017.tar.xz mirror://gentoo/texlive-module-tipa-2017.tar.xz mirror://gentoo/texlive-module-txfonts-2017.tar.xz mirror://gentoo/texlive-module-utopia-2017.tar.xz mirror://gentoo/texlive-module-wasy-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2017.tar.xz mirror://gentoo/texlive-module-wasysym-2017.tar.xz mirror://gentoo/texlive-module-zapfchan-2017.tar.xz mirror://gentoo/texlive-module-zapfding-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2017.tar.xz mirror://gentoo/texlive-module-ec.doc-2017.tar.xz mirror://gentoo/texlive-module-euro.doc-2017.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2017.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2017.tar.xz mirror://gentoo/texlive-module-fpl.doc-2017.tar.xz mirror://gentoo/texlive-module-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2017.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2017.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa.doc-2017.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-utopia.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2017.tar.xz mirror://gentoo/texlive-module-fpl.source-2017.tar.xz mirror://gentoo/texlive-module-lm.source-2017.tar.xz mirror://gentoo/texlive-module-marvosym.source-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2017.tar.xz mirror://gentoo/texlive-module-wasysym.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f21d5c2c2bbb7bc12b2be2e5669cdc83
+_md5_=745692cec39e56e258ce4ce9e8b33c49
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
index 4459daadc7bd..4af2b9d10cd5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-psutils !<dev-texlive/texlive-fontsextra-2009 !<app-text/texlive-core-2013 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2017.tar.xz mirror://gentoo/texlive-module-afm2pl-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin-2017.tar.xz mirror://gentoo/texlive-module-epstopdf-2017.tar.xz mirror://gentoo/texlive-module-fontware-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2017.tar.xz mirror://gentoo/texlive-module-metatype1-2017.tar.xz mirror://gentoo/texlive-module-ps2pk-2017.tar.xz mirror://gentoo/texlive-module-pstools-2017.tar.xz mirror://gentoo/texlive-module-psutils-2017.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2017.tar.xz mirror://gentoo/texlive-module-fontinst-2017.tar.xz mirror://gentoo/texlive-module-fontools-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1-2017.tar.xz mirror://gentoo/texlive-module-t1utils-2017.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2017.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2017.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2017.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-fontware.doc-2017.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2017.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2017.tar.xz mirror://gentoo/texlive-module-pstools.doc-2017.tar.xz mirror://gentoo/texlive-module-psutils.doc-2017.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2017.tar.xz mirror://gentoo/texlive-module-fontools.doc-2017.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2017.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2017.tar.xz mirror://gentoo/texlive-module-metatype1.source-2017.tar.xz mirror://gentoo/texlive-module-fontinst.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e497cb61b815548ae264277b39da9642
+_md5_=02176c9623c90fd408c5a73053cd5347
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
index caa6e7c03833..92132365cd80 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-latex-2008 dev-texlive/texlive-xetex !<dev-texlive/texlive-fontsextra-2009 !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 !dev-texlive/texlive-omega >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2017.tar.xz mirror://gentoo/texlive-module-eplain-2017.tar.xz mirror://gentoo/texlive-module-lollipop-2017.tar.xz mirror://gentoo/texlive-module-mltex-2017.tar.xz mirror://gentoo/texlive-module-psizzl-2017.tar.xz mirror://gentoo/texlive-module-startex-2017.tar.xz mirror://gentoo/texlive-module-texsis-2017.tar.xz mirror://gentoo/texlive-module-xmltexconfig-2017.tar.xz mirror://gentoo/texlive-module-aleph-2017.tar.xz mirror://gentoo/texlive-module-antomega-2017.tar.xz mirror://gentoo/texlive-module-lambda-2017.tar.xz mirror://gentoo/texlive-module-mxedruli-2017.tar.xz mirror://gentoo/texlive-module-omega-2017.tar.xz mirror://gentoo/texlive-module-omegaware-2017.tar.xz mirror://gentoo/texlive-module-otibet-2017.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2017.tar.xz mirror://gentoo/texlive-module-eplain.doc-2017.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2017.tar.xz mirror://gentoo/texlive-module-mltex.doc-2017.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2017.tar.xz mirror://gentoo/texlive-module-startex.doc-2017.tar.xz mirror://gentoo/texlive-module-texsis.doc-2017.tar.xz mirror://gentoo/texlive-module-aleph.doc-2017.tar.xz mirror://gentoo/texlive-module-antomega.doc-2017.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2017.tar.xz mirror://gentoo/texlive-module-omega.doc-2017.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2017.tar.xz mirror://gentoo/texlive-module-otibet.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2017.tar.xz mirror://gentoo/texlive-module-eplain.source-2017.tar.xz mirror://gentoo/texlive-module-psizzl.source-2017.tar.xz mirror://gentoo/texlive-module-startex.source-2017.tar.xz mirror://gentoo/texlive-module-antomega.source-2017.tar.xz mirror://gentoo/texlive-module-otibet.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=774c6bf6e19186b8982ac6a998275e68
+_md5_=12d77bf447d494266c7d10fa90510919
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2017 b/metadata/md5-cache/dev-texlive/texlive-games-2017
index 6c185fb295ef..2dd87cdc1990 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2009 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2017.tar.xz mirror://gentoo/texlive-module-chess-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2017.tar.xz mirror://gentoo/texlive-module-chessboard-2017.tar.xz mirror://gentoo/texlive-module-chessfss-2017.tar.xz mirror://gentoo/texlive-module-crossword-2017.tar.xz mirror://gentoo/texlive-module-crosswrd-2017.tar.xz mirror://gentoo/texlive-module-egameps-2017.tar.xz mirror://gentoo/texlive-module-gamebook-2017.tar.xz mirror://gentoo/texlive-module-go-2017.tar.xz mirror://gentoo/texlive-module-hanoi-2017.tar.xz mirror://gentoo/texlive-module-havannah-2017.tar.xz mirror://gentoo/texlive-module-hexgame-2017.tar.xz mirror://gentoo/texlive-module-horoscop-2017.tar.xz mirror://gentoo/texlive-module-labyrinth-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2017.tar.xz mirror://gentoo/texlive-module-othello-2017.tar.xz mirror://gentoo/texlive-module-othelloboard-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2017.tar.xz mirror://gentoo/texlive-module-psgo-2017.tar.xz mirror://gentoo/texlive-module-reverxii-2017.tar.xz mirror://gentoo/texlive-module-rubik-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2017.tar.xz mirror://gentoo/texlive-module-sgame-2017.tar.xz mirror://gentoo/texlive-module-skak-2017.tar.xz mirror://gentoo/texlive-module-skaknew-2017.tar.xz mirror://gentoo/texlive-module-soup-2017.tar.xz mirror://gentoo/texlive-module-sudoku-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle-2017.tar.xz mirror://gentoo/texlive-module-xq-2017.tar.xz mirror://gentoo/texlive-module-xskak-2017.tar.xz mirror://gentoo/texlive-module-collection-games-2017.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2017.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2017.tar.xz mirror://gentoo/texlive-module-crossword.doc-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2017.tar.xz mirror://gentoo/texlive-module-egameps.doc-2017.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2017.tar.xz mirror://gentoo/texlive-module-go.doc-2017.tar.xz mirror://gentoo/texlive-module-havannah.doc-2017.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2017.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2017.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2017.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2017.tar.xz mirror://gentoo/texlive-module-othello.doc-2017.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2017.tar.xz mirror://gentoo/texlive-module-psgo.doc-2017.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2017.tar.xz mirror://gentoo/texlive-module-rubik.doc-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2017.tar.xz mirror://gentoo/texlive-module-sgame.doc-2017.tar.xz mirror://gentoo/texlive-module-skak.doc-2017.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2017.tar.xz mirror://gentoo/texlive-module-soup.doc-2017.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2017.tar.xz mirror://gentoo/texlive-module-xq.doc-2017.tar.xz mirror://gentoo/texlive-module-xskak.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2017.tar.xz mirror://gentoo/texlive-module-chessboard.source-2017.tar.xz mirror://gentoo/texlive-module-chessfss.source-2017.tar.xz mirror://gentoo/texlive-module-crossword.source-2017.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2017.tar.xz mirror://gentoo/texlive-module-gamebook.source-2017.tar.xz mirror://gentoo/texlive-module-go.source-2017.tar.xz mirror://gentoo/texlive-module-havannah.source-2017.tar.xz mirror://gentoo/texlive-module-horoscop.source-2017.tar.xz mirror://gentoo/texlive-module-rubik.source-2017.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2017.tar.xz mirror://gentoo/texlive-module-soup.source-2017.tar.xz mirror://gentoo/texlive-module-sudoku.source-2017.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2017.tar.xz mirror://gentoo/texlive-module-xskak.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bb8e8acc99aa7114ccc5e3d38d6f97d0
+_md5_=352097ad2b8ebf154cbe44609fe44ec3
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2017 b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
index aa6195e34a63..0a608818df51 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/lineno >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2017.tar.xz mirror://gentoo/texlive-module-bibleref-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2017.tar.xz mirror://gentoo/texlive-module-covington-2017.tar.xz mirror://gentoo/texlive-module-diadia-2017.tar.xz mirror://gentoo/texlive-module-dramatist-2017.tar.xz mirror://gentoo/texlive-module-dvgloss-2017.tar.xz mirror://gentoo/texlive-module-ecltree-2017.tar.xz mirror://gentoo/texlive-module-edfnotes-2017.tar.xz mirror://gentoo/texlive-module-ednotes-2017.tar.xz mirror://gentoo/texlive-module-eledform-2017.tar.xz mirror://gentoo/texlive-module-eledmac-2017.tar.xz mirror://gentoo/texlive-module-expex-2017.tar.xz mirror://gentoo/texlive-module-gb4e-2017.tar.xz mirror://gentoo/texlive-module-gmverse-2017.tar.xz mirror://gentoo/texlive-module-jura-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev-2017.tar.xz mirror://gentoo/texlive-module-juramisc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp-2017.tar.xz mirror://gentoo/texlive-module-ledmac-2017.tar.xz mirror://gentoo/texlive-module-leipzig-2017.tar.xz mirror://gentoo/texlive-module-lexikon-2017.tar.xz mirror://gentoo/texlive-module-lexref-2017.tar.xz mirror://gentoo/texlive-module-ling-macros-2017.tar.xz mirror://gentoo/texlive-module-linguex-2017.tar.xz mirror://gentoo/texlive-module-liturg-2017.tar.xz mirror://gentoo/texlive-module-metrix-2017.tar.xz mirror://gentoo/texlive-module-parallel-2017.tar.xz mirror://gentoo/texlive-module-parrun-2017.tar.xz mirror://gentoo/texlive-module-phonrule-2017.tar.xz mirror://gentoo/texlive-module-plari-2017.tar.xz mirror://gentoo/texlive-module-play-2017.tar.xz mirror://gentoo/texlive-module-poemscol-2017.tar.xz mirror://gentoo/texlive-module-poetrytex-2017.tar.xz mirror://gentoo/texlive-module-qobitree-2017.tar.xz mirror://gentoo/texlive-module-qtree-2017.tar.xz mirror://gentoo/texlive-module-reledmac-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees-2017.tar.xz mirror://gentoo/texlive-module-rtklage-2017.tar.xz mirror://gentoo/texlive-module-screenplay-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2017.tar.xz mirror://gentoo/texlive-module-sides-2017.tar.xz mirror://gentoo/texlive-module-stage-2017.tar.xz mirror://gentoo/texlive-module-textglos-2017.tar.xz mirror://gentoo/texlive-module-thalie-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips-2017.tar.xz mirror://gentoo/texlive-module-verse-2017.tar.xz mirror://gentoo/texlive-module-xyling-2017.tar.xz mirror://gentoo/texlive-module-collection-humanities-2017.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2017.tar.xz mirror://gentoo/texlive-module-covington.doc-2017.tar.xz mirror://gentoo/texlive-module-diadia.doc-2017.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2017.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2017.tar.xz mirror://gentoo/texlive-module-eledform.doc-2017.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-expex.doc-2017.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2017.tar.xz mirror://gentoo/texlive-module-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2017.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2017.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2017.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2017.tar.xz mirror://gentoo/texlive-module-lexref.doc-2017.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2017.tar.xz mirror://gentoo/texlive-module-linguex.doc-2017.tar.xz mirror://gentoo/texlive-module-liturg.doc-2017.tar.xz mirror://gentoo/texlive-module-metrix.doc-2017.tar.xz mirror://gentoo/texlive-module-parallel.doc-2017.tar.xz mirror://gentoo/texlive-module-parrun.doc-2017.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2017.tar.xz mirror://gentoo/texlive-module-plari.doc-2017.tar.xz mirror://gentoo/texlive-module-play.doc-2017.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2017.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2017.tar.xz mirror://gentoo/texlive-module-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2017.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2017.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-sides.doc-2017.tar.xz mirror://gentoo/texlive-module-stage.doc-2017.tar.xz mirror://gentoo/texlive-module-textglos.doc-2017.tar.xz mirror://gentoo/texlive-module-thalie.doc-2017.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2017.tar.xz mirror://gentoo/texlive-module-verse.doc-2017.tar.xz mirror://gentoo/texlive-module-xyling.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2017.tar.xz mirror://gentoo/texlive-module-dramatist.source-2017.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2017.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2017.tar.xz mirror://gentoo/texlive-module-eledform.source-2017.tar.xz mirror://gentoo/texlive-module-eledmac.source-2017.tar.xz mirror://gentoo/texlive-module-jura.source-2017.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2017.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2017.tar.xz mirror://gentoo/texlive-module-ledmac.source-2017.tar.xz mirror://gentoo/texlive-module-leipzig.source-2017.tar.xz mirror://gentoo/texlive-module-liturg.source-2017.tar.xz mirror://gentoo/texlive-module-metrix.source-2017.tar.xz mirror://gentoo/texlive-module-parallel.source-2017.tar.xz mirror://gentoo/texlive-module-parrun.source-2017.tar.xz mirror://gentoo/texlive-module-plari.source-2017.tar.xz mirror://gentoo/texlive-module-play.source-2017.tar.xz mirror://gentoo/texlive-module-poemscol.source-2017.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2017.tar.xz mirror://gentoo/texlive-module-reledmac.source-2017.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2017.tar.xz mirror://gentoo/texlive-module-screenplay.source-2017.tar.xz mirror://gentoo/texlive-module-textglos.source-2017.tar.xz mirror://gentoo/texlive-module-thalie.source-2017.tar.xz mirror://gentoo/texlive-module-verse.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5704a7c1b1939e3b8a08ec037de96d8d
+_md5_=fb6c283cdb0f909e6cff872dae4cb7ca
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
index 89507fc9ed12..f99ef7bcd8d8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarab !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-publishers-2013 !dev-texlive/texlive-documentation-arabic !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amiri-2017.tar.xz mirror://gentoo/texlive-module-arabi-2017.tar.xz mirror://gentoo/texlive-module-arabi-add-2017.tar.xz mirror://gentoo/texlive-module-arabluatex-2017.tar.xz mirror://gentoo/texlive-module-arabtex-2017.tar.xz mirror://gentoo/texlive-module-bidi-2017.tar.xz mirror://gentoo/texlive-module-bidihl-2017.tar.xz mirror://gentoo/texlive-module-dad-2017.tar.xz mirror://gentoo/texlive-module-ghab-2017.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2017.tar.xz mirror://gentoo/texlive-module-imsproc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian-2017.tar.xz mirror://gentoo/texlive-module-persian-bib-2017.tar.xz mirror://gentoo/texlive-module-simurgh-2017.tar.xz mirror://gentoo/texlive-module-tram-2017.tar.xz mirror://gentoo/texlive-module-xepersian-2017.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amiri.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi.doc-2017.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2017.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2017.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2017.tar.xz mirror://gentoo/texlive-module-dad.doc-2017.tar.xz mirror://gentoo/texlive-module-ghab.doc-2017.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2017.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2017.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2017.tar.xz mirror://gentoo/texlive-module-tram.doc-2017.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2017.tar.xz mirror://gentoo/texlive-module-bidi.source-2017.tar.xz mirror://gentoo/texlive-module-xepersian.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1c83587a60798c936900d4106e5af48d
+_md5_=6be57f513cfec579670cbef9e56adc2a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
index 2cfaf51d167f..3f0c25a48d38 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-cns-2017.tar.xz mirror://gentoo/texlive-module-ctex-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq-2017.tar.xz mirror://gentoo/texlive-module-fandol-2017.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2017.tar.xz mirror://gentoo/texlive-module-texproposal-2017.tar.xz mirror://gentoo/texlive-module-xpinyin-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2017.tar.xz mirror://gentoo/texlive-module-zhnumber-2017.tar.xz mirror://gentoo/texlive-module-zhspacing-2017.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2017.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-cns.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex.doc-2017.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-fandol.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2017.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2017.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2017.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2017.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b0a1f48716b1853079a55ec011698023
+_md5_=e08a38a92444cb2916e4476da20228f2
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
index 4c49bd4020b4..860bdb3d5189 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Chinese/Japanese/Korean (base)
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD GPL-2 GPL-3 LPPL-1.3 MIT TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 !!<dev-texlive/texlive-langcjk-2012 !dev-texlive/texlive-documentation-chinese !dev-texlive/texlive-documentation-korean !dev-texlive/texlive-documentation-japanese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adobemapping-2017.tar.xz mirror://gentoo/texlive-module-c90-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct-2017.tar.xz mirror://gentoo/texlive-module-dnp-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni-2017.tar.xz mirror://gentoo/texlive-module-zxjafont-2017.tar.xz mirror://gentoo/texlive-module-collection-langcjk-2017.tar.xz doc? ( mirror://gentoo/texlive-module-c90.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.doc-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.doc-2017.tar.xz mirror://gentoo/texlive-module-pxtatescale.doc-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafont.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-c90.source-2017.tar.xz mirror://gentoo/texlive-module-cjkpunct.source-2017.tar.xz mirror://gentoo/texlive-module-garuda-c90.source-2017.tar.xz mirror://gentoo/texlive-module-norasi-c90.source-2017.tar.xz mirror://gentoo/texlive-module-xcjk2uni.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f8c50627d47dad9b5e72a7fe8cc8a078
+_md5_=3d114dd0b302743dee4ec81e60a71441
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
index b2ecafec2632..492362539ef7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-ukrainian !dev-texlive/texlive-documentation-bulgarian !dev-texlive/texlive-documentation-russian !dev-texlive/texlive-documentation-mongolian !dev-texlive/texlive-langmongolian !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-documentation-serbian !<app-text/texlive-core-2013 !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-babel-russian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-cmcyr-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2017.tar.xz mirror://gentoo/texlive-module-cyrplain-2017.tar.xz mirror://gentoo/texlive-module-disser-2017.tar.xz mirror://gentoo/texlive-module-eskd-2017.tar.xz mirror://gentoo/texlive-module-eskdx-2017.tar.xz mirror://gentoo/texlive-module-gost-2017.tar.xz mirror://gentoo/texlive-module-hyphen-belarusian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-lcyw-2017.tar.xz mirror://gentoo/texlive-module-lh-2017.tar.xz mirror://gentoo/texlive-module-lhcyr-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2017.tar.xz mirror://gentoo/texlive-module-montex-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen-2017.tar.xz mirror://gentoo/texlive-module-russ-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig-2017.tar.xz mirror://gentoo/texlive-module-t2-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph-2017.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2017.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2017.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-disser.doc-2017.tar.xz mirror://gentoo/texlive-module-eskd.doc-2017.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2017.tar.xz mirror://gentoo/texlive-module-gost.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2017.tar.xz mirror://gentoo/texlive-module-lh.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-montex.doc-2017.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2017.tar.xz mirror://gentoo/texlive-module-russ.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2017.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2017.tar.xz mirror://gentoo/texlive-module-t2.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2017.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2017.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2017.tar.xz mirror://gentoo/texlive-module-disser.source-2017.tar.xz mirror://gentoo/texlive-module-eskd.source-2017.tar.xz mirror://gentoo/texlive-module-gost.source-2017.tar.xz mirror://gentoo/texlive-module-lcyw.source-2017.tar.xz mirror://gentoo/texlive-module-lh.source-2017.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2017.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2017.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b82cfa1a4098a91f94fb4e026d0bdec0
+_md5_=7cf5cdda4ab1489a27faecfab3c9dda2
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
index 85ad99e5f720..3ba5248dcd96 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-latex-2017 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak-2017.tar.xz mirror://gentoo/texlive-module-cnbwp-2017.tar.xz mirror://gentoo/texlive-module-cs-2017.tar.xz mirror://gentoo/texlive-module-csbulletin-2017.tar.xz mirror://gentoo/texlive-module-cslatex-2017.tar.xz mirror://gentoo/texlive-module-csplain-2017.tar.xz mirror://gentoo/texlive-module-cstex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz-2017.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2017.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2017.tar.xz mirror://gentoo/texlive-module-cstex.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-cslatex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=916b45e1b9592ae720442d8a4e9c0481
+_md5_=938f1ab00bdacb0fde7c01adf03d0b0f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
index 701dedb9a6b4..78ba44a9e29f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-english !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2017.tar.xz mirror://gentoo/texlive-module-FAQ-en-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2017.tar.xz mirror://gentoo/texlive-module-comprehensive-2017.tar.xz mirror://gentoo/texlive-module-dickimaw-2017.tar.xz mirror://gentoo/texlive-module-docsurvey-2017.tar.xz mirror://gentoo/texlive-module-dtxtut-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2017.tar.xz mirror://gentoo/texlive-module-gentle-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2017.tar.xz mirror://gentoo/texlive-module-happy4th-2017.tar.xz mirror://gentoo/texlive-module-impatient-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific-2017.tar.xz mirror://gentoo/texlive-module-knuth-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure-2017.tar.xz mirror://gentoo/texlive-module-latex-course-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2017.tar.xz mirror://gentoo/texlive-module-lshort-english-2017.tar.xz mirror://gentoo/texlive-module-macros2e-2017.tar.xz mirror://gentoo/texlive-module-math-e-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols-2017.tar.xz mirror://gentoo/texlive-module-memdesign-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2017.tar.xz mirror://gentoo/texlive-module-pictexsum-2017.tar.xz mirror://gentoo/texlive-module-plain-doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast-2017.tar.xz mirror://gentoo/texlive-module-tds-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2017.tar.xz mirror://gentoo/texlive-module-tex-overview-2017.tar.xz mirror://gentoo/texlive-module-tex-refs-2017.tar.xz mirror://gentoo/texlive-module-texbytopic-2017.tar.xz mirror://gentoo/texlive-module-titlepages-2017.tar.xz mirror://gentoo/texlive-module-tlc2-2017.tar.xz mirror://gentoo/texlive-module-undergradmath-2017.tar.xz mirror://gentoo/texlive-module-visualfaq-2017.tar.xz mirror://gentoo/texlive-module-webguide-2017.tar.xz mirror://gentoo/texlive-module-xetexref-2017.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2017.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2017.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2017.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2017.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2017.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2017.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2017.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2017.tar.xz mirror://gentoo/texlive-module-docsurvey.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2017.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2017.tar.xz mirror://gentoo/texlive-module-gentle.doc-2017.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient.doc-2017.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2017.tar.xz mirror://gentoo/texlive-module-knuth.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2017.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-e.doc-2017.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2017.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2017.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2017.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2017.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2017.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2017.tar.xz mirror://gentoo/texlive-module-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2017.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2017.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2017.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2017.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-webguide.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2017.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af0632db91e9bf02a2bd245817290889
+_md5_=b66fa781aa0a93c88ed4627ef150de8a
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
index f1904af14987..cbbcfb23685f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2017.tar.xz mirror://gentoo/texlive-module-babel-breton-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian-2017.tar.xz mirror://gentoo/texlive-module-babel-danish-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2017.tar.xz mirror://gentoo/texlive-module-babel-irish-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-babel-latin-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh-2017.tar.xz mirror://gentoo/texlive-module-babel-samin-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh-2017.tar.xz mirror://gentoo/texlive-module-finbib-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2017.tar.xz mirror://gentoo/texlive-module-hrlatex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2017.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2017.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2017.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2017.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2017.tar.xz mirror://gentoo/texlive-module-lithuanian-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2017.tar.xz mirror://gentoo/texlive-module-nevelok-2017.tar.xz mirror://gentoo/texlive-module-swebib-2017.tar.xz mirror://gentoo/texlive-module-turkmen-2017.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2017.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2017.tar.xz mirror://gentoo/texlive-module-swebib.doc-2017.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2017.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2017.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2017.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2017.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-nevelok.source-2017.tar.xz mirror://gentoo/texlive-module-turkmen.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=136187af08027f4ef0450dc16640d523
+_md5_=32909157fef5c0e38b884d5d480b50c5
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
index 5b0665c0320b..eb3aae6005e7 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive French
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-french !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex-2017.tar.xz mirror://gentoo/texlive-module-babel-basque-2017.tar.xz mirror://gentoo/texlive-module-babel-french-2017.tar.xz mirror://gentoo/texlive-module-basque-book-2017.tar.xz mirror://gentoo/texlive-module-basque-date-2017.tar.xz mirror://gentoo/texlive-module-bib-fr-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2017.tar.xz mirror://gentoo/texlive-module-droit-fr-2017.tar.xz mirror://gentoo/texlive-module-e-french-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2017.tar.xz mirror://gentoo/texlive-module-facture-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2017.tar.xz mirror://gentoo/texlive-module-frletter-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2017.tar.xz mirror://gentoo/texlive-module-hyphen-french-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr-2017.tar.xz mirror://gentoo/texlive-module-impnattypo-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2017.tar.xz mirror://gentoo/texlive-module-lshort-french-2017.tar.xz mirror://gentoo/texlive-module-mafr-2017.tar.xz mirror://gentoo/texlive-module-tabvar-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2017.tar.xz mirror://gentoo/texlive-module-variations-2017.tar.xz mirror://gentoo/texlive-module-visualtikz-2017.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2017.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2017.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2017.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-e-french.doc-2017.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-facture.doc-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2017.tar.xz mirror://gentoo/texlive-module-frletter.doc-2017.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2017.tar.xz mirror://gentoo/texlive-module-mafr.doc-2017.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2017.tar.xz mirror://gentoo/texlive-module-variations.doc-2017.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2017.tar.xz mirror://gentoo/texlive-module-babel-french.source-2017.tar.xz mirror://gentoo/texlive-module-basque-book.source-2017.tar.xz mirror://gentoo/texlive-module-basque-date.source-2017.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2017.tar.xz mirror://gentoo/texlive-module-facture.source-2017.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2017.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2017.tar.xz mirror://gentoo/texlive-module-tabvar.source-2017.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b8531866b9fd47b76da8322325cb26e2
+_md5_=f7927d5e53a1d1efe9ee6fb9327e8f7f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
index 84bb99a3bbee..8aced7990611 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !dev-texlive/texlive-documentation-german !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2017.tar.xz mirror://gentoo/texlive-module-babel-german-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2017.tar.xz mirror://gentoo/texlive-module-dhua-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2017.tar.xz mirror://gentoo/texlive-module-etdipa-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2017.tar.xz mirror://gentoo/texlive-module-geometry-de-2017.tar.xz mirror://gentoo/texlive-module-german-2017.tar.xz mirror://gentoo/texlive-module-germbib-2017.tar.xz mirror://gentoo/texlive-module-germkorr-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2017.tar.xz mirror://gentoo/texlive-module-hyphen-german-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2017.tar.xz mirror://gentoo/texlive-module-lshort-german-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2017.tar.xz mirror://gentoo/texlive-module-microtype-de-2017.tar.xz mirror://gentoo/texlive-module-milog-2017.tar.xz mirror://gentoo/texlive-module-presentations-2017.tar.xz mirror://gentoo/texlive-module-r_und_s-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer-2017.tar.xz mirror://gentoo/texlive-module-texlive-de-2017.tar.xz mirror://gentoo/texlive-module-tipa-de-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2017.tar.xz mirror://gentoo/texlive-module-udesoftec-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit-2017.tar.xz mirror://gentoo/texlive-module-umlaute-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2017.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2017.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2017.tar.xz mirror://gentoo/texlive-module-dhua.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2017.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2017.tar.xz mirror://gentoo/texlive-module-german.doc-2017.tar.xz mirror://gentoo/texlive-module-germbib.doc-2017.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2017.tar.xz mirror://gentoo/texlive-module-milog.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations.doc-2017.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2017.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2017.tar.xz mirror://gentoo/texlive-module-dhua.source-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2017.tar.xz mirror://gentoo/texlive-module-german.source-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2017.tar.xz mirror://gentoo/texlive-module-umlaute.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=372d3ff68968f5c66a0b85dfe5cb5594
+_md5_=f2b7a6679768fd086b57bdfcf8d1d022
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
index 85c33aa911c0..d786c2a89e0c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2017.tar.xz mirror://gentoo/texlive-module-begingreek-2017.tar.xz mirror://gentoo/texlive-module-betababel-2017.tar.xz mirror://gentoo/texlive-module-bgreek-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2017.tar.xz mirror://gentoo/texlive-module-gfsporson-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2017.tar.xz mirror://gentoo/texlive-module-greekdates-2017.tar.xz mirror://gentoo/texlive-module-greektex-2017.tar.xz mirror://gentoo/texlive-module-greektonoi-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2017.tar.xz mirror://gentoo/texlive-module-ibygrk-2017.tar.xz mirror://gentoo/texlive-module-kerkis-2017.tar.xz mirror://gentoo/texlive-module-levy-2017.tar.xz mirror://gentoo/texlive-module-lgreek-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2017.tar.xz mirror://gentoo/texlive-module-teubner-2017.tar.xz mirror://gentoo/texlive-module-xgreek-2017.tar.xz mirror://gentoo/texlive-module-yannisgr-2017.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2017.tar.xz mirror://gentoo/texlive-module-betababel.doc-2017.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2017.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2017.tar.xz mirror://gentoo/texlive-module-greektex.doc-2017.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2017.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2017.tar.xz mirror://gentoo/texlive-module-levy.doc-2017.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2017.tar.xz mirror://gentoo/texlive-module-teubner.doc-2017.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2017.tar.xz mirror://gentoo/texlive-module-begingreek.source-2017.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2017.tar.xz mirror://gentoo/texlive-module-greekdates.source-2017.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2017.tar.xz mirror://gentoo/texlive-module-teubner.source-2017.tar.xz mirror://gentoo/texlive-module-xgreek.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8325601467d00cdb6a39fc36c65e7de8
+_md5_=235b7a35ffcf2b0afb0e53b487cd5e54
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
index 56f0a2a579fc..70f7c8b582e9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-italian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2017.tar.xz mirror://gentoo/texlive-module-babel-italian-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2017.tar.xz mirror://gentoo/texlive-module-frontespizio-2017.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2017.tar.xz mirror://gentoo/texlive-module-itnumpar-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2017.tar.xz mirror://gentoo/texlive-module-layaureo-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2017.tar.xz mirror://gentoo/texlive-module-texlive-it-2017.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2017.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2017.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2017.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2017.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2017.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2017.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2017.tar.xz mirror://gentoo/texlive-module-layaureo.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c77d8090fa828b645a5758e61a49d1b7
+_md5_=0a54d9b49e921e2186a17c76f1513715
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
index e91dd96f80d9..2da7dd06680b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-japanese-2017.tar.xz mirror://gentoo/texlive-module-bxbase-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum-2017.tar.xz mirror://gentoo/texlive-module-bxjscls-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt-2017.tar.xz mirror://gentoo/texlive-module-convbkmk-2017.tar.xz mirror://gentoo/texlive-module-ifptex-2017.tar.xz mirror://gentoo/texlive-module-ipaex-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex-2017.tar.xz mirror://gentoo/texlive-module-jlreq-2017.tar.xz mirror://gentoo/texlive-module-jsclasses-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese-2017.tar.xz mirror://gentoo/texlive-module-luatexja-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base-2017.tar.xz mirror://gentoo/texlive-module-platex-2017.tar.xz mirror://gentoo/texlive-module-platex-tools-2017.tar.xz mirror://gentoo/texlive-module-platexcheat-2017.tar.xz mirror://gentoo/texlive-module-ptex-2017.tar.xz mirror://gentoo/texlive-module-ptex-base-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf-2017.tar.xz mirror://gentoo/texlive-module-pxbase-2017.tar.xz mirror://gentoo/texlive-module-pxchfon-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica-2017.tar.xz mirror://gentoo/texlive-module-uplatex-2017.tar.xz mirror://gentoo/texlive-module-uptex-2017.tar.xz mirror://gentoo/texlive-module-uptex-base-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts-2017.tar.xz mirror://gentoo/texlive-module-wadalab-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont-2017.tar.xz mirror://gentoo/texlive-module-zxjatype-2017.tar.xz mirror://gentoo/texlive-module-collection-langjapanese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-bxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-bxcjkjatype.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjalipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.doc-2017.tar.xz mirror://gentoo/texlive-module-bxorigcapt.doc-2017.tar.xz mirror://gentoo/texlive-module-convbkmk.doc-2017.tar.xz mirror://gentoo/texlive-module-ifptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ipaex.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.doc-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-jlreq.doc-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-japanese.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexja.doc-2017.tar.xz mirror://gentoo/texlive-module-mendex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-pbibtex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-platex.doc-2017.tar.xz mirror://gentoo/texlive-module-platex-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-platexcheat.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-ptex2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pxbase.doc-2017.tar.xz mirror://gentoo/texlive-module-pxchfon.doc-2017.tar.xz mirror://gentoo/texlive-module-pxcjkcat.doc-2017.tar.xz mirror://gentoo/texlive-module-pxjahyper.doc-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.doc-2017.tar.xz mirror://gentoo/texlive-module-uplatex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-base.doc-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-wadalab.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjafbfont.doc-2017.tar.xz mirror://gentoo/texlive-module-zxjatype.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-japanese.source-2017.tar.xz mirror://gentoo/texlive-module-bxjscls.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf.source-2017.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.source-2017.tar.xz mirror://gentoo/texlive-module-jsclasses.source-2017.tar.xz mirror://gentoo/texlive-module-luatexja.source-2017.tar.xz mirror://gentoo/texlive-module-platex.source-2017.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.source-2017.tar.xz mirror://gentoo/texlive-module-pxrubrica.source-2017.tar.xz mirror://gentoo/texlive-module-uplatex.source-2017.tar.xz mirror://gentoo/texlive-module-uptex-fonts.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9506c3a34afaa6a2e2e53e41d8c999e2
+_md5_=5e79b2af5de98c62fe95e787d9980483
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
index 10ccadada1fa..dab60b889e93 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2017 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1-2017.tar.xz mirror://gentoo/texlive-module-uhc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2017.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2017.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2017.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2017.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2017.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2017.tar.xz mirror://gentoo/texlive-module-uhc.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2017.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8d0954a275751e70a9795b1c1fed8ac1
+_md5_=3b08f59882a6acf8701fc8581df949be
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2017 b/metadata/md5-cache/dev-texlive/texlive-langother-2017
index c3cfe79106cb..d8f4d1bdd45f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-basic-2009 !dev-texlive/texlive-documentation-vietnamese !dev-texlive/texlive-langvietnamese !<dev-texlive/texlive-langcjk-2013 !dev-texlive/texlive-langhebrew !dev-texlive/texlive-documentation-thai !dev-texlive/texlive-langturkmen !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2017.tar.xz mirror://gentoo/texlive-module-babel-malay-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2017.tar.xz mirror://gentoo/texlive-module-babel-thai-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-bangtex-2017.tar.xz mirror://gentoo/texlive-module-bengali-2017.tar.xz mirror://gentoo/texlive-module-burmese-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew-2017.tar.xz mirror://gentoo/texlive-module-ctib-2017.tar.xz mirror://gentoo/texlive-module-ebong-2017.tar.xz mirror://gentoo/texlive-module-ethiop-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2017.tar.xz mirror://gentoo/texlive-module-fc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2017.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2017.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2017.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2017.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2017.tar.xz mirror://gentoo/texlive-module-latexbangla-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2017.tar.xz mirror://gentoo/texlive-module-padauk-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2017.tar.xz mirror://gentoo/texlive-module-thaienum-2017.tar.xz mirror://gentoo/texlive-module-velthuis-2017.tar.xz mirror://gentoo/texlive-module-vntex-2017.tar.xz mirror://gentoo/texlive-module-wnri-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2017.tar.xz mirror://gentoo/texlive-module-collection-langother-2017.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-bangtex.doc-2017.tar.xz mirror://gentoo/texlive-module-bengali.doc-2017.tar.xz mirror://gentoo/texlive-module-burmese.doc-2017.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-ctib.doc-2017.tar.xz mirror://gentoo/texlive-module-ebong.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop.doc-2017.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-fc.doc-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2017.tar.xz mirror://gentoo/texlive-module-padauk.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2017.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2017.tar.xz mirror://gentoo/texlive-module-thaienum.doc-2017.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2017.tar.xz mirror://gentoo/texlive-module-vntex.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri.doc-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphen-armenian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.source-2017.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-babel-indonesian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2017.tar.xz mirror://gentoo/texlive-module-babel-malay.source-2017.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2017.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2017.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2017.tar.xz mirror://gentoo/texlive-module-bengali.source-2017.tar.xz mirror://gentoo/texlive-module-burmese.source-2017.tar.xz mirror://gentoo/texlive-module-ctib.source-2017.tar.xz mirror://gentoo/texlive-module-ethiop.source-2017.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2017.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2017.tar.xz mirror://gentoo/texlive-module-vntex.source-2017.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b4aa015b2930e5eb1e5fe3b620822c5a
+_md5_=412ec58c410667202808266dfba662f2
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
index 887dc75d07f8..26537f3093c4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2017 >=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-polish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2017.tar.xz mirror://gentoo/texlive-module-bredzenie-2017.tar.xz mirror://gentoo/texlive-module-cc-pl-2017.tar.xz mirror://gentoo/texlive-module-gustlib-2017.tar.xz mirror://gentoo/texlive-module-gustprog-2017.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish-2017.tar.xz mirror://gentoo/texlive-module-mex-2017.tar.xz mirror://gentoo/texlive-module-mwcls-2017.tar.xz mirror://gentoo/texlive-module-pl-2017.tar.xz mirror://gentoo/texlive-module-polski-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx-2017.tar.xz mirror://gentoo/texlive-module-tap-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl-2017.tar.xz mirror://gentoo/texlive-module-utf8mex-2017.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-bredzenie.doc-2017.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2017.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-mex.doc-2017.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2017.tar.xz mirror://gentoo/texlive-module-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-polski.doc-2017.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2017.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2017.tar.xz mirror://gentoo/texlive-module-tap.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2017.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2017.tar.xz mirror://gentoo/texlive-module-mex.source-2017.tar.xz mirror://gentoo/texlive-module-mwcls.source-2017.tar.xz mirror://gentoo/texlive-module-polski.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6c05b77ec5d4e619ef3b1fa5af974b7e
+_md5_=9b068247003457adb9ae4e58c433490d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
index b826974eef3e..c6a582d617b4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-portuguese !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-cursolatex-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses-2017.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2017.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2017.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2017.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4f8a5da1bf532051a3588fedb164875f
+_md5_=3532c28103008c94ef2b42b23ef8a9b6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
index d247a9ed87c9..4c5f9231c9cc 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !dev-texlive/texlive-documentation-spanish !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2017.tar.xz mirror://gentoo/texlive-module-babel-galician-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2017.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx-2017.tar.xz mirror://gentoo/texlive-module-texlive-es-2017.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2017.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2017.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2017.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a9195d19813bd9c8772aaa31be7f7003
+_md5_=e90de670693efa7f46c6f41b6a4ada7d
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2017 b/metadata/md5-cache/dev-texlive/texlive-latex-2017
index 146d5ca45b9b..27e1eece29e8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX fundamental packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2017 !!<dev-texlive/texlive-latex-2016 !<dev-texlive/texlive-context-2010 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2017.tar.xz mirror://gentoo/texlive-module-amscls-2017.tar.xz mirror://gentoo/texlive-module-amsmath-2017.tar.xz mirror://gentoo/texlive-module-babel-2017.tar.xz mirror://gentoo/texlive-module-babel-english-2017.tar.xz mirror://gentoo/texlive-module-babelbib-2017.tar.xz mirror://gentoo/texlive-module-carlisle-2017.tar.xz mirror://gentoo/texlive-module-colortbl-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr-2017.tar.xz mirror://gentoo/texlive-module-fix2col-2017.tar.xz mirror://gentoo/texlive-module-geometry-2017.tar.xz mirror://gentoo/texlive-module-graphics-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2017.tar.xz mirror://gentoo/texlive-module-hyperref-2017.tar.xz mirror://gentoo/texlive-module-latex-2017.tar.xz mirror://gentoo/texlive-module-latex-bin-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts-2017.tar.xz mirror://gentoo/texlive-module-latexconfig-2017.tar.xz mirror://gentoo/texlive-module-ltxmisc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss-2017.tar.xz mirror://gentoo/texlive-module-mptopdf-2017.tar.xz mirror://gentoo/texlive-module-natbib-2017.tar.xz mirror://gentoo/texlive-module-oberdiek-2017.tar.xz mirror://gentoo/texlive-module-pslatex-2017.tar.xz mirror://gentoo/texlive-module-psnfss-2017.tar.xz mirror://gentoo/texlive-module-pspicture-2017.tar.xz mirror://gentoo/texlive-module-tools-2017.tar.xz mirror://gentoo/texlive-module-url-2017.tar.xz mirror://gentoo/texlive-module-collection-latex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2017.tar.xz mirror://gentoo/texlive-module-amscls.doc-2017.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-babel.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2017.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2017.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2017.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2017.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2017.tar.xz mirror://gentoo/texlive-module-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-natbib.doc-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2017.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2017.tar.xz mirror://gentoo/texlive-module-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-url.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2017.tar.xz mirror://gentoo/texlive-module-amscls.source-2017.tar.xz mirror://gentoo/texlive-module-amsmath.source-2017.tar.xz mirror://gentoo/texlive-module-babel.source-2017.tar.xz mirror://gentoo/texlive-module-babel-english.source-2017.tar.xz mirror://gentoo/texlive-module-carlisle.source-2017.tar.xz mirror://gentoo/texlive-module-colortbl.source-2017.tar.xz mirror://gentoo/texlive-module-fix2col.source-2017.tar.xz mirror://gentoo/texlive-module-geometry.source-2017.tar.xz mirror://gentoo/texlive-module-graphics.source-2017.tar.xz mirror://gentoo/texlive-module-hyperref.source-2017.tar.xz mirror://gentoo/texlive-module-latex.source-2017.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2017.tar.xz mirror://gentoo/texlive-module-natbib.source-2017.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2017.tar.xz mirror://gentoo/texlive-module-pslatex.source-2017.tar.xz mirror://gentoo/texlive-module-psnfss.source-2017.tar.xz mirror://gentoo/texlive-module-pspicture.source-2017.tar.xz mirror://gentoo/texlive-module-tools.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f5f51f57de11af4746a033c00782e417
+_md5_=35fdded5fd4596af31051fa0a93630ff
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
index 593a3e9a2cf4..990fe9e3ad03 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Apache-2.0 Artistic BSD GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2017 >=dev-texlive/texlive-pictures-2017 >=dev-texlive/texlive-fontsrecommended-2014 !dev-tex/achemso !dev-tex/prosper !dev-tex/ha-prosper !dev-tex/texpower !dev-tex/cdcover !dev-tex/ppower4 !=dev-texlive/texlive-latexrecommended-2007* !=dev-texlive/texlive-latex3-2007* !<dev-texlive/texlive-humanities-2014 !<dev-texlive/texlive-mathextra-2010 !<dev-texlive/texlive-plainextra-2010 !<dev-texlive/texlive-pictures-2013 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2017.tar.xz mirror://gentoo/texlive-module-GS1-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper-2017.tar.xz mirror://gentoo/texlive-module-Tabbing-2017.tar.xz mirror://gentoo/texlive-module-a0poster-2017.tar.xz mirror://gentoo/texlive-module-a4wide-2017.tar.xz mirror://gentoo/texlive-module-a5comb-2017.tar.xz mirror://gentoo/texlive-module-abraces-2017.tar.xz mirror://gentoo/texlive-module-abstract-2017.tar.xz mirror://gentoo/texlive-module-achemso-2017.tar.xz mirror://gentoo/texlive-module-acro-2017.tar.xz mirror://gentoo/texlive-module-acronym-2017.tar.xz mirror://gentoo/texlive-module-acroterm-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol-2017.tar.xz mirror://gentoo/texlive-module-addfont-2017.tar.xz mirror://gentoo/texlive-module-addlines-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol-2017.tar.xz mirror://gentoo/texlive-module-adjustbox-2017.tar.xz mirror://gentoo/texlive-module-adrconv-2017.tar.xz mirror://gentoo/texlive-module-advdate-2017.tar.xz mirror://gentoo/texlive-module-akktex-2017.tar.xz mirror://gentoo/texlive-module-akletter-2017.tar.xz mirror://gentoo/texlive-module-alertmessage-2017.tar.xz mirror://gentoo/texlive-module-alnumsec-2017.tar.xz mirror://gentoo/texlive-module-alterqcm-2017.tar.xz mirror://gentoo/texlive-module-altfont-2017.tar.xz mirror://gentoo/texlive-module-amsaddr-2017.tar.xz mirror://gentoo/texlive-module-animate-2017.tar.xz mirror://gentoo/texlive-module-anonchap-2017.tar.xz mirror://gentoo/texlive-module-answers-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize-2017.tar.xz mirror://gentoo/texlive-module-appendix-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2017.tar.xz mirror://gentoo/texlive-module-apptools-2017.tar.xz mirror://gentoo/texlive-module-arcs-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx-2017.tar.xz mirror://gentoo/texlive-module-arraysort-2017.tar.xz mirror://gentoo/texlive-module-arydshln-2017.tar.xz mirror://gentoo/texlive-module-asciilist-2017.tar.xz mirror://gentoo/texlive-module-assignment-2017.tar.xz mirror://gentoo/texlive-module-assoccnt-2017.tar.xz mirror://gentoo/texlive-module-attachfile-2017.tar.xz mirror://gentoo/texlive-module-aurl-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2017.tar.xz mirror://gentoo/texlive-module-authorindex-2017.tar.xz mirror://gentoo/texlive-module-autonum-2017.tar.xz mirror://gentoo/texlive-module-autopdf-2017.tar.xz mirror://gentoo/texlive-module-avremu-2017.tar.xz mirror://gentoo/texlive-module-background-2017.tar.xz mirror://gentoo/texlive-module-bankstatement-2017.tar.xz mirror://gentoo/texlive-module-bashful-2017.tar.xz mirror://gentoo/texlive-module-basicarith-2017.tar.xz mirror://gentoo/texlive-module-bchart-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2017.tar.xz mirror://gentoo/texlive-module-beameraudience-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2017.tar.xz mirror://gentoo/texlive-module-beamerposter-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2017.tar.xz mirror://gentoo/texlive-module-beton-2017.tar.xz mirror://gentoo/texlive-module-bewerbung-2017.tar.xz mirror://gentoo/texlive-module-bez123-2017.tar.xz mirror://gentoo/texlive-module-bezos-2017.tar.xz mirror://gentoo/texlive-module-bhcexam-2017.tar.xz mirror://gentoo/texlive-module-bibletext-2017.tar.xz mirror://gentoo/texlive-module-bigfoot-2017.tar.xz mirror://gentoo/texlive-module-bigints-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors-2017.tar.xz mirror://gentoo/texlive-module-bizcard-2017.tar.xz mirror://gentoo/texlive-module-blindtext-2017.tar.xz mirror://gentoo/texlive-module-blkarray-2017.tar.xz mirror://gentoo/texlive-module-block-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr-2017.tar.xz mirror://gentoo/texlive-module-boites-2017.tar.xz mirror://gentoo/texlive-module-bold-extra-2017.tar.xz mirror://gentoo/texlive-module-bookcover-2017.tar.xz mirror://gentoo/texlive-module-bookest-2017.tar.xz mirror://gentoo/texlive-module-booklet-2017.tar.xz mirror://gentoo/texlive-module-boolexpr-2017.tar.xz mirror://gentoo/texlive-module-bophook-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2017.tar.xz mirror://gentoo/texlive-module-boxhandler-2017.tar.xz mirror://gentoo/texlive-module-bracketkey-2017.tar.xz mirror://gentoo/texlive-module-braket-2017.tar.xz mirror://gentoo/texlive-module-breakurl-2017.tar.xz mirror://gentoo/texlive-module-bullcntr-2017.tar.xz mirror://gentoo/texlive-module-bussproofs-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2017.tar.xz mirror://gentoo/texlive-module-bxenclose-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver-2017.tar.xz mirror://gentoo/texlive-module-calcage-2017.tar.xz mirror://gentoo/texlive-module-calctab-2017.tar.xz mirror://gentoo/texlive-module-calculator-2017.tar.xz mirror://gentoo/texlive-module-calrsfs-2017.tar.xz mirror://gentoo/texlive-module-cals-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2017.tar.xz mirror://gentoo/texlive-module-cancel-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout-2017.tar.xz mirror://gentoo/texlive-module-capt-of-2017.tar.xz mirror://gentoo/texlive-module-captcont-2017.tar.xz mirror://gentoo/texlive-module-captdef-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates-2017.tar.xz mirror://gentoo/texlive-module-cases-2017.tar.xz mirror://gentoo/texlive-module-casyl-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2017.tar.xz mirror://gentoo/texlive-module-catechis-2017.tar.xz mirror://gentoo/texlive-module-catoptions-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic-2017.tar.xz mirror://gentoo/texlive-module-ccaption-2017.tar.xz mirror://gentoo/texlive-module-cclicenses-2017.tar.xz mirror://gentoo/texlive-module-cd-2017.tar.xz mirror://gentoo/texlive-module-cd-cover-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl-2017.tar.xz mirror://gentoo/texlive-module-cellspace-2017.tar.xz mirror://gentoo/texlive-module-censor-2017.tar.xz mirror://gentoo/texlive-module-changebar-2017.tar.xz mirror://gentoo/texlive-module-changelayout-2017.tar.xz mirror://gentoo/texlive-module-changepage-2017.tar.xz mirror://gentoo/texlive-module-changes-2017.tar.xz mirror://gentoo/texlive-module-chappg-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder-2017.tar.xz mirror://gentoo/texlive-module-chet-2017.tar.xz mirror://gentoo/texlive-module-chextras-2017.tar.xz mirror://gentoo/texlive-module-childdoc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat-2017.tar.xz mirror://gentoo/texlive-module-chletter-2017.tar.xz mirror://gentoo/texlive-module-chngcntr-2017.tar.xz mirror://gentoo/texlive-module-chronology-2017.tar.xz mirror://gentoo/texlive-module-circ-2017.tar.xz mirror://gentoo/texlive-module-classics-2017.tar.xz mirror://gentoo/texlive-module-classpack-2017.tar.xz mirror://gentoo/texlive-module-clefval-2017.tar.xz mirror://gentoo/texlive-module-cleveref-2017.tar.xz mirror://gentoo/texlive-module-clipboard-2017.tar.xz mirror://gentoo/texlive-module-clock-2017.tar.xz mirror://gentoo/texlive-module-cmdstring-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack-2017.tar.xz mirror://gentoo/texlive-module-cmsd-2017.tar.xz mirror://gentoo/texlive-module-cnltx-2017.tar.xz mirror://gentoo/texlive-module-cntformats-2017.tar.xz mirror://gentoo/texlive-module-cntperchap-2017.tar.xz mirror://gentoo/texlive-module-codedoc-2017.tar.xz mirror://gentoo/texlive-module-codepage-2017.tar.xz mirror://gentoo/texlive-module-codesection-2017.tar.xz mirror://gentoo/texlive-module-collcell-2017.tar.xz mirror://gentoo/texlive-module-collectbox-2017.tar.xz mirror://gentoo/texlive-module-colordoc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo-2017.tar.xz mirror://gentoo/texlive-module-coloring-2017.tar.xz mirror://gentoo/texlive-module-colorspace-2017.tar.xz mirror://gentoo/texlive-module-colortab-2017.tar.xz mirror://gentoo/texlive-module-colorwav-2017.tar.xz mirror://gentoo/texlive-module-colorweb-2017.tar.xz mirror://gentoo/texlive-module-colourchange-2017.tar.xz mirror://gentoo/texlive-module-combelow-2017.tar.xz mirror://gentoo/texlive-module-combine-2017.tar.xz mirror://gentoo/texlive-module-comma-2017.tar.xz mirror://gentoo/texlive-module-commado-2017.tar.xz mirror://gentoo/texlive-module-comment-2017.tar.xz mirror://gentoo/texlive-module-concepts-2017.tar.xz mirror://gentoo/texlive-module-concprog-2017.tar.xz mirror://gentoo/texlive-module-constants-2017.tar.xz mirror://gentoo/texlive-module-continue-2017.tar.xz mirror://gentoo/texlive-module-contour-2017.tar.xz mirror://gentoo/texlive-module-contracard-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv-2017.tar.xz mirror://gentoo/texlive-module-cooking-2017.tar.xz mirror://gentoo/texlive-module-cooking-units-2017.tar.xz mirror://gentoo/texlive-module-cool-2017.tar.xz mirror://gentoo/texlive-module-coollist-2017.tar.xz mirror://gentoo/texlive-module-coolstr-2017.tar.xz mirror://gentoo/texlive-module-coolthms-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips-2017.tar.xz mirror://gentoo/texlive-module-coordsys-2017.tar.xz mirror://gentoo/texlive-module-copyedit-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox-2017.tar.xz mirror://gentoo/texlive-module-coseoul-2017.tar.xz mirror://gentoo/texlive-module-counttexruns-2017.tar.xz mirror://gentoo/texlive-module-courseoutline-2017.tar.xz mirror://gentoo/texlive-module-coursepaper-2017.tar.xz mirror://gentoo/texlive-module-coverpage-2017.tar.xz mirror://gentoo/texlive-module-cprotect-2017.tar.xz mirror://gentoo/texlive-module-crbox-2017.tar.xz mirror://gentoo/texlive-module-crossreference-2017.tar.xz mirror://gentoo/texlive-module-csquotes-2017.tar.xz mirror://gentoo/texlive-module-css-colors-2017.tar.xz mirror://gentoo/texlive-module-csvsimple-2017.tar.xz mirror://gentoo/texlive-module-cuisine-2017.tar.xz mirror://gentoo/texlive-module-currfile-2017.tar.xz mirror://gentoo/texlive-module-cutwin-2017.tar.xz mirror://gentoo/texlive-module-cv-2017.tar.xz mirror://gentoo/texlive-module-cv4tw-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex-2017.tar.xz mirror://gentoo/texlive-module-cyber-2017.tar.xz mirror://gentoo/texlive-module-cybercic-2017.tar.xz mirror://gentoo/texlive-module-dashbox-2017.tar.xz mirror://gentoo/texlive-module-dashrule-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps-2017.tar.xz mirror://gentoo/texlive-module-dataref-2017.tar.xz mirror://gentoo/texlive-module-datatool-2017.tar.xz mirror://gentoo/texlive-module-dateiliste-2017.tar.xz mirror://gentoo/texlive-module-datenumber-2017.tar.xz mirror://gentoo/texlive-module-datetime-2017.tar.xz mirror://gentoo/texlive-module-datetime2-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2017.tar.xz mirror://gentoo/texlive-module-decimal-2017.tar.xz mirror://gentoo/texlive-module-decorule-2017.tar.xz mirror://gentoo/texlive-module-delimtxt-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc-2017.tar.xz mirror://gentoo/texlive-module-diagbox-2017.tar.xz mirror://gentoo/texlive-module-diagnose-2017.tar.xz mirror://gentoo/texlive-module-dialogl-2017.tar.xz mirror://gentoo/texlive-module-dichokey-2017.tar.xz mirror://gentoo/texlive-module-dinbrief-2017.tar.xz mirror://gentoo/texlive-module-directory-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb-2017.tar.xz mirror://gentoo/texlive-module-dnaseq-2017.tar.xz mirror://gentoo/texlive-module-doclicense-2017.tar.xz mirror://gentoo/texlive-module-docmfp-2017.tar.xz mirror://gentoo/texlive-module-docmute-2017.tar.xz mirror://gentoo/texlive-module-doctools-2017.tar.xz mirror://gentoo/texlive-module-documentation-2017.tar.xz mirror://gentoo/texlive-module-doi-2017.tar.xz mirror://gentoo/texlive-module-dotarrow-2017.tar.xz mirror://gentoo/texlive-module-dotseqn-2017.tar.xz mirror://gentoo/texlive-module-download-2017.tar.xz mirror://gentoo/texlive-module-dox-2017.tar.xz mirror://gentoo/texlive-module-dpfloat-2017.tar.xz mirror://gentoo/texlive-module-dprogress-2017.tar.xz mirror://gentoo/texlive-module-drac-2017.tar.xz mirror://gentoo/texlive-module-draftcopy-2017.tar.xz mirror://gentoo/texlive-module-draftfigure-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark-2017.tar.xz mirror://gentoo/texlive-module-dtk-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2017.tar.xz mirror://gentoo/texlive-module-dynblocks-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn-2017.tar.xz mirror://gentoo/texlive-module-easy-2017.tar.xz mirror://gentoo/texlive-module-easy-todo-2017.tar.xz mirror://gentoo/texlive-module-easyfig-2017.tar.xz mirror://gentoo/texlive-module-easyformat-2017.tar.xz mirror://gentoo/texlive-module-easylist-2017.tar.xz mirror://gentoo/texlive-module-easyreview-2017.tar.xz mirror://gentoo/texlive-module-ebezier-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2017.tar.xz mirror://gentoo/texlive-module-ecv-2017.tar.xz mirror://gentoo/texlive-module-ed-2017.tar.xz mirror://gentoo/texlive-module-edmargin-2017.tar.xz mirror://gentoo/texlive-module-eemeir-2017.tar.xz mirror://gentoo/texlive-module-efbox-2017.tar.xz mirror://gentoo/texlive-module-egplot-2017.tar.xz mirror://gentoo/texlive-module-elements-2017.tar.xz mirror://gentoo/texlive-module-ellipsis-2017.tar.xz mirror://gentoo/texlive-module-elmath-2017.tar.xz mirror://gentoo/texlive-module-elocalloc-2017.tar.xz mirror://gentoo/texlive-module-elpres-2017.tar.xz mirror://gentoo/texlive-module-elzcards-2017.tar.xz mirror://gentoo/texlive-module-emarks-2017.tar.xz mirror://gentoo/texlive-module-embedall-2017.tar.xz mirror://gentoo/texlive-module-embrac-2017.tar.xz mirror://gentoo/texlive-module-emptypage-2017.tar.xz mirror://gentoo/texlive-module-emulateapj-2017.tar.xz mirror://gentoo/texlive-module-endfloat-2017.tar.xz mirror://gentoo/texlive-module-endheads-2017.tar.xz mirror://gentoo/texlive-module-endnotes-2017.tar.xz mirror://gentoo/texlive-module-engpron-2017.tar.xz mirror://gentoo/texlive-module-engrec-2017.tar.xz mirror://gentoo/texlive-module-enotez-2017.tar.xz mirror://gentoo/texlive-module-enumitem-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2017.tar.xz mirror://gentoo/texlive-module-envbig-2017.tar.xz mirror://gentoo/texlive-module-environ-2017.tar.xz mirror://gentoo/texlive-module-epigraph-2017.tar.xz mirror://gentoo/texlive-module-epiolmec-2017.tar.xz mirror://gentoo/texlive-module-eqell-2017.tar.xz mirror://gentoo/texlive-module-eqlist-2017.tar.xz mirror://gentoo/texlive-module-eqnalign-2017.tar.xz mirror://gentoo/texlive-module-eqname-2017.tar.xz mirror://gentoo/texlive-module-eqparbox-2017.tar.xz mirror://gentoo/texlive-module-errata-2017.tar.xz mirror://gentoo/texlive-module-esami-2017.tar.xz mirror://gentoo/texlive-module-esdiff-2017.tar.xz mirror://gentoo/texlive-module-esint-2017.tar.xz mirror://gentoo/texlive-module-esint-type1-2017.tar.xz mirror://gentoo/texlive-module-etaremune-2017.tar.xz mirror://gentoo/texlive-module-etextools-2017.tar.xz mirror://gentoo/texlive-module-etoc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-2017.tar.xz mirror://gentoo/texlive-module-eukdate-2017.tar.xz mirror://gentoo/texlive-module-eulerpx-2017.tar.xz mirror://gentoo/texlive-module-europasscv-2017.tar.xz mirror://gentoo/texlive-module-everyhook-2017.tar.xz mirror://gentoo/texlive-module-everypage-2017.tar.xz mirror://gentoo/texlive-module-exam-2017.tar.xz mirror://gentoo/texlive-module-exam-n-2017.tar.xz mirror://gentoo/texlive-module-examdesign-2017.tar.xz mirror://gentoo/texlive-module-example-2017.tar.xz mirror://gentoo/texlive-module-examplep-2017.tar.xz mirror://gentoo/texlive-module-exceltex-2017.tar.xz mirror://gentoo/texlive-module-excludeonly-2017.tar.xz mirror://gentoo/texlive-module-exercise-2017.tar.xz mirror://gentoo/texlive-module-exercises-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt-2017.tar.xz mirror://gentoo/texlive-module-expdlist-2017.tar.xz mirror://gentoo/texlive-module-export-2017.tar.xz mirror://gentoo/texlive-module-exsheets-2017.tar.xz mirror://gentoo/texlive-module-exsol-2017.tar.xz mirror://gentoo/texlive-module-extract-2017.tar.xz mirror://gentoo/texlive-module-facsimile-2017.tar.xz mirror://gentoo/texlive-module-factura-2017.tar.xz mirror://gentoo/texlive-module-fancylabel-2017.tar.xz mirror://gentoo/texlive-module-fancynum-2017.tar.xz mirror://gentoo/texlive-module-fancypar-2017.tar.xz mirror://gentoo/texlive-module-fancyslides-2017.tar.xz mirror://gentoo/texlive-module-fancytabs-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips-2017.tar.xz mirror://gentoo/texlive-module-fcolumn-2017.tar.xz mirror://gentoo/texlive-module-ffslides-2017.tar.xz mirror://gentoo/texlive-module-fgruler-2017.tar.xz mirror://gentoo/texlive-module-fibeamer-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack-2017.tar.xz mirror://gentoo/texlive-module-figsize-2017.tar.xz mirror://gentoo/texlive-module-filecontents-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2017.tar.xz mirror://gentoo/texlive-module-filedate-2017.tar.xz mirror://gentoo/texlive-module-fileinfo-2017.tar.xz mirror://gentoo/texlive-module-filemod-2017.tar.xz mirror://gentoo/texlive-module-fink-2017.tar.xz mirror://gentoo/texlive-module-finstrut-2017.tar.xz mirror://gentoo/texlive-module-fithesis-2017.tar.xz mirror://gentoo/texlive-module-fixcmex-2017.tar.xz mirror://gentoo/texlive-module-fixfoot-2017.tar.xz mirror://gentoo/texlive-module-fixme-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2017.tar.xz mirror://gentoo/texlive-module-fjodor-2017.tar.xz mirror://gentoo/texlive-module-flabels-2017.tar.xz mirror://gentoo/texlive-module-flacards-2017.tar.xz mirror://gentoo/texlive-module-flagderiv-2017.tar.xz mirror://gentoo/texlive-module-flashcards-2017.tar.xz mirror://gentoo/texlive-module-flashmovie-2017.tar.xz mirror://gentoo/texlive-module-flipbook-2017.tar.xz mirror://gentoo/texlive-module-flippdf-2017.tar.xz mirror://gentoo/texlive-module-floatflt-2017.tar.xz mirror://gentoo/texlive-module-floatrow-2017.tar.xz mirror://gentoo/texlive-module-flowfram-2017.tar.xz mirror://gentoo/texlive-module-fmp-2017.tar.xz mirror://gentoo/texlive-module-fmtcount-2017.tar.xz mirror://gentoo/texlive-module-fn2end-2017.tar.xz mirror://gentoo/texlive-module-fnbreak-2017.tar.xz mirror://gentoo/texlive-module-fncychap-2017.tar.xz mirror://gentoo/texlive-module-fncylab-2017.tar.xz mirror://gentoo/texlive-module-fnpara-2017.tar.xz mirror://gentoo/texlive-module-fnpct-2017.tar.xz mirror://gentoo/texlive-module-fnumprint-2017.tar.xz mirror://gentoo/texlive-module-foilhtml-2017.tar.xz mirror://gentoo/texlive-module-fontaxes-2017.tar.xz mirror://gentoo/texlive-module-fonttable-2017.tar.xz mirror://gentoo/texlive-module-footmisc-2017.tar.xz mirror://gentoo/texlive-module-footmisx-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper-2017.tar.xz mirror://gentoo/texlive-module-footnoterange-2017.tar.xz mirror://gentoo/texlive-module-footnpag-2017.tar.xz mirror://gentoo/texlive-module-forarray-2017.tar.xz mirror://gentoo/texlive-module-foreign-2017.tar.xz mirror://gentoo/texlive-module-forloop-2017.tar.xz mirror://gentoo/texlive-module-formlett-2017.tar.xz mirror://gentoo/texlive-module-formular-2017.tar.xz mirror://gentoo/texlive-module-fragments-2017.tar.xz mirror://gentoo/texlive-module-frame-2017.tar.xz mirror://gentoo/texlive-module-framed-2017.tar.xz mirror://gentoo/texlive-module-frankenstein-2017.tar.xz mirror://gentoo/texlive-module-frege-2017.tar.xz mirror://gentoo/texlive-module-ftcap-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra-2017.tar.xz mirror://gentoo/texlive-module-fullblck-2017.tar.xz mirror://gentoo/texlive-module-fullminipage-2017.tar.xz mirror://gentoo/texlive-module-fullwidth-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2017.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2017.tar.xz mirror://gentoo/texlive-module-fvextra-2017.tar.xz mirror://gentoo/texlive-module-fwlw-2017.tar.xz mirror://gentoo/texlive-module-gauss-2017.tar.xz mirror://gentoo/texlive-module-gcard-2017.tar.xz mirror://gentoo/texlive-module-gcite-2017.tar.xz mirror://gentoo/texlive-module-gender-2017.tar.xz mirror://gentoo/texlive-module-genmpage-2017.tar.xz mirror://gentoo/texlive-module-getfiledate-2017.tar.xz mirror://gentoo/texlive-module-getitems-2017.tar.xz mirror://gentoo/texlive-module-ginpenc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info-2017.tar.xz mirror://gentoo/texlive-module-gitinfo-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2-2017.tar.xz mirror://gentoo/texlive-module-gitlog-2017.tar.xz mirror://gentoo/texlive-module-gloss-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2017.tar.xz mirror://gentoo/texlive-module-gmiflink-2017.tar.xz mirror://gentoo/texlive-module-gmutils-2017.tar.xz mirror://gentoo/texlive-module-gmverb-2017.tar.xz mirror://gentoo/texlive-module-graphbox-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox-2017.tar.xz mirror://gentoo/texlive-module-grayhints-2017.tar.xz mirror://gentoo/texlive-module-grfpaste-2017.tar.xz mirror://gentoo/texlive-module-grid-2017.tar.xz mirror://gentoo/texlive-module-grid-system-2017.tar.xz mirror://gentoo/texlive-module-gridset-2017.tar.xz mirror://gentoo/texlive-module-guitlogo-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath-2017.tar.xz mirror://gentoo/texlive-module-handout-2017.tar.xz mirror://gentoo/texlive-module-hang-2017.tar.xz mirror://gentoo/texlive-module-hanging-2017.tar.xz mirror://gentoo/texlive-module-hardwrap-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv-2017.tar.xz mirror://gentoo/texlive-module-harpoon-2017.tar.xz mirror://gentoo/texlive-module-hc-2017.tar.xz mirror://gentoo/texlive-module-he-she-2017.tar.xz mirror://gentoo/texlive-module-hhtensor-2017.tar.xz mirror://gentoo/texlive-module-histogr-2017.tar.xz mirror://gentoo/texlive-module-hitec-2017.tar.xz mirror://gentoo/texlive-module-hletter-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss-2017.tar.xz mirror://gentoo/texlive-module-hrefhide-2017.tar.xz mirror://gentoo/texlive-module-hvindex-2017.tar.xz mirror://gentoo/texlive-module-hypdvips-2017.tar.xz mirror://gentoo/texlive-module-hyper-2017.tar.xz mirror://gentoo/texlive-module-hypernat-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp-2017.tar.xz mirror://gentoo/texlive-module-hyphenat-2017.tar.xz mirror://gentoo/texlive-module-idxcmds-2017.tar.xz mirror://gentoo/texlive-module-idxlayout-2017.tar.xz mirror://gentoo/texlive-module-iffont-2017.tar.xz mirror://gentoo/texlive-module-ifmslide-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg-2017.tar.xz mirror://gentoo/texlive-module-ifnextok-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage-2017.tar.xz mirror://gentoo/texlive-module-ifplatform-2017.tar.xz mirror://gentoo/texlive-module-ifthenx-2017.tar.xz mirror://gentoo/texlive-module-iitem-2017.tar.xz mirror://gentoo/texlive-module-image-gallery-2017.tar.xz mirror://gentoo/texlive-module-imakeidx-2017.tar.xz mirror://gentoo/texlive-module-import-2017.tar.xz mirror://gentoo/texlive-module-incgraph-2017.tar.xz mirror://gentoo/texlive-module-indextools-2017.tar.xz mirror://gentoo/texlive-module-inlinedef-2017.tar.xz mirror://gentoo/texlive-module-inputtrc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2017.tar.xz mirror://gentoo/texlive-module-interfaces-2017.tar.xz mirror://gentoo/texlive-module-inversepath-2017.tar.xz mirror://gentoo/texlive-module-invoice-2017.tar.xz mirror://gentoo/texlive-module-iso-2017.tar.xz mirror://gentoo/texlive-module-iso10303-2017.tar.xz mirror://gentoo/texlive-module-isodate-2017.tar.xz mirror://gentoo/texlive-module-isodoc-2017.tar.xz mirror://gentoo/texlive-module-isonums-2017.tar.xz mirror://gentoo/texlive-module-isorot-2017.tar.xz mirror://gentoo/texlive-module-isotope-2017.tar.xz mirror://gentoo/texlive-module-issuulinks-2017.tar.xz mirror://gentoo/texlive-module-iwhdp-2017.tar.xz mirror://gentoo/texlive-module-jlabels-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2017.tar.xz mirror://gentoo/texlive-module-jumplines-2017.tar.xz mirror://gentoo/texlive-module-jvlisting-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum-2017.tar.xz mirror://gentoo/texlive-module-kerntest-2017.tar.xz mirror://gentoo/texlive-module-keycommand-2017.tar.xz mirror://gentoo/texlive-module-keyfloat-2017.tar.xz mirror://gentoo/texlive-module-keyreader-2017.tar.xz mirror://gentoo/texlive-module-keystroke-2017.tar.xz mirror://gentoo/texlive-module-keyval2e-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable-2017.tar.xz mirror://gentoo/texlive-module-kix-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2017.tar.xz mirror://gentoo/texlive-module-komacv-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2017.tar.xz mirror://gentoo/texlive-module-l3build-2017.tar.xz mirror://gentoo/texlive-module-labbook-2017.tar.xz mirror://gentoo/texlive-module-labels-2017.tar.xz mirror://gentoo/texlive-module-lastpackage-2017.tar.xz mirror://gentoo/texlive-module-lastpage-2017.tar.xz mirror://gentoo/texlive-module-latex-tds-2017.tar.xz mirror://gentoo/texlive-module-latexdemo-2017.tar.xz mirror://gentoo/texlive-module-latexgit-2017.tar.xz mirror://gentoo/texlive-module-layouts-2017.tar.xz mirror://gentoo/texlive-module-lazylist-2017.tar.xz mirror://gentoo/texlive-module-lcd-2017.tar.xz mirror://gentoo/texlive-module-lcg-2017.tar.xz mirror://gentoo/texlive-module-leading-2017.tar.xz mirror://gentoo/texlive-module-leftidx-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert-2017.tar.xz mirror://gentoo/texlive-module-lettre-2017.tar.xz mirror://gentoo/texlive-module-lettrine-2017.tar.xz mirror://gentoo/texlive-module-lewis-2017.tar.xz mirror://gentoo/texlive-module-lhelp-2017.tar.xz mirror://gentoo/texlive-module-libgreek-2017.tar.xz mirror://gentoo/texlive-module-limap-2017.tar.xz mirror://gentoo/texlive-module-linegoal-2017.tar.xz mirror://gentoo/texlive-module-linop-2017.tar.xz mirror://gentoo/texlive-module-lipsum-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2017.tar.xz mirror://gentoo/texlive-module-listing-2017.tar.xz mirror://gentoo/texlive-module-listlbls-2017.tar.xz mirror://gentoo/texlive-module-listliketab-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols-2017.tar.xz mirror://gentoo/texlive-module-lkproof-2017.tar.xz mirror://gentoo/texlive-module-lmake-2017.tar.xz mirror://gentoo/texlive-module-locality-2017.tar.xz mirror://gentoo/texlive-module-localloc-2017.tar.xz mirror://gentoo/texlive-module-logbox-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2017.tar.xz mirror://gentoo/texlive-module-logpap-2017.tar.xz mirror://gentoo/texlive-module-longfbox-2017.tar.xz mirror://gentoo/texlive-module-longfigure-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2017.tar.xz mirror://gentoo/texlive-module-loops-2017.tar.xz mirror://gentoo/texlive-module-lsc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons-2017.tar.xz mirror://gentoo/texlive-module-lt3graph-2017.tar.xz mirror://gentoo/texlive-module-ltablex-2017.tar.xz mirror://gentoo/texlive-module-ltabptch-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit-2017.tar.xz mirror://gentoo/texlive-module-ltxindex-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys-2017.tar.xz mirror://gentoo/texlive-module-ltxnew-2017.tar.xz mirror://gentoo/texlive-module-ltxtools-2017.tar.xz mirror://gentoo/texlive-module-macroswap-2017.tar.xz mirror://gentoo/texlive-module-magaz-2017.tar.xz mirror://gentoo/texlive-module-mailing-2017.tar.xz mirror://gentoo/texlive-module-mailmerge-2017.tar.xz mirror://gentoo/texlive-module-makebarcode-2017.tar.xz mirror://gentoo/texlive-module-makebase-2017.tar.xz mirror://gentoo/texlive-module-makebox-2017.tar.xz mirror://gentoo/texlive-module-makecell-2017.tar.xz mirror://gentoo/texlive-module-makecirc-2017.tar.xz mirror://gentoo/texlive-module-makecmds-2017.tar.xz mirror://gentoo/texlive-module-makedtx-2017.tar.xz mirror://gentoo/texlive-module-makeglos-2017.tar.xz mirror://gentoo/texlive-module-mandi-2017.tar.xz mirror://gentoo/texlive-module-manfnt-2017.tar.xz mirror://gentoo/texlive-module-manuscript-2017.tar.xz mirror://gentoo/texlive-module-marginfix-2017.tar.xz mirror://gentoo/texlive-module-marginnote-2017.tar.xz mirror://gentoo/texlive-module-markdown-2017.tar.xz mirror://gentoo/texlive-module-mathalfa-2017.tar.xz mirror://gentoo/texlive-module-mathastext-2017.tar.xz mirror://gentoo/texlive-module-mathexam-2017.tar.xz mirror://gentoo/texlive-module-maybemath-2017.tar.xz mirror://gentoo/texlive-module-mbenotes-2017.tar.xz mirror://gentoo/texlive-module-mcaption-2017.tar.xz mirror://gentoo/texlive-module-mceinleger-2017.tar.xz mirror://gentoo/texlive-module-mcexam-2017.tar.xz mirror://gentoo/texlive-module-mcite-2017.tar.xz mirror://gentoo/texlive-module-mciteplus-2017.tar.xz mirror://gentoo/texlive-module-mdframed-2017.tar.xz mirror://gentoo/texlive-module-media9-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2017.tar.xz mirror://gentoo/texlive-module-meetingmins-2017.tar.xz mirror://gentoo/texlive-module-memexsupp-2017.tar.xz mirror://gentoo/texlive-module-memory-2017.tar.xz mirror://gentoo/texlive-module-menu-2017.tar.xz mirror://gentoo/texlive-module-menukeys-2017.tar.xz mirror://gentoo/texlive-module-method-2017.tar.xz mirror://gentoo/texlive-module-metre-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc-2017.tar.xz mirror://gentoo/texlive-module-mftinc-2017.tar.xz mirror://gentoo/texlive-module-midpage-2017.tar.xz mirror://gentoo/texlive-module-minibox-2017.tar.xz mirror://gentoo/texlive-module-minidocument-2017.tar.xz mirror://gentoo/texlive-module-minifp-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2017.tar.xz mirror://gentoo/texlive-module-minitoc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision-2017.tar.xz mirror://gentoo/texlive-module-minted-2017.tar.xz mirror://gentoo/texlive-module-minutes-2017.tar.xz mirror://gentoo/texlive-module-mla-paper-2017.tar.xz mirror://gentoo/texlive-module-mlist-2017.tar.xz mirror://gentoo/texlive-module-mmap-2017.tar.xz mirror://gentoo/texlive-module-mnotes-2017.tar.xz mirror://gentoo/texlive-module-moderncv-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline-2017.tar.xz mirror://gentoo/texlive-module-modref-2017.tar.xz mirror://gentoo/texlive-module-modroman-2017.tar.xz mirror://gentoo/texlive-module-modular-2017.tar.xz mirror://gentoo/texlive-module-monofill-2017.tar.xz mirror://gentoo/texlive-module-moodle-2017.tar.xz mirror://gentoo/texlive-module-moreenum-2017.tar.xz mirror://gentoo/texlive-module-morefloats-2017.tar.xz mirror://gentoo/texlive-module-morehype-2017.tar.xz mirror://gentoo/texlive-module-moresize-2017.tar.xz mirror://gentoo/texlive-module-moreverb-2017.tar.xz mirror://gentoo/texlive-module-morewrites-2017.tar.xz mirror://gentoo/texlive-module-movie15-2017.tar.xz mirror://gentoo/texlive-module-mparhack-2017.tar.xz mirror://gentoo/texlive-module-mpostinl-2017.tar.xz mirror://gentoo/texlive-module-msc-2017.tar.xz mirror://gentoo/texlive-module-msg-2017.tar.xz mirror://gentoo/texlive-module-mslapa-2017.tar.xz mirror://gentoo/texlive-module-mtgreek-2017.tar.xz mirror://gentoo/texlive-module-multenum-2017.tar.xz mirror://gentoo/texlive-module-multiaudience-2017.tar.xz mirror://gentoo/texlive-module-multibbl-2017.tar.xz mirror://gentoo/texlive-module-multicap-2017.tar.xz mirror://gentoo/texlive-module-multidef-2017.tar.xz mirror://gentoo/texlive-module-multienv-2017.tar.xz mirror://gentoo/texlive-module-multiexpand-2017.tar.xz mirror://gentoo/texlive-module-multirow-2017.tar.xz mirror://gentoo/texlive-module-mversion-2017.tar.xz mirror://gentoo/texlive-module-mwe-2017.tar.xz mirror://gentoo/texlive-module-mycv-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat-2017.tar.xz mirror://gentoo/texlive-module-nag-2017.tar.xz mirror://gentoo/texlive-module-nameauth-2017.tar.xz mirror://gentoo/texlive-module-namespc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex-2017.tar.xz mirror://gentoo/texlive-module-ncctools-2017.tar.xz mirror://gentoo/texlive-module-needspace-2017.tar.xz mirror://gentoo/texlive-module-nestquot-2017.tar.xz mirror://gentoo/texlive-module-newcommand-2017.tar.xz mirror://gentoo/texlive-module-newenviron-2017.tar.xz mirror://gentoo/texlive-module-newfile-2017.tar.xz mirror://gentoo/texlive-module-newlfm-2017.tar.xz mirror://gentoo/texlive-module-newspaper-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar-2017.tar.xz mirror://gentoo/texlive-module-newvbtm-2017.tar.xz mirror://gentoo/texlive-module-newverbs-2017.tar.xz mirror://gentoo/texlive-module-nextpage-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist-2017.tar.xz mirror://gentoo/texlive-module-niceframe-2017.tar.xz mirror://gentoo/texlive-module-nicetext-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc-2017.tar.xz mirror://gentoo/texlive-module-noconflict-2017.tar.xz mirror://gentoo/texlive-module-noindentafter-2017.tar.xz mirror://gentoo/texlive-module-noitcrul-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks-2017.tar.xz mirror://gentoo/texlive-module-nomencl-2017.tar.xz mirror://gentoo/texlive-module-nomentbl-2017.tar.xz mirror://gentoo/texlive-module-nonfloat-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart-2017.tar.xz mirror://gentoo/texlive-module-nopageno-2017.tar.xz mirror://gentoo/texlive-module-normalcolor-2017.tar.xz mirror://gentoo/texlive-module-notes-2017.tar.xz mirror://gentoo/texlive-module-notespages-2017.tar.xz mirror://gentoo/texlive-module-notoccite-2017.tar.xz mirror://gentoo/texlive-module-nowidow-2017.tar.xz mirror://gentoo/texlive-module-nox-2017.tar.xz mirror://gentoo/texlive-module-ntheorem-2017.tar.xz mirror://gentoo/texlive-module-numberedblock-2017.tar.xz mirror://gentoo/texlive-module-numname-2017.tar.xz mirror://gentoo/texlive-module-numprint-2017.tar.xz mirror://gentoo/texlive-module-numspell-2017.tar.xz mirror://gentoo/texlive-module-ocg-p-2017.tar.xz mirror://gentoo/texlive-module-ocgx-2017.tar.xz mirror://gentoo/texlive-module-ocgx2-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex-2017.tar.xz mirror://gentoo/texlive-module-octavo-2017.tar.xz mirror://gentoo/texlive-module-oldstyle-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2017.tar.xz mirror://gentoo/texlive-module-opcit-2017.tar.xz mirror://gentoo/texlive-module-optidef-2017.tar.xz mirror://gentoo/texlive-module-optional-2017.tar.xz mirror://gentoo/texlive-module-options-2017.tar.xz mirror://gentoo/texlive-module-outline-2017.tar.xz mirror://gentoo/texlive-module-outliner-2017.tar.xz mirror://gentoo/texlive-module-outlines-2017.tar.xz mirror://gentoo/texlive-module-overlays-2017.tar.xz mirror://gentoo/texlive-module-overpic-2017.tar.xz mirror://gentoo/texlive-module-pagecolor-2017.tar.xz mirror://gentoo/texlive-module-pagecont-2017.tar.xz mirror://gentoo/texlive-module-pagenote-2017.tar.xz mirror://gentoo/texlive-module-pagerange-2017.tar.xz mirror://gentoo/texlive-module-pageslts-2017.tar.xz mirror://gentoo/texlive-module-paper-2017.tar.xz mirror://gentoo/texlive-module-papercdcase-2017.tar.xz mirror://gentoo/texlive-module-papermas-2017.tar.xz mirror://gentoo/texlive-module-papertex-2017.tar.xz mirror://gentoo/texlive-module-paracol-2017.tar.xz mirror://gentoo/texlive-module-parades-2017.tar.xz mirror://gentoo/texlive-module-paralist-2017.tar.xz mirror://gentoo/texlive-module-paresse-2017.tar.xz mirror://gentoo/texlive-module-parnotes-2017.tar.xz mirror://gentoo/texlive-module-parselines-2017.tar.xz mirror://gentoo/texlive-module-pas-cours-2017.tar.xz mirror://gentoo/texlive-module-pas-cv-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur-2017.tar.xz mirror://gentoo/texlive-module-patch-2017.tar.xz mirror://gentoo/texlive-module-patchcmd-2017.tar.xz mirror://gentoo/texlive-module-pauldoc-2017.tar.xz mirror://gentoo/texlive-module-pawpict-2017.tar.xz mirror://gentoo/texlive-module-pbox-2017.tar.xz mirror://gentoo/texlive-module-pbsheet-2017.tar.xz mirror://gentoo/texlive-module-pdf14-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen-2017.tar.xz mirror://gentoo/texlive-module-pdfslide-2017.tar.xz mirror://gentoo/texlive-module-pdfsync-2017.tar.xz mirror://gentoo/texlive-module-pdfwin-2017.tar.xz mirror://gentoo/texlive-module-pdfx-2017.tar.xz mirror://gentoo/texlive-module-pecha-2017.tar.xz mirror://gentoo/texlive-module-perltex-2017.tar.xz mirror://gentoo/texlive-module-permute-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2017.tar.xz mirror://gentoo/texlive-module-phfnote-2017.tar.xz mirror://gentoo/texlive-module-phfparen-2017.tar.xz mirror://gentoo/texlive-module-phfqit-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2017.tar.xz mirror://gentoo/texlive-module-phfthm-2017.tar.xz mirror://gentoo/texlive-module-philex-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers-2017.tar.xz mirror://gentoo/texlive-module-photo-2017.tar.xz mirror://gentoo/texlive-module-piff-2017.tar.xz mirror://gentoo/texlive-module-pkgloader-2017.tar.xz mirror://gentoo/texlive-module-placeins-2017.tar.xz mirror://gentoo/texlive-module-plantslabels-2017.tar.xz mirror://gentoo/texlive-module-plates-2017.tar.xz mirror://gentoo/texlive-module-plweb-2017.tar.xz mirror://gentoo/texlive-module-polynom-2017.tar.xz mirror://gentoo/texlive-module-polynomial-2017.tar.xz mirror://gentoo/texlive-module-polytable-2017.tar.xz mirror://gentoo/texlive-module-postcards-2017.tar.xz mirror://gentoo/texlive-module-poster-mac-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv-2017.tar.xz mirror://gentoo/texlive-module-preprint-2017.tar.xz mirror://gentoo/texlive-module-pressrelease-2017.tar.xz mirror://gentoo/texlive-module-prettyref-2017.tar.xz mirror://gentoo/texlive-module-preview-2017.tar.xz mirror://gentoo/texlive-module-printlen-2017.tar.xz mirror://gentoo/texlive-module-probsoln-2017.tar.xz mirror://gentoo/texlive-module-program-2017.tar.xz mirror://gentoo/texlive-module-progress-2017.tar.xz mirror://gentoo/texlive-module-progressbar-2017.tar.xz mirror://gentoo/texlive-module-proofread-2017.tar.xz mirror://gentoo/texlive-module-properties-2017.tar.xz mirror://gentoo/texlive-module-prosper-2017.tar.xz mirror://gentoo/texlive-module-protex-2017.tar.xz mirror://gentoo/texlive-module-protocol-2017.tar.xz mirror://gentoo/texlive-module-psfragx-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-pstool-2017.tar.xz mirror://gentoo/texlive-module-pstring-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks-2017.tar.xz mirror://gentoo/texlive-module-python-2017.tar.xz mirror://gentoo/texlive-module-qcm-2017.tar.xz mirror://gentoo/texlive-module-qstest-2017.tar.xz mirror://gentoo/texlive-module-qsymbols-2017.tar.xz mirror://gentoo/texlive-module-quicktype-2017.tar.xz mirror://gentoo/texlive-module-quotchap-2017.tar.xz mirror://gentoo/texlive-module-quoting-2017.tar.xz mirror://gentoo/texlive-module-quotmark-2017.tar.xz mirror://gentoo/texlive-module-ran_toks-2017.tar.xz mirror://gentoo/texlive-module-randtext-2017.tar.xz mirror://gentoo/texlive-module-rccol-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo-2017.tar.xz mirror://gentoo/texlive-module-readarray-2017.tar.xz mirror://gentoo/texlive-module-realboxes-2017.tar.xz mirror://gentoo/texlive-module-recipe-2017.tar.xz mirror://gentoo/texlive-module-recipebook-2017.tar.xz mirror://gentoo/texlive-module-recipecard-2017.tar.xz mirror://gentoo/texlive-module-rectopma-2017.tar.xz mirror://gentoo/texlive-module-refcheck-2017.tar.xz mirror://gentoo/texlive-module-refenums-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2017.tar.xz mirror://gentoo/texlive-module-refman-2017.tar.xz mirror://gentoo/texlive-module-refstyle-2017.tar.xz mirror://gentoo/texlive-module-regcount-2017.tar.xz mirror://gentoo/texlive-module-regexpatch-2017.tar.xz mirror://gentoo/texlive-module-register-2017.tar.xz mirror://gentoo/texlive-module-regstats-2017.tar.xz mirror://gentoo/texlive-module-relenc-2017.tar.xz mirror://gentoo/texlive-module-relsize-2017.tar.xz mirror://gentoo/texlive-module-repeatindex-2017.tar.xz mirror://gentoo/texlive-module-repltext-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap-2017.tar.xz mirror://gentoo/texlive-module-rlepsf-2017.tar.xz mirror://gentoo/texlive-module-rmpage-2017.tar.xz mirror://gentoo/texlive-module-robustcommand-2017.tar.xz mirror://gentoo/texlive-module-robustindex-2017.tar.xz mirror://gentoo/texlive-module-romanbar-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2017.tar.xz mirror://gentoo/texlive-module-romanneg-2017.tar.xz mirror://gentoo/texlive-module-romannum-2017.tar.xz mirror://gentoo/texlive-module-rotfloat-2017.tar.xz mirror://gentoo/texlive-module-rotpages-2017.tar.xz mirror://gentoo/texlive-module-roundbox-2017.tar.xz mirror://gentoo/texlive-module-rterface-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass-2017.tar.xz mirror://gentoo/texlive-module-rvwrite-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2017.tar.xz mirror://gentoo/texlive-module-sauerj-2017.tar.xz mirror://gentoo/texlive-module-savefnmark-2017.tar.xz mirror://gentoo/texlive-module-savesym-2017.tar.xz mirror://gentoo/texlive-module-savetrees-2017.tar.xz mirror://gentoo/texlive-module-scale-2017.tar.xz mirror://gentoo/texlive-module-scalebar-2017.tar.xz mirror://gentoo/texlive-module-scalerel-2017.tar.xz mirror://gentoo/texlive-module-scanpages-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2017.tar.xz mirror://gentoo/texlive-module-sdrt-2017.tar.xz mirror://gentoo/texlive-module-secdot-2017.tar.xz mirror://gentoo/texlive-module-sectionbox-2017.tar.xz mirror://gentoo/texlive-module-sectsty-2017.tar.xz mirror://gentoo/texlive-module-seealso-2017.tar.xz mirror://gentoo/texlive-module-selectp-2017.tar.xz mirror://gentoo/texlive-module-semantic-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup-2017.tar.xz mirror://gentoo/texlive-module-semioneside-2017.tar.xz mirror://gentoo/texlive-module-semproc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2017.tar.xz mirror://gentoo/texlive-module-seqsplit-2017.tar.xz mirror://gentoo/texlive-module-sesstime-2017.tar.xz mirror://gentoo/texlive-module-sf298-2017.tar.xz mirror://gentoo/texlive-module-sffms-2017.tar.xz mirror://gentoo/texlive-module-sfmath-2017.tar.xz mirror://gentoo/texlive-module-shadethm-2017.tar.xz mirror://gentoo/texlive-module-shadow-2017.tar.xz mirror://gentoo/texlive-module-shadowtext-2017.tar.xz mirror://gentoo/texlive-module-shapepar-2017.tar.xz mirror://gentoo/texlive-module-shdoc-2017.tar.xz mirror://gentoo/texlive-module-shipunov-2017.tar.xz mirror://gentoo/texlive-module-shorttoc-2017.tar.xz mirror://gentoo/texlive-module-show2e-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox-2017.tar.xz mirror://gentoo/texlive-module-showdim-2017.tar.xz mirror://gentoo/texlive-module-showexpl-2017.tar.xz mirror://gentoo/texlive-module-showlabels-2017.tar.xz mirror://gentoo/texlive-module-sidecap-2017.tar.xz mirror://gentoo/texlive-module-sidenotes-2017.tar.xz mirror://gentoo/texlive-module-silence-2017.tar.xz mirror://gentoo/texlive-module-simplecd-2017.tar.xz mirror://gentoo/texlive-module-simplecv-2017.tar.xz mirror://gentoo/texlive-module-sitem-2017.tar.xz mirror://gentoo/texlive-module-skb-2017.tar.xz mirror://gentoo/texlive-module-skdoc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand-2017.tar.xz mirror://gentoo/texlive-module-skeyval-2017.tar.xz mirror://gentoo/texlive-module-skrapport-2017.tar.xz mirror://gentoo/texlive-module-slantsc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof-2017.tar.xz mirror://gentoo/texlive-module-smartunits-2017.tar.xz mirror://gentoo/texlive-module-smartref-2017.tar.xz mirror://gentoo/texlive-module-snapshot-2017.tar.xz mirror://gentoo/texlive-module-snotez-2017.tar.xz mirror://gentoo/texlive-module-soul-2017.tar.xz mirror://gentoo/texlive-module-sparklines-2017.tar.xz mirror://gentoo/texlive-module-sphack-2017.tar.xz mirror://gentoo/texlive-module-splitindex-2017.tar.xz mirror://gentoo/texlive-module-spot-2017.tar.xz mirror://gentoo/texlive-module-spotcolor-2017.tar.xz mirror://gentoo/texlive-module-spreadtab-2017.tar.xz mirror://gentoo/texlive-module-spverbatim-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem-2017.tar.xz mirror://gentoo/texlive-module-srcltx-2017.tar.xz mirror://gentoo/texlive-module-sseq-2017.tar.xz mirror://gentoo/texlive-module-sslides-2017.tar.xz mirror://gentoo/texlive-module-stack-2017.tar.xz mirror://gentoo/texlive-module-stackengine-2017.tar.xz mirror://gentoo/texlive-module-standalone-2017.tar.xz mirror://gentoo/texlive-module-statistik-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv-2017.tar.xz mirror://gentoo/texlive-module-stdpage-2017.tar.xz mirror://gentoo/texlive-module-stex-2017.tar.xz mirror://gentoo/texlive-module-storebox-2017.tar.xz mirror://gentoo/texlive-module-storecmd-2017.tar.xz mirror://gentoo/texlive-module-stringstrings-2017.tar.xz mirror://gentoo/texlive-module-sttools-2017.tar.xz mirror://gentoo/texlive-module-stubs-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts-2017.tar.xz mirror://gentoo/texlive-module-subdepth-2017.tar.xz mirror://gentoo/texlive-module-subeqn-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray-2017.tar.xz mirror://gentoo/texlive-module-subfigmat-2017.tar.xz mirror://gentoo/texlive-module-subfigure-2017.tar.xz mirror://gentoo/texlive-module-subfiles-2017.tar.xz mirror://gentoo/texlive-module-subfloat-2017.tar.xz mirror://gentoo/texlive-module-substitutefont-2017.tar.xz mirror://gentoo/texlive-module-substr-2017.tar.xz mirror://gentoo/texlive-module-supertabular-2017.tar.xz mirror://gentoo/texlive-module-svg-2017.tar.xz mirror://gentoo/texlive-module-svgcolor-2017.tar.xz mirror://gentoo/texlive-module-svn-2017.tar.xz mirror://gentoo/texlive-module-svn-multi-2017.tar.xz mirror://gentoo/texlive-module-svn-prov-2017.tar.xz mirror://gentoo/texlive-module-syntax-2017.tar.xz mirror://gentoo/texlive-module-syntrace-2017.tar.xz mirror://gentoo/texlive-module-synttree-2017.tar.xz mirror://gentoo/texlive-module-tabfigures-2017.tar.xz mirror://gentoo/texlive-module-tableaux-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote-2017.tar.xz mirror://gentoo/texlive-module-tableof-2017.tar.xz mirror://gentoo/texlive-module-tablestyles-2017.tar.xz mirror://gentoo/texlive-module-tablists-2017.tar.xz mirror://gentoo/texlive-module-tabls-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2017.tar.xz mirror://gentoo/texlive-module-tabu-2017.tar.xz mirror://gentoo/texlive-module-tabularborder-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc-2017.tar.xz mirror://gentoo/texlive-module-tabularew-2017.tar.xz mirror://gentoo/texlive-module-tabulary-2017.tar.xz mirror://gentoo/texlive-module-tagging-2017.tar.xz mirror://gentoo/texlive-module-tagpair-2017.tar.xz mirror://gentoo/texlive-module-talk-2017.tar.xz mirror://gentoo/texlive-module-tamefloats-2017.tar.xz mirror://gentoo/texlive-module-tasks-2017.tar.xz mirror://gentoo/texlive-module-tcldoc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox-2017.tar.xz mirror://gentoo/texlive-module-tdclock-2017.tar.xz mirror://gentoo/texlive-module-technics-2017.tar.xz mirror://gentoo/texlive-module-ted-2017.tar.xz mirror://gentoo/texlive-module-templatetools-2017.tar.xz mirror://gentoo/texlive-module-termcal-2017.tar.xz mirror://gentoo/texlive-module-termlist-2017.tar.xz mirror://gentoo/texlive-module-testhyphens-2017.tar.xz mirror://gentoo/texlive-module-testidx-2017.tar.xz mirror://gentoo/texlive-module-tex-label-2017.tar.xz mirror://gentoo/texlive-module-texlogos-2017.tar.xz mirror://gentoo/texlive-module-texmate-2017.tar.xz mirror://gentoo/texlive-module-texments-2017.tar.xz mirror://gentoo/texlive-module-texpower-2017.tar.xz mirror://gentoo/texlive-module-texshade-2017.tar.xz mirror://gentoo/texlive-module-texvc-2017.tar.xz mirror://gentoo/texlive-module-textfit-2017.tar.xz mirror://gentoo/texlive-module-textmerg-2017.tar.xz mirror://gentoo/texlive-module-textpos-2017.tar.xz mirror://gentoo/texlive-module-theoremref-2017.tar.xz mirror://gentoo/texlive-module-thinsp-2017.tar.xz mirror://gentoo/texlive-module-thmtools-2017.tar.xz mirror://gentoo/texlive-module-threadcol-2017.tar.xz mirror://gentoo/texlive-module-threeparttable-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex-2017.tar.xz mirror://gentoo/texlive-module-thumb-2017.tar.xz mirror://gentoo/texlive-module-thumbs-2017.tar.xz mirror://gentoo/texlive-module-thumby-2017.tar.xz mirror://gentoo/texlive-module-ticket-2017.tar.xz mirror://gentoo/texlive-module-titlecaps-2017.tar.xz mirror://gentoo/texlive-module-titlefoot-2017.tar.xz mirror://gentoo/texlive-module-titlepic-2017.tar.xz mirror://gentoo/texlive-module-titleref-2017.tar.xz mirror://gentoo/texlive-module-titlesec-2017.tar.xz mirror://gentoo/texlive-module-titling-2017.tar.xz mirror://gentoo/texlive-module-tocbibind-2017.tar.xz mirror://gentoo/texlive-module-tocdata-2017.tar.xz mirror://gentoo/texlive-module-tocloft-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2-2017.tar.xz mirror://gentoo/texlive-module-todo-2017.tar.xz mirror://gentoo/texlive-module-todonotes-2017.tar.xz mirror://gentoo/texlive-module-tokenizer-2017.tar.xz mirror://gentoo/texlive-module-toolbox-2017.tar.xz mirror://gentoo/texlive-module-topfloat-2017.tar.xz mirror://gentoo/texlive-module-totcount-2017.tar.xz mirror://gentoo/texlive-module-totpages-2017.tar.xz mirror://gentoo/texlive-module-translations-2017.tar.xz mirror://gentoo/texlive-module-trfsigns-2017.tar.xz mirror://gentoo/texlive-module-trimspaces-2017.tar.xz mirror://gentoo/texlive-module-trivfloat-2017.tar.xz mirror://gentoo/texlive-module-trsym-2017.tar.xz mirror://gentoo/texlive-module-truncate-2017.tar.xz mirror://gentoo/texlive-module-tucv-2017.tar.xz mirror://gentoo/texlive-module-turnthepage-2017.tar.xz mirror://gentoo/texlive-module-twoinone-2017.tar.xz mirror://gentoo/texlive-module-twoup-2017.tar.xz mirror://gentoo/texlive-module-txgreeks-2017.tar.xz mirror://gentoo/texlive-module-type1cm-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist-2017.tar.xz mirror://gentoo/texlive-module-typeface-2017.tar.xz mirror://gentoo/texlive-module-typoaid-2017.tar.xz mirror://gentoo/texlive-module-typogrid-2017.tar.xz mirror://gentoo/texlive-module-uassign-2017.tar.xz mirror://gentoo/texlive-module-ucs-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2017.tar.xz mirror://gentoo/texlive-module-umoline-2017.tar.xz mirror://gentoo/texlive-module-underlin-2017.tar.xz mirror://gentoo/texlive-module-underoverlap-2017.tar.xz mirror://gentoo/texlive-module-undolabl-2017.tar.xz mirror://gentoo/texlive-module-units-2017.tar.xz mirror://gentoo/texlive-module-unravel-2017.tar.xz mirror://gentoo/texlive-module-upmethodology-2017.tar.xz mirror://gentoo/texlive-module-upquote-2017.tar.xz mirror://gentoo/texlive-module-uri-2017.tar.xz mirror://gentoo/texlive-module-ushort-2017.tar.xz mirror://gentoo/texlive-module-uspace-2017.tar.xz mirror://gentoo/texlive-module-uwmslide-2017.tar.xz mirror://gentoo/texlive-module-variablelm-2017.tar.xz mirror://gentoo/texlive-module-varindex-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2017.tar.xz mirror://gentoo/texlive-module-varwidth-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting-2017.tar.xz mirror://gentoo/texlive-module-verbasef-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2017.tar.xz mirror://gentoo/texlive-module-verbdef-2017.tar.xz mirror://gentoo/texlive-module-verbments-2017.tar.xz mirror://gentoo/texlive-module-version-2017.tar.xz mirror://gentoo/texlive-module-versions-2017.tar.xz mirror://gentoo/texlive-module-versonotes-2017.tar.xz mirror://gentoo/texlive-module-vertbars-2017.tar.xz mirror://gentoo/texlive-module-vgrid-2017.tar.xz mirror://gentoo/texlive-module-vhistory-2017.tar.xz mirror://gentoo/texlive-module-vmargin-2017.tar.xz mirror://gentoo/texlive-module-volumes-2017.tar.xz mirror://gentoo/texlive-module-vpe-2017.tar.xz mirror://gentoo/texlive-module-vruler-2017.tar.xz mirror://gentoo/texlive-module-vwcol-2017.tar.xz mirror://gentoo/texlive-module-wallpaper-2017.tar.xz mirror://gentoo/texlive-module-warning-2017.tar.xz mirror://gentoo/texlive-module-warpcol-2017.tar.xz mirror://gentoo/texlive-module-was-2017.tar.xz mirror://gentoo/texlive-module-widetable-2017.tar.xz mirror://gentoo/texlive-module-williams-2017.tar.xz mirror://gentoo/texlive-module-withargs-2017.tar.xz mirror://gentoo/texlive-module-wordcount-2017.tar.xz mirror://gentoo/texlive-module-wordlike-2017.tar.xz mirror://gentoo/texlive-module-wrapfig-2017.tar.xz mirror://gentoo/texlive-module-wtref-2017.tar.xz mirror://gentoo/texlive-module-xargs-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2017.tar.xz mirror://gentoo/texlive-module-xcomment-2017.tar.xz mirror://gentoo/texlive-module-xdoc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis-2017.tar.xz mirror://gentoo/texlive-module-xfor-2017.tar.xz mirror://gentoo/texlive-module-xhfill-2017.tar.xz mirror://gentoo/texlive-module-xifthen-2017.tar.xz mirror://gentoo/texlive-module-xint-2017.tar.xz mirror://gentoo/texlive-module-xmpincl-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand-2017.tar.xz mirror://gentoo/texlive-module-xoptarg-2017.tar.xz mirror://gentoo/texlive-module-xpatch-2017.tar.xz mirror://gentoo/texlive-module-xpeek-2017.tar.xz mirror://gentoo/texlive-module-xprintlen-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate-2017.tar.xz mirror://gentoo/texlive-module-xsavebox-2017.tar.xz mirror://gentoo/texlive-module-xsim-2017.tar.xz mirror://gentoo/texlive-module-xstring-2017.tar.xz mirror://gentoo/texlive-module-xtab-2017.tar.xz mirror://gentoo/texlive-module-xwatermark-2017.tar.xz mirror://gentoo/texlive-module-xytree-2017.tar.xz mirror://gentoo/texlive-module-yafoot-2017.tar.xz mirror://gentoo/texlive-module-yaletter-2017.tar.xz mirror://gentoo/texlive-module-yagusylo-2017.tar.xz mirror://gentoo/texlive-module-ycbook-2017.tar.xz mirror://gentoo/texlive-module-ydoc-2017.tar.xz mirror://gentoo/texlive-module-yplan-2017.tar.xz mirror://gentoo/texlive-module-zed-csp-2017.tar.xz mirror://gentoo/texlive-module-ziffer-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2017.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2017.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2017.tar.xz mirror://gentoo/texlive-module-GS1.doc-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2017.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2017.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2017.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2017.tar.xz mirror://gentoo/texlive-module-abraces.doc-2017.tar.xz mirror://gentoo/texlive-module-abstract.doc-2017.tar.xz mirror://gentoo/texlive-module-achemso.doc-2017.tar.xz mirror://gentoo/texlive-module-acro.doc-2017.tar.xz mirror://gentoo/texlive-module-acronym.doc-2017.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.doc-2017.tar.xz mirror://gentoo/texlive-module-addfont.doc-2017.tar.xz mirror://gentoo/texlive-module-addlines.doc-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2017.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2017.tar.xz mirror://gentoo/texlive-module-advdate.doc-2017.tar.xz mirror://gentoo/texlive-module-akktex.doc-2017.tar.xz mirror://gentoo/texlive-module-akletter.doc-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2017.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2017.tar.xz mirror://gentoo/texlive-module-altfont.doc-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2017.tar.xz mirror://gentoo/texlive-module-animate.doc-2017.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2017.tar.xz mirror://gentoo/texlive-module-answers.doc-2017.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2017.tar.xz mirror://gentoo/texlive-module-appendix.doc-2017.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-apptools.doc-2017.tar.xz mirror://gentoo/texlive-module-arcs.doc-2017.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2017.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2017.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2017.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2017.tar.xz mirror://gentoo/texlive-module-assignment.doc-2017.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2017.tar.xz mirror://gentoo/texlive-module-aurl.doc-2017.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2017.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2017.tar.xz mirror://gentoo/texlive-module-autonum.doc-2017.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2017.tar.xz mirror://gentoo/texlive-module-avremu.doc-2017.tar.xz mirror://gentoo/texlive-module-background.doc-2017.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2017.tar.xz mirror://gentoo/texlive-module-bashful.doc-2017.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2017.tar.xz mirror://gentoo/texlive-module-bchart.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2017.tar.xz mirror://gentoo/texlive-module-beton.doc-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2017.tar.xz mirror://gentoo/texlive-module-bez123.doc-2017.tar.xz mirror://gentoo/texlive-module-bezos.doc-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-bigints.doc-2017.tar.xz mirror://gentoo/texlive-module-biochemistry-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2017.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2017.tar.xz mirror://gentoo/texlive-module-block.doc-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-boites.doc-2017.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2017.tar.xz mirror://gentoo/texlive-module-bookest.doc-2017.tar.xz mirror://gentoo/texlive-module-booklet.doc-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2017.tar.xz mirror://gentoo/texlive-module-bophook.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2017.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2017.tar.xz mirror://gentoo/texlive-module-braket.doc-2017.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2017.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2017.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2017.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2017.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2017.tar.xz mirror://gentoo/texlive-module-calcage.doc-2017.tar.xz mirror://gentoo/texlive-module-calctab.doc-2017.tar.xz mirror://gentoo/texlive-module-calculator.doc-2017.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-cals.doc-2017.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2017.tar.xz mirror://gentoo/texlive-module-cancel.doc-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2017.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2017.tar.xz mirror://gentoo/texlive-module-captcont.doc-2017.tar.xz mirror://gentoo/texlive-module-captdef.doc-2017.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2017.tar.xz mirror://gentoo/texlive-module-cases.doc-2017.tar.xz mirror://gentoo/texlive-module-casyl.doc-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2017.tar.xz mirror://gentoo/texlive-module-catechis.doc-2017.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2017.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2017.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2017.tar.xz mirror://gentoo/texlive-module-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2017.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2017.tar.xz mirror://gentoo/texlive-module-censor.doc-2017.tar.xz mirror://gentoo/texlive-module-changebar.doc-2017.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2017.tar.xz mirror://gentoo/texlive-module-changepage.doc-2017.tar.xz mirror://gentoo/texlive-module-changes.doc-2017.tar.xz mirror://gentoo/texlive-module-chappg.doc-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2017.tar.xz mirror://gentoo/texlive-module-chet.doc-2017.tar.xz mirror://gentoo/texlive-module-chextras.doc-2017.tar.xz mirror://gentoo/texlive-module-childdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-chletter.doc-2017.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2017.tar.xz mirror://gentoo/texlive-module-chronology.doc-2017.tar.xz mirror://gentoo/texlive-module-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-classics.doc-2017.tar.xz mirror://gentoo/texlive-module-classpack.doc-2017.tar.xz mirror://gentoo/texlive-module-clefval.doc-2017.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2017.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2017.tar.xz mirror://gentoo/texlive-module-clock.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2017.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2017.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2017.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2017.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2017.tar.xz mirror://gentoo/texlive-module-codepage.doc-2017.tar.xz mirror://gentoo/texlive-module-codesection.doc-2017.tar.xz mirror://gentoo/texlive-module-collcell.doc-2017.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2017.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2017.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-coloring.doc-2017.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2017.tar.xz mirror://gentoo/texlive-module-colortab.doc-2017.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2017.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2017.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2017.tar.xz mirror://gentoo/texlive-module-combelow.doc-2017.tar.xz mirror://gentoo/texlive-module-combine.doc-2017.tar.xz mirror://gentoo/texlive-module-comma.doc-2017.tar.xz mirror://gentoo/texlive-module-commado.doc-2017.tar.xz mirror://gentoo/texlive-module-comment.doc-2017.tar.xz mirror://gentoo/texlive-module-concepts.doc-2017.tar.xz mirror://gentoo/texlive-module-concprog.doc-2017.tar.xz mirror://gentoo/texlive-module-constants.doc-2017.tar.xz mirror://gentoo/texlive-module-continue.doc-2017.tar.xz mirror://gentoo/texlive-module-contour.doc-2017.tar.xz mirror://gentoo/texlive-module-contracard.doc-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking.doc-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2017.tar.xz mirror://gentoo/texlive-module-cool.doc-2017.tar.xz mirror://gentoo/texlive-module-coollist.doc-2017.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2017.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2017.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2017.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2017.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2017.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2017.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2017.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2017.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2017.tar.xz mirror://gentoo/texlive-module-crbox.doc-2017.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2017.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2017.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2017.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2017.tar.xz mirror://gentoo/texlive-module-currfile.doc-2017.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2017.tar.xz mirror://gentoo/texlive-module-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-cyber.doc-2017.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2017.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2017.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2017.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2017.tar.xz mirror://gentoo/texlive-module-dataref.doc-2017.tar.xz mirror://gentoo/texlive-module-datatool.doc-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2017.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2017.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2017.tar.xz mirror://gentoo/texlive-module-decimal.doc-2017.tar.xz mirror://gentoo/texlive-module-decorule.doc-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2017.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2017.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2017.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2017.tar.xz mirror://gentoo/texlive-module-directory.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2017.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2017.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2017.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2017.tar.xz mirror://gentoo/texlive-module-docmute.doc-2017.tar.xz mirror://gentoo/texlive-module-doctools.doc-2017.tar.xz mirror://gentoo/texlive-module-documentation.doc-2017.tar.xz mirror://gentoo/texlive-module-doi.doc-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2017.tar.xz mirror://gentoo/texlive-module-download.doc-2017.tar.xz mirror://gentoo/texlive-module-dox.doc-2017.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2017.tar.xz mirror://gentoo/texlive-module-drac.doc-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-draftfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-dtk.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2017.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2017.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2017.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2017.tar.xz mirror://gentoo/texlive-module-easy.doc-2017.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-easyformat.doc-2017.tar.xz mirror://gentoo/texlive-module-easylist.doc-2017.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2017.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2017.tar.xz mirror://gentoo/texlive-module-ecv.doc-2017.tar.xz mirror://gentoo/texlive-module-ed.doc-2017.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2017.tar.xz mirror://gentoo/texlive-module-efbox.doc-2017.tar.xz mirror://gentoo/texlive-module-egplot.doc-2017.tar.xz mirror://gentoo/texlive-module-elements.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-elmath.doc-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2017.tar.xz mirror://gentoo/texlive-module-elpres.doc-2017.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2017.tar.xz mirror://gentoo/texlive-module-emarks.doc-2017.tar.xz mirror://gentoo/texlive-module-embedall.doc-2017.tar.xz mirror://gentoo/texlive-module-embrac.doc-2017.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2017.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2017.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-endheads.doc-2017.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-engpron.doc-2017.tar.xz mirror://gentoo/texlive-module-engrec.doc-2017.tar.xz mirror://gentoo/texlive-module-enotez.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2017.tar.xz mirror://gentoo/texlive-module-envbig.doc-2017.tar.xz mirror://gentoo/texlive-module-environ.doc-2017.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2017.tar.xz mirror://gentoo/texlive-module-eqell.doc-2017.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.doc-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2017.tar.xz mirror://gentoo/texlive-module-errata.doc-2017.tar.xz mirror://gentoo/texlive-module-esami.doc-2017.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-esint.doc-2017.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2017.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2017.tar.xz mirror://gentoo/texlive-module-etextools.doc-2017.tar.xz mirror://gentoo/texlive-module-etoc.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2017.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2017.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2017.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2017.tar.xz mirror://gentoo/texlive-module-everypage.doc-2017.tar.xz mirror://gentoo/texlive-module-exam.doc-2017.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2017.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2017.tar.xz mirror://gentoo/texlive-module-examplep.doc-2017.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2017.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2017.tar.xz mirror://gentoo/texlive-module-exercise.doc-2017.tar.xz mirror://gentoo/texlive-module-exercises.doc-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2017.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2017.tar.xz mirror://gentoo/texlive-module-export.doc-2017.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-exsol.doc-2017.tar.xz mirror://gentoo/texlive-module-extract.doc-2017.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2017.tar.xz mirror://gentoo/texlive-module-factura.doc-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2017.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2017.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2017.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2017.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2017.tar.xz mirror://gentoo/texlive-module-figsize.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-filedate.doc-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-filemod.doc-2017.tar.xz mirror://gentoo/texlive-module-fink.doc-2017.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2017.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2017.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2017.tar.xz mirror://gentoo/texlive-module-fixme.doc-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2017.tar.xz mirror://gentoo/texlive-module-flabels.doc-2017.tar.xz mirror://gentoo/texlive-module-flacards.doc-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2017.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2017.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2017.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2017.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2017.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2017.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2017.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2017.tar.xz mirror://gentoo/texlive-module-fmp.doc-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2017.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2017.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2017.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2017.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2017.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2017.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2017.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2017.tar.xz mirror://gentoo/texlive-module-forarray.doc-2017.tar.xz mirror://gentoo/texlive-module-foreign.doc-2017.tar.xz mirror://gentoo/texlive-module-forloop.doc-2017.tar.xz mirror://gentoo/texlive-module-formlett.doc-2017.tar.xz mirror://gentoo/texlive-module-formular.doc-2017.tar.xz mirror://gentoo/texlive-module-fragments.doc-2017.tar.xz mirror://gentoo/texlive-module-frame.doc-2017.tar.xz mirror://gentoo/texlive-module-framed.doc-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2017.tar.xz mirror://gentoo/texlive-module-frege.doc-2017.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2017.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2017.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2017.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2017.tar.xz mirror://gentoo/texlive-module-gauss.doc-2017.tar.xz mirror://gentoo/texlive-module-gcard.doc-2017.tar.xz mirror://gentoo/texlive-module-gcite.doc-2017.tar.xz mirror://gentoo/texlive-module-gender.doc-2017.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2017.tar.xz mirror://gentoo/texlive-module-getitems.doc-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2017.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2017.tar.xz mirror://gentoo/texlive-module-gloss.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2017.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2017.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2017.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2017.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2017.tar.xz mirror://gentoo/texlive-module-grayhints.doc-2017.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2017.tar.xz mirror://gentoo/texlive-module-grid.doc-2017.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2017.tar.xz mirror://gentoo/texlive-module-gridset.doc-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2017.tar.xz mirror://gentoo/texlive-module-handout.doc-2017.tar.xz mirror://gentoo/texlive-module-hang.doc-2017.tar.xz mirror://gentoo/texlive-module-hanging.doc-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2017.tar.xz mirror://gentoo/texlive-module-hc.doc-2017.tar.xz mirror://gentoo/texlive-module-he-she.doc-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2017.tar.xz mirror://gentoo/texlive-module-histogr.doc-2017.tar.xz mirror://gentoo/texlive-module-hitec.doc-2017.tar.xz mirror://gentoo/texlive-module-hletter.doc-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2017.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2017.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2017.tar.xz mirror://gentoo/texlive-module-hyper.doc-2017.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperref-docsrc.doc-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2017.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2017.tar.xz mirror://gentoo/texlive-module-iffont.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2017.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2017.tar.xz mirror://gentoo/texlive-module-iitem.doc-2017.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2017.tar.xz mirror://gentoo/texlive-module-import.doc-2017.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-indextools.doc-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2017.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2017.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2017.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2017.tar.xz mirror://gentoo/texlive-module-invoice.doc-2017.tar.xz mirror://gentoo/texlive-module-iso.doc-2017.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2017.tar.xz mirror://gentoo/texlive-module-isodate.doc-2017.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2017.tar.xz mirror://gentoo/texlive-module-isonums.doc-2017.tar.xz mirror://gentoo/texlive-module-isorot.doc-2017.tar.xz mirror://gentoo/texlive-module-isotope.doc-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2017.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2017.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2017.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2017.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2017.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2017.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2017.tar.xz mirror://gentoo/texlive-module-kix.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2017.tar.xz mirror://gentoo/texlive-module-komacv.doc-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2017.tar.xz mirror://gentoo/texlive-module-l3build.doc-2017.tar.xz mirror://gentoo/texlive-module-labbook.doc-2017.tar.xz mirror://gentoo/texlive-module-labels.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2017.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2017.tar.xz mirror://gentoo/texlive-module-layouts.doc-2017.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2017.tar.xz mirror://gentoo/texlive-module-lcd.doc-2017.tar.xz mirror://gentoo/texlive-module-lcg.doc-2017.tar.xz mirror://gentoo/texlive-module-leading.doc-2017.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2017.tar.xz mirror://gentoo/texlive-module-lettre.doc-2017.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2017.tar.xz mirror://gentoo/texlive-module-lewis.doc-2017.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2017.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-limap.doc-2017.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2017.tar.xz mirror://gentoo/texlive-module-linop.doc-2017.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2017.tar.xz mirror://gentoo/texlive-module-listing.doc-2017.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2017.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2017.tar.xz mirror://gentoo/texlive-module-lmake.doc-2017.tar.xz mirror://gentoo/texlive-module-locality.doc-2017.tar.xz mirror://gentoo/texlive-module-localloc.doc-2017.tar.xz mirror://gentoo/texlive-module-logbox.doc-2017.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2017.tar.xz mirror://gentoo/texlive-module-logpap.doc-2017.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2017.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-loops.doc-2017.tar.xz mirror://gentoo/texlive-module-lsc.doc-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2017.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2017.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2017.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2017.tar.xz mirror://gentoo/texlive-module-magaz.doc-2017.tar.xz mirror://gentoo/texlive-module-mailing.doc-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2017.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2017.tar.xz mirror://gentoo/texlive-module-makebase.doc-2017.tar.xz mirror://gentoo/texlive-module-makebox.doc-2017.tar.xz mirror://gentoo/texlive-module-makecell.doc-2017.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2017.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2017.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2017.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2017.tar.xz mirror://gentoo/texlive-module-mandi.doc-2017.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2017.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2017.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2017.tar.xz mirror://gentoo/texlive-module-markdown.doc-2017.tar.xz mirror://gentoo/texlive-module-mathalfa.doc-2017.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2017.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2017.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2017.tar.xz mirror://gentoo/texlive-module-mbenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2017.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2017.tar.xz mirror://gentoo/texlive-module-mcexam.doc-2017.tar.xz mirror://gentoo/texlive-module-mcite.doc-2017.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2017.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2017.tar.xz mirror://gentoo/texlive-module-media9.doc-2017.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2017.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2017.tar.xz mirror://gentoo/texlive-module-memory.doc-2017.tar.xz mirror://gentoo/texlive-module-menu.doc-2017.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2017.tar.xz mirror://gentoo/texlive-module-method.doc-2017.tar.xz mirror://gentoo/texlive-module-metre.doc-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2017.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2017.tar.xz mirror://gentoo/texlive-module-midpage.doc-2017.tar.xz mirror://gentoo/texlive-module-minibox.doc-2017.tar.xz mirror://gentoo/texlive-module-minidocument.doc-2017.tar.xz mirror://gentoo/texlive-module-minifp.doc-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2017.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2017.tar.xz mirror://gentoo/texlive-module-minted.doc-2017.tar.xz mirror://gentoo/texlive-module-minutes.doc-2017.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-mlist.doc-2017.tar.xz mirror://gentoo/texlive-module-mmap.doc-2017.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2017.tar.xz mirror://gentoo/texlive-module-modref.doc-2017.tar.xz mirror://gentoo/texlive-module-modroman.doc-2017.tar.xz mirror://gentoo/texlive-module-modular.doc-2017.tar.xz mirror://gentoo/texlive-module-monofill.doc-2017.tar.xz mirror://gentoo/texlive-module-moodle.doc-2017.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2017.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-morehype.doc-2017.tar.xz mirror://gentoo/texlive-module-moresize.doc-2017.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2017.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2017.tar.xz mirror://gentoo/texlive-module-movie15.doc-2017.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2017.tar.xz mirror://gentoo/texlive-module-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-msg.doc-2017.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-multenum.doc-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2017.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2017.tar.xz mirror://gentoo/texlive-module-multicap.doc-2017.tar.xz mirror://gentoo/texlive-module-multidef.doc-2017.tar.xz mirror://gentoo/texlive-module-multienv.doc-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-multirow.doc-2017.tar.xz mirror://gentoo/texlive-module-mversion.doc-2017.tar.xz mirror://gentoo/texlive-module-mwe.doc-2017.tar.xz mirror://gentoo/texlive-module-mycv.doc-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2017.tar.xz mirror://gentoo/texlive-module-nag.doc-2017.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2017.tar.xz mirror://gentoo/texlive-module-namespc.doc-2017.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2017.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2017.tar.xz mirror://gentoo/texlive-module-needspace.doc-2017.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2017.tar.xz mirror://gentoo/texlive-module-newfile.doc-2017.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2017.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2017.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2017.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2017.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2017.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2017.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2017.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2017.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2017.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-notes.doc-2017.tar.xz mirror://gentoo/texlive-module-notespages.doc-2017.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2017.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2017.tar.xz mirror://gentoo/texlive-module-nox.doc-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2017.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2017.tar.xz mirror://gentoo/texlive-module-numname.doc-2017.tar.xz mirror://gentoo/texlive-module-numprint.doc-2017.tar.xz mirror://gentoo/texlive-module-numspell.doc-2017.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2017.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2017.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-octavo.doc-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2017.tar.xz mirror://gentoo/texlive-module-opcit.doc-2017.tar.xz mirror://gentoo/texlive-module-optidef.doc-2017.tar.xz mirror://gentoo/texlive-module-optional.doc-2017.tar.xz mirror://gentoo/texlive-module-options.doc-2017.tar.xz mirror://gentoo/texlive-module-outline.doc-2017.tar.xz mirror://gentoo/texlive-module-outliner.doc-2017.tar.xz mirror://gentoo/texlive-module-outlines.doc-2017.tar.xz mirror://gentoo/texlive-module-overlays.doc-2017.tar.xz mirror://gentoo/texlive-module-overpic.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2017.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2017.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2017.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2017.tar.xz mirror://gentoo/texlive-module-paper.doc-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2017.tar.xz mirror://gentoo/texlive-module-papermas.doc-2017.tar.xz mirror://gentoo/texlive-module-papertex.doc-2017.tar.xz mirror://gentoo/texlive-module-paracol.doc-2017.tar.xz mirror://gentoo/texlive-module-parades.doc-2017.tar.xz mirror://gentoo/texlive-module-paralist.doc-2017.tar.xz mirror://gentoo/texlive-module-paresse.doc-2017.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-parselines.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2017.tar.xz mirror://gentoo/texlive-module-pbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2017.tar.xz mirror://gentoo/texlive-module-pecha.doc-2017.tar.xz mirror://gentoo/texlive-module-perltex.doc-2017.tar.xz mirror://gentoo/texlive-module-permute.doc-2017.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2017.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2017.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2017.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2017.tar.xz mirror://gentoo/texlive-module-philex.doc-2017.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-photo.doc-2017.tar.xz mirror://gentoo/texlive-module-piff.doc-2017.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2017.tar.xz mirror://gentoo/texlive-module-placeins.doc-2017.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2017.tar.xz mirror://gentoo/texlive-module-plates.doc-2017.tar.xz mirror://gentoo/texlive-module-plweb.doc-2017.tar.xz mirror://gentoo/texlive-module-polynom.doc-2017.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-polytable.doc-2017.tar.xz mirror://gentoo/texlive-module-postcards.doc-2017.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2017.tar.xz mirror://gentoo/texlive-module-preprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2017.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2017.tar.xz mirror://gentoo/texlive-module-preview.doc-2017.tar.xz mirror://gentoo/texlive-module-printlen.doc-2017.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2017.tar.xz mirror://gentoo/texlive-module-program.doc-2017.tar.xz mirror://gentoo/texlive-module-progress.doc-2017.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2017.tar.xz mirror://gentoo/texlive-module-proofread.doc-2017.tar.xz mirror://gentoo/texlive-module-properties.doc-2017.tar.xz mirror://gentoo/texlive-module-prosper.doc-2017.tar.xz mirror://gentoo/texlive-module-protex.doc-2017.tar.xz mirror://gentoo/texlive-module-protocol.doc-2017.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstool.doc-2017.tar.xz mirror://gentoo/texlive-module-pstring.doc-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-python.doc-2017.tar.xz mirror://gentoo/texlive-module-qcm.doc-2017.tar.xz mirror://gentoo/texlive-module-qstest.doc-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2017.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2017.tar.xz mirror://gentoo/texlive-module-quoting.doc-2017.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2017.tar.xz mirror://gentoo/texlive-module-randtext.doc-2017.tar.xz mirror://gentoo/texlive-module-rccol.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-readarray.doc-2017.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2017.tar.xz mirror://gentoo/texlive-module-recipe.doc-2017.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2017.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2017.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2017.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2017.tar.xz mirror://gentoo/texlive-module-refenums.doc-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-refman.doc-2017.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-regcount.doc-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-register.doc-2017.tar.xz mirror://gentoo/texlive-module-regstats.doc-2017.tar.xz mirror://gentoo/texlive-module-relenc.doc-2017.tar.xz mirror://gentoo/texlive-module-relsize.doc-2017.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2017.tar.xz mirror://gentoo/texlive-module-repltext.doc-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2017.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2017.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2017.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2017.tar.xz mirror://gentoo/texlive-module-romannum.doc-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2017.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2017.tar.xz mirror://gentoo/texlive-module-rterface.doc-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2017.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2017.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2017.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2017.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-scale.doc-2017.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2017.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2017.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2017.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2017.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2017.tar.xz mirror://gentoo/texlive-module-secdot.doc-2017.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2017.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2017.tar.xz mirror://gentoo/texlive-module-seealso.doc-2017.tar.xz mirror://gentoo/texlive-module-selectp.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic.doc-2017.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2017.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2017.tar.xz mirror://gentoo/texlive-module-semproc.doc-2017.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2017.tar.xz mirror://gentoo/texlive-module-sesstime.doc-2017.tar.xz mirror://gentoo/texlive-module-sf298.doc-2017.tar.xz mirror://gentoo/texlive-module-sffms.doc-2017.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2017.tar.xz mirror://gentoo/texlive-module-shadow.doc-2017.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2017.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2017.tar.xz mirror://gentoo/texlive-module-show2e.doc-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2017.tar.xz mirror://gentoo/texlive-module-showdim.doc-2017.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2017.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2017.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2017.tar.xz mirror://gentoo/texlive-module-silence.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2017.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2017.tar.xz mirror://gentoo/texlive-module-sitem.doc-2017.tar.xz mirror://gentoo/texlive-module-skb.doc-2017.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2017.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2017.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2017.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2017.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2017.tar.xz mirror://gentoo/texlive-module-smartref.doc-2017.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2017.tar.xz mirror://gentoo/texlive-module-snotez.doc-2017.tar.xz mirror://gentoo/texlive-module-soul.doc-2017.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2017.tar.xz mirror://gentoo/texlive-module-sphack.doc-2017.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2017.tar.xz mirror://gentoo/texlive-module-spot.doc-2017.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2017.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2017.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2017.tar.xz mirror://gentoo/texlive-module-sseq.doc-2017.tar.xz mirror://gentoo/texlive-module-sslides.doc-2017.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-standalone.doc-2017.tar.xz mirror://gentoo/texlive-module-statistik.doc-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2017.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2017.tar.xz mirror://gentoo/texlive-module-stex.doc-2017.tar.xz mirror://gentoo/texlive-module-storebox.doc-2017.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2017.tar.xz mirror://gentoo/texlive-module-sttools.doc-2017.tar.xz mirror://gentoo/texlive-module-stubs.doc-2017.tar.xz mirror://gentoo/texlive-module-studenthandouts.doc-2017.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2017.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2017.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2017.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2017.tar.xz mirror://gentoo/texlive-module-substr.doc-2017.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2017.tar.xz mirror://gentoo/texlive-module-svg.doc-2017.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-svn.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2017.tar.xz mirror://gentoo/texlive-module-syntax.doc-2017.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2017.tar.xz mirror://gentoo/texlive-module-synttree.doc-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2017.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2017.tar.xz mirror://gentoo/texlive-module-tableof.doc-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablists.doc-2017.tar.xz mirror://gentoo/texlive-module-tabls.doc-2017.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2017.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2017.tar.xz mirror://gentoo/texlive-module-tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2017.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2017.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2017.tar.xz mirror://gentoo/texlive-module-tagging.doc-2017.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2017.tar.xz mirror://gentoo/texlive-module-talk.doc-2017.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2017.tar.xz mirror://gentoo/texlive-module-tasks.doc-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2017.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2017.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2017.tar.xz mirror://gentoo/texlive-module-technics.doc-2017.tar.xz mirror://gentoo/texlive-module-ted.doc-2017.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2017.tar.xz mirror://gentoo/texlive-module-termcal.doc-2017.tar.xz mirror://gentoo/texlive-module-termlist.doc-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-testidx.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2017.tar.xz mirror://gentoo/texlive-module-texmate.doc-2017.tar.xz mirror://gentoo/texlive-module-texments.doc-2017.tar.xz mirror://gentoo/texlive-module-texpower.doc-2017.tar.xz mirror://gentoo/texlive-module-texshade.doc-2017.tar.xz mirror://gentoo/texlive-module-texvc.doc-2017.tar.xz mirror://gentoo/texlive-module-textfit.doc-2017.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2017.tar.xz mirror://gentoo/texlive-module-textpos.doc-2017.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2017.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2017.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2017.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2017.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2017.tar.xz mirror://gentoo/texlive-module-thumb.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2017.tar.xz mirror://gentoo/texlive-module-thumby.doc-2017.tar.xz mirror://gentoo/texlive-module-ticket.doc-2017.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2017.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2017.tar.xz mirror://gentoo/texlive-module-titleref.doc-2017.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2017.tar.xz mirror://gentoo/texlive-module-titling.doc-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2017.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2017.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2017.tar.xz mirror://gentoo/texlive-module-todo.doc-2017.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2017.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2017.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-totcount.doc-2017.tar.xz mirror://gentoo/texlive-module-totpages.doc-2017.tar.xz mirror://gentoo/texlive-module-translations.doc-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-trsym.doc-2017.tar.xz mirror://gentoo/texlive-module-truncate.doc-2017.tar.xz mirror://gentoo/texlive-module-tucv.doc-2017.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2017.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2017.tar.xz mirror://gentoo/texlive-module-twoup.doc-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2017.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2017.tar.xz mirror://gentoo/texlive-module-typeface.doc-2017.tar.xz mirror://gentoo/texlive-module-typoaid.doc-2017.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2017.tar.xz mirror://gentoo/texlive-module-uassign.doc-2017.tar.xz mirror://gentoo/texlive-module-ucs.doc-2017.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2017.tar.xz mirror://gentoo/texlive-module-umoline.doc-2017.tar.xz mirror://gentoo/texlive-module-underlin.doc-2017.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2017.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2017.tar.xz mirror://gentoo/texlive-module-units.doc-2017.tar.xz mirror://gentoo/texlive-module-unravel.doc-2017.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2017.tar.xz mirror://gentoo/texlive-module-upquote.doc-2017.tar.xz mirror://gentoo/texlive-module-uri.doc-2017.tar.xz mirror://gentoo/texlive-module-ushort.doc-2017.tar.xz mirror://gentoo/texlive-module-uspace.doc-2017.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2017.tar.xz mirror://gentoo/texlive-module-variablelm.doc-2017.tar.xz mirror://gentoo/texlive-module-varindex.doc-2017.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2017.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2017.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2017.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2017.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2017.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2017.tar.xz mirror://gentoo/texlive-module-verbments.doc-2017.tar.xz mirror://gentoo/texlive-module-version.doc-2017.tar.xz mirror://gentoo/texlive-module-versions.doc-2017.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2017.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2017.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2017.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2017.tar.xz mirror://gentoo/texlive-module-volumes.doc-2017.tar.xz mirror://gentoo/texlive-module-vpe.doc-2017.tar.xz mirror://gentoo/texlive-module-vruler.doc-2017.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2017.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-warning.doc-2017.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2017.tar.xz mirror://gentoo/texlive-module-was.doc-2017.tar.xz mirror://gentoo/texlive-module-widetable.doc-2017.tar.xz mirror://gentoo/texlive-module-williams.doc-2017.tar.xz mirror://gentoo/texlive-module-withargs.doc-2017.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2017.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2017.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2017.tar.xz mirror://gentoo/texlive-module-wtref.doc-2017.tar.xz mirror://gentoo/texlive-module-xargs.doc-2017.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2017.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2017.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2017.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2017.tar.xz mirror://gentoo/texlive-module-xfor.doc-2017.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2017.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2017.tar.xz mirror://gentoo/texlive-module-xint.doc-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2017.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2017.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2017.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2017.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2017.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2017.tar.xz mirror://gentoo/texlive-module-xsim.doc-2017.tar.xz mirror://gentoo/texlive-module-xstring.doc-2017.tar.xz mirror://gentoo/texlive-module-xtab.doc-2017.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2017.tar.xz mirror://gentoo/texlive-module-xytree.doc-2017.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2017.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2017.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2017.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2017.tar.xz mirror://gentoo/texlive-module-yplan.doc-2017.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2017.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2017.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2017.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2017.tar.xz mirror://gentoo/texlive-module-GS1.source-2017.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2017.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2017.tar.xz mirror://gentoo/texlive-module-abstract.source-2017.tar.xz mirror://gentoo/texlive-module-achemso.source-2017.tar.xz mirror://gentoo/texlive-module-acronym.source-2017.tar.xz mirror://gentoo/texlive-module-acroterm.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialangle.source-2017.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.source-2017.tar.xz mirror://gentoo/texlive-module-addlines.source-2017.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2017.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2017.tar.xz mirror://gentoo/texlive-module-adrconv.source-2017.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2017.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2017.tar.xz mirror://gentoo/texlive-module-altfont.source-2017.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2017.tar.xz mirror://gentoo/texlive-module-animate.source-2017.tar.xz mirror://gentoo/texlive-module-answers.source-2017.tar.xz mirror://gentoo/texlive-module-appendix.source-2017.tar.xz mirror://gentoo/texlive-module-apptools.source-2017.tar.xz mirror://gentoo/texlive-module-arcs.source-2017.tar.xz mirror://gentoo/texlive-module-arraysort.source-2017.tar.xz mirror://gentoo/texlive-module-arydshln.source-2017.tar.xz mirror://gentoo/texlive-module-asciilist.source-2017.tar.xz mirror://gentoo/texlive-module-attachfile.source-2017.tar.xz mirror://gentoo/texlive-module-autonum.source-2017.tar.xz mirror://gentoo/texlive-module-autopdf.source-2017.tar.xz mirror://gentoo/texlive-module-avremu.source-2017.tar.xz mirror://gentoo/texlive-module-background.source-2017.tar.xz mirror://gentoo/texlive-module-basicarith.source-2017.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2017.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2017.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2017.tar.xz mirror://gentoo/texlive-module-beton.source-2017.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2017.tar.xz mirror://gentoo/texlive-module-bez123.source-2017.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2017.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2017.tar.xz mirror://gentoo/texlive-module-bizcard.source-2017.tar.xz mirror://gentoo/texlive-module-blindtext.source-2017.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2017.tar.xz mirror://gentoo/texlive-module-boites.source-2017.tar.xz mirror://gentoo/texlive-module-bookcover.source-2017.tar.xz mirror://gentoo/texlive-module-booklet.source-2017.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2017.tar.xz mirror://gentoo/texlive-module-bophook.source-2017.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2017.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2017.tar.xz mirror://gentoo/texlive-module-breakurl.source-2017.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2017.tar.xz mirror://gentoo/texlive-module-calcage.source-2017.tar.xz mirror://gentoo/texlive-module-calculator.source-2017.tar.xz mirror://gentoo/texlive-module-cals.source-2017.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2017.tar.xz mirror://gentoo/texlive-module-capt-of.source-2017.tar.xz mirror://gentoo/texlive-module-captcont.source-2017.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2017.tar.xz mirror://gentoo/texlive-module-catechis.source-2017.tar.xz mirror://gentoo/texlive-module-ccaption.source-2017.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2017.tar.xz mirror://gentoo/texlive-module-cd.source-2017.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2017.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2017.tar.xz mirror://gentoo/texlive-module-changebar.source-2017.tar.xz mirror://gentoo/texlive-module-changepage.source-2017.tar.xz mirror://gentoo/texlive-module-changes.source-2017.tar.xz mirror://gentoo/texlive-module-chappg.source-2017.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2017.tar.xz mirror://gentoo/texlive-module-chextras.source-2017.tar.xz mirror://gentoo/texlive-module-childdoc.source-2017.tar.xz mirror://gentoo/texlive-module-chletter.source-2017.tar.xz mirror://gentoo/texlive-module-circ.source-2017.tar.xz mirror://gentoo/texlive-module-classpack.source-2017.tar.xz mirror://gentoo/texlive-module-clefval.source-2017.tar.xz mirror://gentoo/texlive-module-cleveref.source-2017.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2017.tar.xz mirror://gentoo/texlive-module-codepage.source-2017.tar.xz mirror://gentoo/texlive-module-codesection.source-2017.tar.xz mirror://gentoo/texlive-module-collcell.source-2017.tar.xz mirror://gentoo/texlive-module-collectbox.source-2017.tar.xz mirror://gentoo/texlive-module-colordoc.source-2017.tar.xz mirror://gentoo/texlive-module-colorwav.source-2017.tar.xz mirror://gentoo/texlive-module-colorweb.source-2017.tar.xz mirror://gentoo/texlive-module-combine.source-2017.tar.xz mirror://gentoo/texlive-module-commado.source-2017.tar.xz mirror://gentoo/texlive-module-constants.source-2017.tar.xz mirror://gentoo/texlive-module-continue.source-2017.tar.xz mirror://gentoo/texlive-module-contour.source-2017.tar.xz mirror://gentoo/texlive-module-contracard.source-2017.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2017.tar.xz mirror://gentoo/texlive-module-cooking.source-2017.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2017.tar.xz mirror://gentoo/texlive-module-cool.source-2017.tar.xz mirror://gentoo/texlive-module-coollist.source-2017.tar.xz mirror://gentoo/texlive-module-coolstr.source-2017.tar.xz mirror://gentoo/texlive-module-coolthms.source-2017.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2017.tar.xz mirror://gentoo/texlive-module-coordsys.source-2017.tar.xz mirror://gentoo/texlive-module-copyedit.source-2017.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2017.tar.xz mirror://gentoo/texlive-module-coverpage.source-2017.tar.xz mirror://gentoo/texlive-module-cprotect.source-2017.tar.xz mirror://gentoo/texlive-module-crossreference.source-2017.tar.xz mirror://gentoo/texlive-module-cuisine.source-2017.tar.xz mirror://gentoo/texlive-module-currfile.source-2017.tar.xz mirror://gentoo/texlive-module-cutwin.source-2017.tar.xz mirror://gentoo/texlive-module-cyber.source-2017.tar.xz mirror://gentoo/texlive-module-cybercic.source-2017.tar.xz mirror://gentoo/texlive-module-dashbox.source-2017.tar.xz mirror://gentoo/texlive-module-dashrule.source-2017.tar.xz mirror://gentoo/texlive-module-datatool.source-2017.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2017.tar.xz mirror://gentoo/texlive-module-datenumber.source-2017.tar.xz mirror://gentoo/texlive-module-datetime.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2017.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2017.tar.xz mirror://gentoo/texlive-module-decimal.source-2017.tar.xz mirror://gentoo/texlive-module-decorule.source-2017.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2017.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2017.tar.xz mirror://gentoo/texlive-module-diagbox.source-2017.tar.xz mirror://gentoo/texlive-module-dialogl.source-2017.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2017.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2017.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2017.tar.xz mirror://gentoo/texlive-module-doclicense.source-2017.tar.xz mirror://gentoo/texlive-module-docmfp.source-2017.tar.xz mirror://gentoo/texlive-module-docmute.source-2017.tar.xz mirror://gentoo/texlive-module-doctools.source-2017.tar.xz mirror://gentoo/texlive-module-documentation.source-2017.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2017.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2017.tar.xz mirror://gentoo/texlive-module-download.source-2017.tar.xz mirror://gentoo/texlive-module-dox.source-2017.tar.xz mirror://gentoo/texlive-module-dprogress.source-2017.tar.xz mirror://gentoo/texlive-module-drac.source-2017.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2017.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2017.tar.xz mirror://gentoo/texlive-module-dtxgallery.source-2017.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2017.tar.xz mirror://gentoo/texlive-module-easyfig.source-2017.tar.xz mirror://gentoo/texlive-module-easyreview.source-2017.tar.xz mirror://gentoo/texlive-module-ebezier.source-2017.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2017.tar.xz mirror://gentoo/texlive-module-ecv.source-2017.tar.xz mirror://gentoo/texlive-module-ed.source-2017.tar.xz mirror://gentoo/texlive-module-edmargin.source-2017.tar.xz mirror://gentoo/texlive-module-eemeir.source-2017.tar.xz mirror://gentoo/texlive-module-efbox.source-2017.tar.xz mirror://gentoo/texlive-module-egplot.source-2017.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-elmath.source-2017.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2017.tar.xz mirror://gentoo/texlive-module-elzcards.source-2017.tar.xz mirror://gentoo/texlive-module-emarks.source-2017.tar.xz mirror://gentoo/texlive-module-embedall.source-2017.tar.xz mirror://gentoo/texlive-module-emptypage.source-2017.tar.xz mirror://gentoo/texlive-module-endfloat.source-2017.tar.xz mirror://gentoo/texlive-module-endheads.source-2017.tar.xz mirror://gentoo/texlive-module-engpron.source-2017.tar.xz mirror://gentoo/texlive-module-engrec.source-2017.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2017.tar.xz mirror://gentoo/texlive-module-environ.source-2017.tar.xz mirror://gentoo/texlive-module-epigraph.source-2017.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2017.tar.xz mirror://gentoo/texlive-module-eqlist.source-2017.tar.xz mirror://gentoo/texlive-module-eqnalign.source-2017.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2017.tar.xz mirror://gentoo/texlive-module-errata.source-2017.tar.xz mirror://gentoo/texlive-module-esdiff.source-2017.tar.xz mirror://gentoo/texlive-module-esint.source-2017.tar.xz mirror://gentoo/texlive-module-etaremune.source-2017.tar.xz mirror://gentoo/texlive-module-etextools.source-2017.tar.xz mirror://gentoo/texlive-module-etoc.source-2017.tar.xz mirror://gentoo/texlive-module-eukdate.source-2017.tar.xz mirror://gentoo/texlive-module-everyhook.source-2017.tar.xz mirror://gentoo/texlive-module-everypage.source-2017.tar.xz mirror://gentoo/texlive-module-exam-n.source-2017.tar.xz mirror://gentoo/texlive-module-examdesign.source-2017.tar.xz mirror://gentoo/texlive-module-exercise.source-2017.tar.xz mirror://gentoo/texlive-module-exercises.source-2017.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2017.tar.xz mirror://gentoo/texlive-module-expdlist.source-2017.tar.xz mirror://gentoo/texlive-module-export.source-2017.tar.xz mirror://gentoo/texlive-module-exsol.source-2017.tar.xz mirror://gentoo/texlive-module-extract.source-2017.tar.xz mirror://gentoo/texlive-module-facsimile.source-2017.tar.xz mirror://gentoo/texlive-module-factura.source-2017.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2017.tar.xz mirror://gentoo/texlive-module-fancynum.source-2017.tar.xz mirror://gentoo/texlive-module-fancypar.source-2017.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2017.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2017.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2017.tar.xz mirror://gentoo/texlive-module-fgruler.source-2017.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2017.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2017.tar.xz mirror://gentoo/texlive-module-filecontents.source-2017.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2017.tar.xz mirror://gentoo/texlive-module-filedate.source-2017.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2017.tar.xz mirror://gentoo/texlive-module-fink.source-2017.tar.xz mirror://gentoo/texlive-module-finstrut.source-2017.tar.xz mirror://gentoo/texlive-module-fithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2017.tar.xz mirror://gentoo/texlive-module-fixme.source-2017.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-flabels.source-2017.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2017.tar.xz mirror://gentoo/texlive-module-flashcards.source-2017.tar.xz mirror://gentoo/texlive-module-flippdf.source-2017.tar.xz mirror://gentoo/texlive-module-floatflt.source-2017.tar.xz mirror://gentoo/texlive-module-floatrow.source-2017.tar.xz mirror://gentoo/texlive-module-flowfram.source-2017.tar.xz mirror://gentoo/texlive-module-fmp.source-2017.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2017.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2017.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2017.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2017.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2017.tar.xz mirror://gentoo/texlive-module-fonttable.source-2017.tar.xz mirror://gentoo/texlive-module-footmisc.source-2017.tar.xz mirror://gentoo/texlive-module-footmisx.source-2017.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2017.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2017.tar.xz mirror://gentoo/texlive-module-footnpag.source-2017.tar.xz mirror://gentoo/texlive-module-forarray.source-2017.tar.xz mirror://gentoo/texlive-module-foreign.source-2017.tar.xz mirror://gentoo/texlive-module-forloop.source-2017.tar.xz mirror://gentoo/texlive-module-formular.source-2017.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2017.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2017.tar.xz mirror://gentoo/texlive-module-fullblck.source-2017.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2017.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2017.tar.xz mirror://gentoo/texlive-module-fvextra.source-2017.tar.xz mirror://gentoo/texlive-module-gcite.source-2017.tar.xz mirror://gentoo/texlive-module-gender.source-2017.tar.xz mirror://gentoo/texlive-module-genmpage.source-2017.tar.xz mirror://gentoo/texlive-module-getitems.source-2017.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2017.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2017.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2017.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2017.tar.xz mirror://gentoo/texlive-module-graphbox.source-2017.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2017.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2017.tar.xz mirror://gentoo/texlive-module-grayhints.source-2017.tar.xz mirror://gentoo/texlive-module-grid.source-2017.tar.xz mirror://gentoo/texlive-module-gridset.source-2017.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2017.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2017.tar.xz mirror://gentoo/texlive-module-hanging.source-2017.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2017.tar.xz mirror://gentoo/texlive-module-hc.source-2017.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2017.tar.xz mirror://gentoo/texlive-module-histogr.source-2017.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2017.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2017.tar.xz mirror://gentoo/texlive-module-hyper.source-2017.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2017.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2017.tar.xz mirror://gentoo/texlive-module-iffont.source-2017.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2017.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2017.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2017.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2017.tar.xz mirror://gentoo/texlive-module-iitem.source-2017.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2017.tar.xz mirror://gentoo/texlive-module-indextools.source-2017.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2017.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2017.tar.xz mirror://gentoo/texlive-module-interfaces.source-2017.tar.xz mirror://gentoo/texlive-module-inversepath.source-2017.tar.xz mirror://gentoo/texlive-module-iso.source-2017.tar.xz mirror://gentoo/texlive-module-iso10303.source-2017.tar.xz mirror://gentoo/texlive-module-isodate.source-2017.tar.xz mirror://gentoo/texlive-module-isodoc.source-2017.tar.xz mirror://gentoo/texlive-module-isorot.source-2017.tar.xz mirror://gentoo/texlive-module-isotope.source-2017.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2017.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2017.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2017.tar.xz mirror://gentoo/texlive-module-kerntest.source-2017.tar.xz mirror://gentoo/texlive-module-keycommand.source-2017.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2017.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2017.tar.xz mirror://gentoo/texlive-module-komacv.source-2017.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2017.tar.xz mirror://gentoo/texlive-module-l3build.source-2017.tar.xz mirror://gentoo/texlive-module-labbook.source-2017.tar.xz mirror://gentoo/texlive-module-labels.source-2017.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2017.tar.xz mirror://gentoo/texlive-module-lastpage.source-2017.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2017.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2017.tar.xz mirror://gentoo/texlive-module-latexgit.source-2017.tar.xz mirror://gentoo/texlive-module-layouts.source-2017.tar.xz mirror://gentoo/texlive-module-lcd.source-2017.tar.xz mirror://gentoo/texlive-module-lcg.source-2017.tar.xz mirror://gentoo/texlive-module-leading.source-2017.tar.xz mirror://gentoo/texlive-module-leftidx.source-2017.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2017.tar.xz mirror://gentoo/texlive-module-lettrine.source-2017.tar.xz mirror://gentoo/texlive-module-lhelp.source-2017.tar.xz mirror://gentoo/texlive-module-libgreek.source-2017.tar.xz mirror://gentoo/texlive-module-limap.source-2017.tar.xz mirror://gentoo/texlive-module-linegoal.source-2017.tar.xz mirror://gentoo/texlive-module-lipsum.source-2017.tar.xz mirror://gentoo/texlive-module-listlbls.source-2017.tar.xz mirror://gentoo/texlive-module-listliketab.source-2017.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-lmake.source-2017.tar.xz mirror://gentoo/texlive-module-locality.source-2017.tar.xz mirror://gentoo/texlive-module-localloc.source-2017.tar.xz mirror://gentoo/texlive-module-logbox.source-2017.tar.xz mirror://gentoo/texlive-module-logpap.source-2017.tar.xz mirror://gentoo/texlive-module-longfigure.source-2017.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2017.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2017.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2017.tar.xz mirror://gentoo/texlive-module-macroswap.source-2017.tar.xz mirror://gentoo/texlive-module-mailing.source-2017.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2017.tar.xz mirror://gentoo/texlive-module-makebase.source-2017.tar.xz mirror://gentoo/texlive-module-makebox.source-2017.tar.xz mirror://gentoo/texlive-module-makecell.source-2017.tar.xz mirror://gentoo/texlive-module-makecmds.source-2017.tar.xz mirror://gentoo/texlive-module-makedtx.source-2017.tar.xz mirror://gentoo/texlive-module-mandi.source-2017.tar.xz mirror://gentoo/texlive-module-manfnt.source-2017.tar.xz mirror://gentoo/texlive-module-manuscript.source-2017.tar.xz mirror://gentoo/texlive-module-marginfix.source-2017.tar.xz mirror://gentoo/texlive-module-marginnote.source-2017.tar.xz mirror://gentoo/texlive-module-markdown.source-2017.tar.xz mirror://gentoo/texlive-module-mathastext.source-2017.tar.xz mirror://gentoo/texlive-module-mathexam.source-2017.tar.xz mirror://gentoo/texlive-module-mcaption.source-2017.tar.xz mirror://gentoo/texlive-module-mcite.source-2017.tar.xz mirror://gentoo/texlive-module-mdframed.source-2017.tar.xz mirror://gentoo/texlive-module-media9.source-2017.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2017.tar.xz mirror://gentoo/texlive-module-memory.source-2017.tar.xz mirror://gentoo/texlive-module-menu.source-2017.tar.xz mirror://gentoo/texlive-module-menukeys.source-2017.tar.xz mirror://gentoo/texlive-module-method.source-2017.tar.xz mirror://gentoo/texlive-module-metre.source-2017.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2017.tar.xz mirror://gentoo/texlive-module-mftinc.source-2017.tar.xz mirror://gentoo/texlive-module-minibox.source-2017.tar.xz mirror://gentoo/texlive-module-minidocument.source-2017.tar.xz mirror://gentoo/texlive-module-minifp.source-2017.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2017.tar.xz mirror://gentoo/texlive-module-minted.source-2017.tar.xz mirror://gentoo/texlive-module-minutes.source-2017.tar.xz mirror://gentoo/texlive-module-mlist.source-2017.tar.xz mirror://gentoo/texlive-module-mnotes.source-2017.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2017.tar.xz mirror://gentoo/texlive-module-modref.source-2017.tar.xz mirror://gentoo/texlive-module-modroman.source-2017.tar.xz mirror://gentoo/texlive-module-monofill.source-2017.tar.xz mirror://gentoo/texlive-module-moodle.source-2017.tar.xz mirror://gentoo/texlive-module-morefloats.source-2017.tar.xz mirror://gentoo/texlive-module-morehype.source-2017.tar.xz mirror://gentoo/texlive-module-moresize.source-2017.tar.xz mirror://gentoo/texlive-module-moreverb.source-2017.tar.xz mirror://gentoo/texlive-module-morewrites.source-2017.tar.xz mirror://gentoo/texlive-module-mparhack.source-2017.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2017.tar.xz mirror://gentoo/texlive-module-msg.source-2017.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2017.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2017.tar.xz mirror://gentoo/texlive-module-multibbl.source-2017.tar.xz mirror://gentoo/texlive-module-multicap.source-2017.tar.xz mirror://gentoo/texlive-module-multidef.source-2017.tar.xz mirror://gentoo/texlive-module-multienv.source-2017.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2017.tar.xz mirror://gentoo/texlive-module-multirow.source-2017.tar.xz mirror://gentoo/texlive-module-mversion.source-2017.tar.xz mirror://gentoo/texlive-module-mwe.source-2017.tar.xz mirror://gentoo/texlive-module-mycv.source-2017.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2017.tar.xz mirror://gentoo/texlive-module-nag.source-2017.tar.xz mirror://gentoo/texlive-module-nameauth.source-2017.tar.xz mirror://gentoo/texlive-module-namespc.source-2017.tar.xz mirror://gentoo/texlive-module-ncctools.source-2017.tar.xz mirror://gentoo/texlive-module-needspace.source-2017.tar.xz mirror://gentoo/texlive-module-newfile.source-2017.tar.xz mirror://gentoo/texlive-module-newlfm.source-2017.tar.xz mirror://gentoo/texlive-module-newspaper.source-2017.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2017.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2017.tar.xz mirror://gentoo/texlive-module-newverbs.source-2017.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2017.tar.xz mirror://gentoo/texlive-module-niceframe.source-2017.tar.xz mirror://gentoo/texlive-module-nicetext.source-2017.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2017.tar.xz mirror://gentoo/texlive-module-nomencl.source-2017.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2017.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2017.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2017.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2017.tar.xz mirror://gentoo/texlive-module-notes.source-2017.tar.xz mirror://gentoo/texlive-module-notespages.source-2017.tar.xz mirror://gentoo/texlive-module-nowidow.source-2017.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2017.tar.xz mirror://gentoo/texlive-module-numprint.source-2017.tar.xz mirror://gentoo/texlive-module-ocgx.source-2017.tar.xz mirror://gentoo/texlive-module-octavo.source-2017.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2017.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2017.tar.xz mirror://gentoo/texlive-module-opcit.source-2017.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2017.tar.xz mirror://gentoo/texlive-module-pagecont.source-2017.tar.xz mirror://gentoo/texlive-module-pagenote.source-2017.tar.xz mirror://gentoo/texlive-module-pageslts.source-2017.tar.xz mirror://gentoo/texlive-module-paper.source-2017.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2017.tar.xz mirror://gentoo/texlive-module-papermas.source-2017.tar.xz mirror://gentoo/texlive-module-papertex.source-2017.tar.xz mirror://gentoo/texlive-module-paracol.source-2017.tar.xz mirror://gentoo/texlive-module-paralist.source-2017.tar.xz mirror://gentoo/texlive-module-paresse.source-2017.tar.xz mirror://gentoo/texlive-module-parselines.source-2017.tar.xz mirror://gentoo/texlive-module-patch.source-2017.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2017.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2017.tar.xz mirror://gentoo/texlive-module-pawpict.source-2017.tar.xz mirror://gentoo/texlive-module-pbox.source-2017.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2017.tar.xz mirror://gentoo/texlive-module-pdf14.source-2017.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2017.tar.xz mirror://gentoo/texlive-module-pdfx.source-2017.tar.xz mirror://gentoo/texlive-module-perltex.source-2017.tar.xz mirror://gentoo/texlive-module-permute.source-2017.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2017.tar.xz mirror://gentoo/texlive-module-phfnote.source-2017.tar.xz mirror://gentoo/texlive-module-phfparen.source-2017.tar.xz mirror://gentoo/texlive-module-phfqit.source-2017.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2017.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2017.tar.xz mirror://gentoo/texlive-module-phfthm.source-2017.tar.xz mirror://gentoo/texlive-module-photo.source-2017.tar.xz mirror://gentoo/texlive-module-plweb.source-2017.tar.xz mirror://gentoo/texlive-module-polynom.source-2017.tar.xz mirror://gentoo/texlive-module-polynomial.source-2017.tar.xz mirror://gentoo/texlive-module-polytable.source-2017.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2017.tar.xz mirror://gentoo/texlive-module-preprint.source-2017.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2017.tar.xz mirror://gentoo/texlive-module-prettyref.source-2017.tar.xz mirror://gentoo/texlive-module-preview.source-2017.tar.xz mirror://gentoo/texlive-module-probsoln.source-2017.tar.xz mirror://gentoo/texlive-module-proofread.source-2017.tar.xz mirror://gentoo/texlive-module-protocol.source-2017.tar.xz mirror://gentoo/texlive-module-psfragx.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-pstool.source-2017.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-qcm.source-2017.tar.xz mirror://gentoo/texlive-module-qstest.source-2017.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-quotchap.source-2017.tar.xz mirror://gentoo/texlive-module-quoting.source-2017.tar.xz mirror://gentoo/texlive-module-quotmark.source-2017.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2017.tar.xz mirror://gentoo/texlive-module-rccol.source-2017.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2017.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2017.tar.xz mirror://gentoo/texlive-module-realboxes.source-2017.tar.xz mirror://gentoo/texlive-module-recipecard.source-2017.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-refman.source-2017.tar.xz mirror://gentoo/texlive-module-refstyle.source-2017.tar.xz mirror://gentoo/texlive-module-regcount.source-2017.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2017.tar.xz mirror://gentoo/texlive-module-register.source-2017.tar.xz mirror://gentoo/texlive-module-regstats.source-2017.tar.xz mirror://gentoo/texlive-module-relenc.source-2017.tar.xz mirror://gentoo/texlive-module-repltext.source-2017.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2017.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2017.tar.xz mirror://gentoo/texlive-module-romanbar.source-2017.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2017.tar.xz mirror://gentoo/texlive-module-romannum.source-2017.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2017.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2017.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2017.tar.xz mirror://gentoo/texlive-module-sauerj.source-2017.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2017.tar.xz mirror://gentoo/texlive-module-savetrees.source-2017.tar.xz mirror://gentoo/texlive-module-scale.source-2017.tar.xz mirror://gentoo/texlive-module-scalebar.source-2017.tar.xz mirror://gentoo/texlive-module-sectsty.source-2017.tar.xz mirror://gentoo/texlive-module-seealso.source-2017.tar.xz mirror://gentoo/texlive-module-semantic.source-2017.tar.xz mirror://gentoo/texlive-module-semioneside.source-2017.tar.xz mirror://gentoo/texlive-module-semproc.source-2017.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2017.tar.xz mirror://gentoo/texlive-module-sesstime.source-2017.tar.xz mirror://gentoo/texlive-module-sf298.source-2017.tar.xz mirror://gentoo/texlive-module-sffms.source-2017.tar.xz mirror://gentoo/texlive-module-shdoc.source-2017.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2017.tar.xz mirror://gentoo/texlive-module-show2e.source-2017.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2017.tar.xz mirror://gentoo/texlive-module-showexpl.source-2017.tar.xz mirror://gentoo/texlive-module-showlabels.source-2017.tar.xz mirror://gentoo/texlive-module-sidecap.source-2017.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2017.tar.xz mirror://gentoo/texlive-module-silence.source-2017.tar.xz mirror://gentoo/texlive-module-simplecd.source-2017.tar.xz mirror://gentoo/texlive-module-simplecv.source-2017.tar.xz mirror://gentoo/texlive-module-sitem.source-2017.tar.xz mirror://gentoo/texlive-module-skb.source-2017.tar.xz mirror://gentoo/texlive-module-skdoc.source-2017.tar.xz mirror://gentoo/texlive-module-skrapport.source-2017.tar.xz mirror://gentoo/texlive-module-slantsc.source-2017.tar.xz mirror://gentoo/texlive-module-snapshot.source-2017.tar.xz mirror://gentoo/texlive-module-soul.source-2017.tar.xz mirror://gentoo/texlive-module-splitindex.source-2017.tar.xz mirror://gentoo/texlive-module-spot.source-2017.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2017.tar.xz mirror://gentoo/texlive-module-srcltx.source-2017.tar.xz mirror://gentoo/texlive-module-sseq.source-2017.tar.xz mirror://gentoo/texlive-module-stack.source-2017.tar.xz mirror://gentoo/texlive-module-standalone.source-2017.tar.xz mirror://gentoo/texlive-module-statistik.source-2017.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2017.tar.xz mirror://gentoo/texlive-module-stdpage.source-2017.tar.xz mirror://gentoo/texlive-module-stex.source-2017.tar.xz mirror://gentoo/texlive-module-storebox.source-2017.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2017.tar.xz mirror://gentoo/texlive-module-sttools.source-2017.tar.xz mirror://gentoo/texlive-module-subdepth.source-2017.tar.xz mirror://gentoo/texlive-module-subeqn.source-2017.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-subfigure.source-2017.tar.xz mirror://gentoo/texlive-module-subfiles.source-2017.tar.xz mirror://gentoo/texlive-module-subfloat.source-2017.tar.xz mirror://gentoo/texlive-module-supertabular.source-2017.tar.xz mirror://gentoo/texlive-module-svg.source-2017.tar.xz mirror://gentoo/texlive-module-svn.source-2017.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2017.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2017.tar.xz mirror://gentoo/texlive-module-syntrace.source-2017.tar.xz mirror://gentoo/texlive-module-synttree.source-2017.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2017.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2017.tar.xz mirror://gentoo/texlive-module-tableof.source-2017.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2017.tar.xz mirror://gentoo/texlive-module-tablists.source-2017.tar.xz mirror://gentoo/texlive-module-tabu.source-2017.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2017.tar.xz mirror://gentoo/texlive-module-tabularew.source-2017.tar.xz mirror://gentoo/texlive-module-tabulary.source-2017.tar.xz mirror://gentoo/texlive-module-talk.source-2017.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2017.tar.xz mirror://gentoo/texlive-module-ted.source-2017.tar.xz mirror://gentoo/texlive-module-templatetools.source-2017.tar.xz mirror://gentoo/texlive-module-termcal.source-2017.tar.xz mirror://gentoo/texlive-module-termlist.source-2017.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2017.tar.xz mirror://gentoo/texlive-module-testidx.source-2017.tar.xz mirror://gentoo/texlive-module-tex-label.source-2017.tar.xz mirror://gentoo/texlive-module-texmate.source-2017.tar.xz mirror://gentoo/texlive-module-texments.source-2017.tar.xz mirror://gentoo/texlive-module-texpower.source-2017.tar.xz mirror://gentoo/texlive-module-texshade.source-2017.tar.xz mirror://gentoo/texlive-module-texvc.source-2017.tar.xz mirror://gentoo/texlive-module-textfit.source-2017.tar.xz mirror://gentoo/texlive-module-textmerg.source-2017.tar.xz mirror://gentoo/texlive-module-textpos.source-2017.tar.xz mirror://gentoo/texlive-module-thmtools.source-2017.tar.xz mirror://gentoo/texlive-module-threadcol.source-2017.tar.xz mirror://gentoo/texlive-module-thumb.source-2017.tar.xz mirror://gentoo/texlive-module-thumbs.source-2017.tar.xz mirror://gentoo/texlive-module-titling.source-2017.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2017.tar.xz mirror://gentoo/texlive-module-tocdata.source-2017.tar.xz mirror://gentoo/texlive-module-tocloft.source-2017.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2017.tar.xz mirror://gentoo/texlive-module-todo.source-2017.tar.xz mirror://gentoo/texlive-module-todonotes.source-2017.tar.xz mirror://gentoo/texlive-module-toolbox.source-2017.tar.xz mirror://gentoo/texlive-module-totcount.source-2017.tar.xz mirror://gentoo/texlive-module-totpages.source-2017.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2017.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2017.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2017.tar.xz mirror://gentoo/texlive-module-trsym.source-2017.tar.xz mirror://gentoo/texlive-module-tucv.source-2017.tar.xz mirror://gentoo/texlive-module-twoup.source-2017.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2017.tar.xz mirror://gentoo/texlive-module-type1cm.source-2017.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2017.tar.xz mirror://gentoo/texlive-module-typeface.source-2017.tar.xz mirror://gentoo/texlive-module-typogrid.source-2017.tar.xz mirror://gentoo/texlive-module-umoline.source-2017.tar.xz mirror://gentoo/texlive-module-underlin.source-2017.tar.xz mirror://gentoo/texlive-module-undolabl.source-2017.tar.xz mirror://gentoo/texlive-module-units.source-2017.tar.xz mirror://gentoo/texlive-module-unravel.source-2017.tar.xz mirror://gentoo/texlive-module-upquote.source-2017.tar.xz mirror://gentoo/texlive-module-uri.source-2017.tar.xz mirror://gentoo/texlive-module-ushort.source-2017.tar.xz mirror://gentoo/texlive-module-varindex.source-2017.tar.xz mirror://gentoo/texlive-module-versonotes.source-2017.tar.xz mirror://gentoo/texlive-module-vertbars.source-2017.tar.xz mirror://gentoo/texlive-module-vgrid.source-2017.tar.xz mirror://gentoo/texlive-module-vmargin.source-2017.tar.xz mirror://gentoo/texlive-module-volumes.source-2017.tar.xz mirror://gentoo/texlive-module-vwcol.source-2017.tar.xz mirror://gentoo/texlive-module-warpcol.source-2017.tar.xz mirror://gentoo/texlive-module-was.source-2017.tar.xz mirror://gentoo/texlive-module-widetable.source-2017.tar.xz mirror://gentoo/texlive-module-wordlike.source-2017.tar.xz mirror://gentoo/texlive-module-xargs.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2017.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2017.tar.xz mirror://gentoo/texlive-module-xdoc.source-2017.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2017.tar.xz mirror://gentoo/texlive-module-xfor.source-2017.tar.xz mirror://gentoo/texlive-module-xint.source-2017.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2017.tar.xz mirror://gentoo/texlive-module-xpatch.source-2017.tar.xz mirror://gentoo/texlive-module-xpeek.source-2017.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2017.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2017.tar.xz mirror://gentoo/texlive-module-xtab.source-2017.tar.xz mirror://gentoo/texlive-module-yafoot.source-2017.tar.xz mirror://gentoo/texlive-module-yaletter.source-2017.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2017.tar.xz mirror://gentoo/texlive-module-ydoc.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b9f437ddcefb22ec213732acf339f60b
+_md5_=44292be1055af97b0fb85b4bcd0cca9a
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
index 573816480bbb..7cdda94b02ce 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LaTeX recommended packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !dev-tex/xkeyval !dev-tex/memoir !dev-tex/listings !<dev-texlive/texlive-latexextra-2017 !=app-text/texlive-core-2007* !<dev-texlive/texlive-xetex-2016 !dev-texlive/texlive-latex3 !<dev-texlive/texlive-humanities-2014 !dev-texlive/texlive-mathextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2017.tar.xz mirror://gentoo/texlive-module-booktabs-2017.tar.xz mirror://gentoo/texlive-module-breqn-2017.tar.xz mirror://gentoo/texlive-module-caption-2017.tar.xz mirror://gentoo/texlive-module-cite-2017.tar.xz mirror://gentoo/texlive-module-cmap-2017.tar.xz mirror://gentoo/texlive-module-crop-2017.tar.xz mirror://gentoo/texlive-module-ctable-2017.tar.xz mirror://gentoo/texlive-module-eso-pic-2017.tar.xz mirror://gentoo/texlive-module-euenc-2017.tar.xz mirror://gentoo/texlive-module-euler-2017.tar.xz mirror://gentoo/texlive-module-extsizes-2017.tar.xz mirror://gentoo/texlive-module-fancybox-2017.tar.xz mirror://gentoo/texlive-module-fancyref-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb-2017.tar.xz mirror://gentoo/texlive-module-filehook-2017.tar.xz mirror://gentoo/texlive-module-float-2017.tar.xz mirror://gentoo/texlive-module-fontspec-2017.tar.xz mirror://gentoo/texlive-module-fp-2017.tar.xz mirror://gentoo/texlive-module-index-2017.tar.xz mirror://gentoo/texlive-module-jknapltx-2017.tar.xz mirror://gentoo/texlive-module-koma-script-2017.tar.xz mirror://gentoo/texlive-module-latexbug-2017.tar.xz mirror://gentoo/texlive-module-l3experimental-2017.tar.xz mirror://gentoo/texlive-module-l3kernel-2017.tar.xz mirror://gentoo/texlive-module-l3packages-2017.tar.xz mirror://gentoo/texlive-module-lineno-2017.tar.xz mirror://gentoo/texlive-module-listings-2017.tar.xz mirror://gentoo/texlive-module-lwarp-2017.tar.xz mirror://gentoo/texlive-module-mathspec-2017.tar.xz mirror://gentoo/texlive-module-mathtools-2017.tar.xz mirror://gentoo/texlive-module-mdwtools-2017.tar.xz mirror://gentoo/texlive-module-memoir-2017.tar.xz mirror://gentoo/texlive-module-metalogo-2017.tar.xz mirror://gentoo/texlive-module-microtype-2017.tar.xz mirror://gentoo/texlive-module-ms-2017.tar.xz mirror://gentoo/texlive-module-ntgclass-2017.tar.xz mirror://gentoo/texlive-module-parskip-2017.tar.xz mirror://gentoo/texlive-module-pdfpages-2017.tar.xz mirror://gentoo/texlive-module-polyglossia-2017.tar.xz mirror://gentoo/texlive-module-powerdot-2017.tar.xz mirror://gentoo/texlive-module-psfrag-2017.tar.xz mirror://gentoo/texlive-module-rcs-2017.tar.xz mirror://gentoo/texlive-module-sansmath-2017.tar.xz mirror://gentoo/texlive-module-section-2017.tar.xz mirror://gentoo/texlive-module-seminar-2017.tar.xz mirror://gentoo/texlive-module-sepnum-2017.tar.xz mirror://gentoo/texlive-module-setspace-2017.tar.xz mirror://gentoo/texlive-module-subfig-2017.tar.xz mirror://gentoo/texlive-module-textcase-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf-2017.tar.xz mirror://gentoo/texlive-module-typehtml-2017.tar.xz mirror://gentoo/texlive-module-underscore-2017.tar.xz mirror://gentoo/texlive-module-unicode-math-2017.tar.xz mirror://gentoo/texlive-module-xkeyval-2017.tar.xz mirror://gentoo/texlive-module-xltxtra-2017.tar.xz mirror://gentoo/texlive-module-xunicode-2017.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2017.tar.xz mirror://gentoo/texlive-module-breqn.doc-2017.tar.xz mirror://gentoo/texlive-module-caption.doc-2017.tar.xz mirror://gentoo/texlive-module-cite.doc-2017.tar.xz mirror://gentoo/texlive-module-cmap.doc-2017.tar.xz mirror://gentoo/texlive-module-crop.doc-2017.tar.xz mirror://gentoo/texlive-module-ctable.doc-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2017.tar.xz mirror://gentoo/texlive-module-euenc.doc-2017.tar.xz mirror://gentoo/texlive-module-euler.doc-2017.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2017.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2017.tar.xz mirror://gentoo/texlive-module-filehook.doc-2017.tar.xz mirror://gentoo/texlive-module-float.doc-2017.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2017.tar.xz mirror://gentoo/texlive-module-fp.doc-2017.tar.xz mirror://gentoo/texlive-module-index.doc-2017.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2017.tar.xz mirror://gentoo/texlive-module-latexbug.doc-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2017.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2017.tar.xz mirror://gentoo/texlive-module-lineno.doc-2017.tar.xz mirror://gentoo/texlive-module-listings.doc-2017.tar.xz mirror://gentoo/texlive-module-lwarp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2017.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2017.tar.xz mirror://gentoo/texlive-module-memoir.doc-2017.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype.doc-2017.tar.xz mirror://gentoo/texlive-module-ms.doc-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2017.tar.xz mirror://gentoo/texlive-module-parskip.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2017.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2017.tar.xz mirror://gentoo/texlive-module-rcs.doc-2017.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2017.tar.xz mirror://gentoo/texlive-module-section.doc-2017.tar.xz mirror://gentoo/texlive-module-seminar.doc-2017.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2017.tar.xz mirror://gentoo/texlive-module-setspace.doc-2017.tar.xz mirror://gentoo/texlive-module-subfig.doc-2017.tar.xz mirror://gentoo/texlive-module-textcase.doc-2017.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2017.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2017.tar.xz mirror://gentoo/texlive-module-underscore.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2017.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2017.tar.xz mirror://gentoo/texlive-module-breqn.source-2017.tar.xz mirror://gentoo/texlive-module-caption.source-2017.tar.xz mirror://gentoo/texlive-module-crop.source-2017.tar.xz mirror://gentoo/texlive-module-ctable.source-2017.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2017.tar.xz mirror://gentoo/texlive-module-euenc.source-2017.tar.xz mirror://gentoo/texlive-module-euler.source-2017.tar.xz mirror://gentoo/texlive-module-fancyref.source-2017.tar.xz mirror://gentoo/texlive-module-fancyvrb.source-2017.tar.xz mirror://gentoo/texlive-module-filehook.source-2017.tar.xz mirror://gentoo/texlive-module-float.source-2017.tar.xz mirror://gentoo/texlive-module-fontspec.source-2017.tar.xz mirror://gentoo/texlive-module-index.source-2017.tar.xz mirror://gentoo/texlive-module-latexbug.source-2017.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2017.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2017.tar.xz mirror://gentoo/texlive-module-l3packages.source-2017.tar.xz mirror://gentoo/texlive-module-lineno.source-2017.tar.xz mirror://gentoo/texlive-module-listings.source-2017.tar.xz mirror://gentoo/texlive-module-lwarp.source-2017.tar.xz mirror://gentoo/texlive-module-mathtools.source-2017.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2017.tar.xz mirror://gentoo/texlive-module-memoir.source-2017.tar.xz mirror://gentoo/texlive-module-metalogo.source-2017.tar.xz mirror://gentoo/texlive-module-microtype.source-2017.tar.xz mirror://gentoo/texlive-module-ms.source-2017.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2017.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2017.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2017.tar.xz mirror://gentoo/texlive-module-powerdot.source-2017.tar.xz mirror://gentoo/texlive-module-psfrag.source-2017.tar.xz mirror://gentoo/texlive-module-rcs.source-2017.tar.xz mirror://gentoo/texlive-module-subfig.source-2017.tar.xz mirror://gentoo/texlive-module-textcase.source-2017.tar.xz mirror://gentoo/texlive-module-typehtml.source-2017.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2017.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2017.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=37baf8cf2f5efe2404a21447d9ad29a6
+_md5_=21dd70c0590d41cf5ca470498baf8a88
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2017 b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
index 7a746fc43c35..8ddb874f1bcf 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive LuaTeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-checkcites-2017.tar.xz mirror://gentoo/texlive-module-chickenize-2017.tar.xz mirror://gentoo/texlive-module-cloze-2017.tar.xz mirror://gentoo/texlive-module-cstypo-2017.tar.xz mirror://gentoo/texlive-module-ctablestack-2017.tar.xz mirror://gentoo/texlive-module-enigma-2017.tar.xz mirror://gentoo/texlive-module-interpreter-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2017.tar.xz mirror://gentoo/texlive-module-lua2dox-2017.tar.xz mirror://gentoo/texlive-module-luabibentry-2017.tar.xz mirror://gentoo/texlive-module-luabidi-2017.tar.xz mirror://gentoo/texlive-module-luacode-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2017.tar.xz mirror://gentoo/texlive-module-luaindex-2017.tar.xz mirror://gentoo/texlive-module-luainputenc-2017.tar.xz mirror://gentoo/texlive-module-luaintro-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math-2017.tar.xz mirror://gentoo/texlive-module-lualibs-2017.tar.xz mirror://gentoo/texlive-module-luamplib-2017.tar.xz mirror://gentoo/texlive-module-luaotfload-2017.tar.xz mirror://gentoo/texlive-module-luasseq-2017.tar.xz mirror://gentoo/texlive-module-luatex85-2017.tar.xz mirror://gentoo/texlive-module-luatexbase-2017.tar.xz mirror://gentoo/texlive-module-luatexko-2017.tar.xz mirror://gentoo/texlive-module-luatextra-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes-2017.tar.xz mirror://gentoo/texlive-module-luaxml-2017.tar.xz mirror://gentoo/texlive-module-nodetree-2017.tar.xz mirror://gentoo/texlive-module-odsfile-2017.tar.xz mirror://gentoo/texlive-module-placeat-2017.tar.xz mirror://gentoo/texlive-module-selnolig-2017.tar.xz mirror://gentoo/texlive-module-showhyphens-2017.tar.xz mirror://gentoo/texlive-module-spelling-2017.tar.xz mirror://gentoo/texlive-module-ucharcat-2017.tar.xz mirror://gentoo/texlive-module-collection-luatex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-checkcites.doc-2017.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2017.tar.xz mirror://gentoo/texlive-module-cloze.doc-2017.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2017.tar.xz mirror://gentoo/texlive-module-enigma.doc-2017.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2017.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2017.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2017.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2017.tar.xz mirror://gentoo/texlive-module-luacode.doc-2017.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2017.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2017.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2017.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2017.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2017.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2017.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2017.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2017.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2017.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2017.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2017.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2017.tar.xz mirror://gentoo/texlive-module-placeat.doc-2017.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2017.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2017.tar.xz mirror://gentoo/texlive-module-spelling.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2017.tar.xz mirror://gentoo/texlive-module-cloze.source-2017.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2017.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2017.tar.xz mirror://gentoo/texlive-module-luacode.source-2017.tar.xz mirror://gentoo/texlive-module-luaindex.source-2017.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2017.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2017.tar.xz mirror://gentoo/texlive-module-lualibs.source-2017.tar.xz mirror://gentoo/texlive-module-luamplib.source-2017.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2017.tar.xz mirror://gentoo/texlive-module-luasseq.source-2017.tar.xz mirror://gentoo/texlive-module-luatex85.source-2017.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2017.tar.xz mirror://gentoo/texlive-module-luatextra.source-2017.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2017.tar.xz mirror://gentoo/texlive-module-nodetree.source-2017.tar.xz mirror://gentoo/texlive-module-placeat.source-2017.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4044c869c6b812a97d6c788c44f48494
+_md5_=543343b7b6c6b1c7dd2ed5d8cd4b010a
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
index 2a974cf33d33..f7b35cb9d4f3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Mathematics and science packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD BSD-2 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2017 !dev-tex/SIunits !dev-texlive/texlive-mathextra !dev-texlive/texlive-science dev-texlive/texlive-pstricks >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2017.tar.xz mirror://gentoo/texlive-module-SIstyle-2017.tar.xz mirror://gentoo/texlive-module-SIunits-2017.tar.xz mirror://gentoo/texlive-module-alg-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx-2017.tar.xz mirror://gentoo/texlive-module-algorithms-2017.tar.xz mirror://gentoo/texlive-module-amstex-2017.tar.xz mirror://gentoo/texlive-module-apxproof-2017.tar.xz mirror://gentoo/texlive-module-autobreak-2017.tar.xz mirror://gentoo/texlive-module-axodraw2-2017.tar.xz mirror://gentoo/texlive-module-backnaur-2017.tar.xz mirror://gentoo/texlive-module-begriff-2017.tar.xz mirror://gentoo/texlive-module-binomexp-2017.tar.xz mirror://gentoo/texlive-module-biocon-2017.tar.xz mirror://gentoo/texlive-module-bitpattern-2017.tar.xz mirror://gentoo/texlive-module-bohr-2017.tar.xz mirror://gentoo/texlive-module-boldtensors-2017.tar.xz mirror://gentoo/texlive-module-bosisio-2017.tar.xz mirror://gentoo/texlive-module-bpchem-2017.tar.xz mirror://gentoo/texlive-module-bropd-2017.tar.xz mirror://gentoo/texlive-module-bytefield-2017.tar.xz mirror://gentoo/texlive-module-calculation-2017.tar.xz mirror://gentoo/texlive-module-ccfonts-2017.tar.xz mirror://gentoo/texlive-module-chemarrow-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds-2017.tar.xz mirror://gentoo/texlive-module-chemcono-2017.tar.xz mirror://gentoo/texlive-module-chemexec-2017.tar.xz mirror://gentoo/texlive-module-chemformula-2017.tar.xz mirror://gentoo/texlive-module-chemgreek-2017.tar.xz mirror://gentoo/texlive-module-chemmacros-2017.tar.xz mirror://gentoo/texlive-module-chemnum-2017.tar.xz mirror://gentoo/texlive-module-chemschemex-2017.tar.xz mirror://gentoo/texlive-module-chemstyle-2017.tar.xz mirror://gentoo/texlive-module-clrscode-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e-2017.tar.xz mirror://gentoo/texlive-module-commath-2017.tar.xz mirror://gentoo/texlive-module-complexity-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity-2017.tar.xz mirror://gentoo/texlive-module-concmath-2017.tar.xz mirror://gentoo/texlive-module-concrete-2017.tar.xz mirror://gentoo/texlive-module-conteq-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign-2017.tar.xz mirror://gentoo/texlive-module-cryptocode-2017.tar.xz mirror://gentoo/texlive-module-delim-2017.tar.xz mirror://gentoo/texlive-module-delimset-2017.tar.xz mirror://gentoo/texlive-module-delimseasy-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix-2017.tar.xz mirror://gentoo/texlive-module-drawstack-2017.tar.xz mirror://gentoo/texlive-module-dyntree-2017.tar.xz mirror://gentoo/texlive-module-ebproof-2017.tar.xz mirror://gentoo/texlive-module-econometrics-2017.tar.xz mirror://gentoo/texlive-module-eltex-2017.tar.xz mirror://gentoo/texlive-module-emf-2017.tar.xz mirror://gentoo/texlive-module-endiagram-2017.tar.xz mirror://gentoo/texlive-module-engtlc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray-2017.tar.xz mirror://gentoo/texlive-module-extarrows-2017.tar.xz mirror://gentoo/texlive-module-extpfeil-2017.tar.xz mirror://gentoo/texlive-module-faktor-2017.tar.xz mirror://gentoo/texlive-module-fnspe-2017.tar.xz mirror://gentoo/texlive-module-fouridx-2017.tar.xz mirror://gentoo/texlive-module-functan-2017.tar.xz mirror://gentoo/texlive-module-galois-2017.tar.xz mirror://gentoo/texlive-module-gastex-2017.tar.xz mirror://gentoo/texlive-module-gene-logic-2017.tar.xz mirror://gentoo/texlive-module-ghsystem-2017.tar.xz mirror://gentoo/texlive-module-gotoh-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze-2017.tar.xz mirror://gentoo/texlive-module-gu-2017.tar.xz mirror://gentoo/texlive-module-hep-2017.tar.xz mirror://gentoo/texlive-module-hepnames-2017.tar.xz mirror://gentoo/texlive-module-hepparticles-2017.tar.xz mirror://gentoo/texlive-module-hepthesis-2017.tar.xz mirror://gentoo/texlive-module-hepunits-2017.tar.xz mirror://gentoo/texlive-module-interval-2017.tar.xz mirror://gentoo/texlive-module-ionumbers-2017.tar.xz mirror://gentoo/texlive-module-isomath-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap-2017.tar.xz mirror://gentoo/texlive-module-logicproof-2017.tar.xz mirror://gentoo/texlive-module-longdivision-2017.tar.xz mirror://gentoo/texlive-module-lpform-2017.tar.xz mirror://gentoo/texlive-module-lplfitch-2017.tar.xz mirror://gentoo/texlive-module-lstbayes-2017.tar.xz mirror://gentoo/texlive-module-mathcomp-2017.tar.xz mirror://gentoo/texlive-module-mathpartir-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2017.tar.xz mirror://gentoo/texlive-module-mattens-2017.tar.xz mirror://gentoo/texlive-module-mgltex-2017.tar.xz mirror://gentoo/texlive-module-mhchem-2017.tar.xz mirror://gentoo/texlive-module-mhequ-2017.tar.xz mirror://gentoo/texlive-module-miller-2017.tar.xz mirror://gentoo/texlive-module-multiobjective-2017.tar.xz mirror://gentoo/texlive-module-mychemistry-2017.tar.xz mirror://gentoo/texlive-module-natded-2017.tar.xz mirror://gentoo/texlive-module-nath-2017.tar.xz mirror://gentoo/texlive-module-nuc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata-2017.tar.xz mirror://gentoo/texlive-module-objectz-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau-2017.tar.xz mirror://gentoo/texlive-module-oubraces-2017.tar.xz mirror://gentoo/texlive-module-perfectcut-2017.tar.xz mirror://gentoo/texlive-module-physics-2017.tar.xz mirror://gentoo/texlive-module-prftree-2017.tar.xz mirror://gentoo/texlive-module-proba-2017.tar.xz mirror://gentoo/texlive-module-prooftrees-2017.tar.xz mirror://gentoo/texlive-module-pseudocode-2017.tar.xz mirror://gentoo/texlive-module-pygmentex-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight-2017.tar.xz mirror://gentoo/texlive-module-rec-thy-2017.tar.xz mirror://gentoo/texlive-module-revquantum-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2017.tar.xz mirror://gentoo/texlive-module-rmathbr-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2017.tar.xz mirror://gentoo/texlive-module-sciposter-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel-2017.tar.xz mirror://gentoo/texlive-module-sfg-2017.tar.xz mirror://gentoo/texlive-module-shuffle-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick-2017.tar.xz mirror://gentoo/texlive-module-simplewick-2017.tar.xz mirror://gentoo/texlive-module-siunitx-2017.tar.xz mirror://gentoo/texlive-module-skmath-2017.tar.xz mirror://gentoo/texlive-module-spalign-2017.tar.xz mirror://gentoo/texlive-module-stanli-2017.tar.xz mirror://gentoo/texlive-module-statex-2017.tar.xz mirror://gentoo/texlive-module-statex2-2017.tar.xz mirror://gentoo/texlive-module-steinmetz-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd-2017.tar.xz mirror://gentoo/texlive-module-struktex-2017.tar.xz mirror://gentoo/texlive-module-substances-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts-2017.tar.xz mirror://gentoo/texlive-module-susy-2017.tar.xz mirror://gentoo/texlive-module-syllogism-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2017.tar.xz mirror://gentoo/texlive-module-synproof-2017.tar.xz mirror://gentoo/texlive-module-t-angles-2017.tar.xz mirror://gentoo/texlive-module-tablor-2017.tar.xz mirror://gentoo/texlive-module-tensor-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd-2017.tar.xz mirror://gentoo/texlive-module-textgreek-2017.tar.xz mirror://gentoo/texlive-module-textopo-2017.tar.xz mirror://gentoo/texlive-module-thmbox-2017.tar.xz mirror://gentoo/texlive-module-turnstile-2017.tar.xz mirror://gentoo/texlive-module-ulqda-2017.tar.xz mirror://gentoo/texlive-module-unitsdef-2017.tar.xz mirror://gentoo/texlive-module-venn-2017.tar.xz mirror://gentoo/texlive-module-xymtex-2017.tar.xz mirror://gentoo/texlive-module-yhmath-2017.tar.xz mirror://gentoo/texlive-module-youngtab-2017.tar.xz mirror://gentoo/texlive-module-ytableau-2017.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2017.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2017.tar.xz mirror://gentoo/texlive-module-alg.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2017.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2017.tar.xz mirror://gentoo/texlive-module-amstex.doc-2017.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2017.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.doc-2017.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2017.tar.xz mirror://gentoo/texlive-module-begriff.doc-2017.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2017.tar.xz mirror://gentoo/texlive-module-biocon.doc-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-bohr.doc-2017.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2017.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2017.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2017.tar.xz mirror://gentoo/texlive-module-bropd.doc-2017.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2017.tar.xz mirror://gentoo/texlive-module-calculation.doc-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2017.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2017.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2017.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2017.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2017.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2017.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2017.tar.xz mirror://gentoo/texlive-module-commath.doc-2017.tar.xz mirror://gentoo/texlive-module-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2017.tar.xz mirror://gentoo/texlive-module-concmath.doc-2017.tar.xz mirror://gentoo/texlive-module-concrete.doc-2017.tar.xz mirror://gentoo/texlive-module-conteq.doc-2017.tar.xz mirror://gentoo/texlive-module-correctmathalign.doc-2017.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2017.tar.xz mirror://gentoo/texlive-module-delim.doc-2017.tar.xz mirror://gentoo/texlive-module-delimset.doc-2017.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2017.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2017.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2017.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2017.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2017.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2017.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2017.tar.xz mirror://gentoo/texlive-module-eltex.doc-2017.tar.xz mirror://gentoo/texlive-module-emf.doc-2017.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2017.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2017.tar.xz mirror://gentoo/texlive-module-faktor.doc-2017.tar.xz mirror://gentoo/texlive-module-fnspe.doc-2017.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2017.tar.xz mirror://gentoo/texlive-module-functan.doc-2017.tar.xz mirror://gentoo/texlive-module-galois.doc-2017.tar.xz mirror://gentoo/texlive-module-gastex.doc-2017.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2017.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-gotoh.doc-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2017.tar.xz mirror://gentoo/texlive-module-gu.doc-2017.tar.xz mirror://gentoo/texlive-module-hep.doc-2017.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2017.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2017.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2017.tar.xz mirror://gentoo/texlive-module-interval.doc-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2017.tar.xz mirror://gentoo/texlive-module-isomath.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2017.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2017.tar.xz mirror://gentoo/texlive-module-longdivision.doc-2017.tar.xz mirror://gentoo/texlive-module-lpform.doc-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpunctspace.doc-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-mattens.doc-2017.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2017.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2017.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2017.tar.xz mirror://gentoo/texlive-module-miller.doc-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2017.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2017.tar.xz mirror://gentoo/texlive-module-natded.doc-2017.tar.xz mirror://gentoo/texlive-module-nath.doc-2017.tar.xz mirror://gentoo/texlive-module-nuc.doc-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2017.tar.xz mirror://gentoo/texlive-module-objectz.doc-2017.tar.xz mirror://gentoo/texlive-module-oplotsymbl.doc-2017.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2017.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2017.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2017.tar.xz mirror://gentoo/texlive-module-physics.doc-2017.tar.xz mirror://gentoo/texlive-module-prftree.doc-2017.tar.xz mirror://gentoo/texlive-module-proba.doc-2017.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2017.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2017.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2017.tar.xz mirror://gentoo/texlive-module-pythonhighlight.doc-2017.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2017.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2017.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2017.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2017.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2017.tar.xz mirror://gentoo/texlive-module-sfg.doc-2017.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2017.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2017.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2017.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2017.tar.xz mirror://gentoo/texlive-module-skmath.doc-2017.tar.xz mirror://gentoo/texlive-module-spalign.doc-2017.tar.xz mirror://gentoo/texlive-module-stanli.doc-2017.tar.xz mirror://gentoo/texlive-module-statex.doc-2017.tar.xz mirror://gentoo/texlive-module-statex2.doc-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2017.tar.xz mirror://gentoo/texlive-module-struktex.doc-2017.tar.xz mirror://gentoo/texlive-module-substances.doc-2017.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-susy.doc-2017.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2017.tar.xz mirror://gentoo/texlive-module-synproof.doc-2017.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2017.tar.xz mirror://gentoo/texlive-module-tablor.doc-2017.tar.xz mirror://gentoo/texlive-module-tensor.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2017.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2017.tar.xz mirror://gentoo/texlive-module-textopo.doc-2017.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2017.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2017.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2017.tar.xz mirror://gentoo/texlive-module-venn.doc-2017.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2017.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2017.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2017.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2017.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2017.tar.xz mirror://gentoo/texlive-module-SIunits.source-2017.tar.xz mirror://gentoo/texlive-module-alg.source-2017.tar.xz mirror://gentoo/texlive-module-algorithms.source-2017.tar.xz mirror://gentoo/texlive-module-apxproof.source-2017.tar.xz mirror://gentoo/texlive-module-autobreak.source-2017.tar.xz mirror://gentoo/texlive-module-axodraw2.source-2017.tar.xz mirror://gentoo/texlive-module-backnaur.source-2017.tar.xz mirror://gentoo/texlive-module-binomexp.source-2017.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2017.tar.xz mirror://gentoo/texlive-module-bosisio.source-2017.tar.xz mirror://gentoo/texlive-module-bpchem.source-2017.tar.xz mirror://gentoo/texlive-module-bropd.source-2017.tar.xz mirror://gentoo/texlive-module-bytefield.source-2017.tar.xz mirror://gentoo/texlive-module-calculation.source-2017.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2017.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2017.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2017.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2017.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2017.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2017.tar.xz mirror://gentoo/texlive-module-concmath.source-2017.tar.xz mirror://gentoo/texlive-module-conteq.source-2017.tar.xz mirror://gentoo/texlive-module-delim.source-2017.tar.xz mirror://gentoo/texlive-module-delimset.source-2017.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2017.tar.xz mirror://gentoo/texlive-module-dyntree.source-2017.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2017.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2017.tar.xz mirror://gentoo/texlive-module-faktor.source-2017.tar.xz mirror://gentoo/texlive-module-fouridx.source-2017.tar.xz mirror://gentoo/texlive-module-functan.source-2017.tar.xz mirror://gentoo/texlive-module-galois.source-2017.tar.xz mirror://gentoo/texlive-module-gotoh.source-2017.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2017.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2017.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2017.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2017.tar.xz mirror://gentoo/texlive-module-logicproof.source-2017.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2017.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2017.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2017.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2017.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-mattens.source-2017.tar.xz mirror://gentoo/texlive-module-mgltex.source-2017.tar.xz mirror://gentoo/texlive-module-miller.source-2017.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2017.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2017.tar.xz mirror://gentoo/texlive-module-objectz.source-2017.tar.xz mirror://gentoo/texlive-module-proba.source-2017.tar.xz mirror://gentoo/texlive-module-revquantum.source-2017.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2017.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2017.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2017.tar.xz mirror://gentoo/texlive-module-shuffle.source-2017.tar.xz mirror://gentoo/texlive-module-simplewick.source-2017.tar.xz mirror://gentoo/texlive-module-siunitx.source-2017.tar.xz mirror://gentoo/texlive-module-skmath.source-2017.tar.xz mirror://gentoo/texlive-module-spalign.source-2017.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2017.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2017.tar.xz mirror://gentoo/texlive-module-struktex.source-2017.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2017.tar.xz mirror://gentoo/texlive-module-tensor.source-2017.tar.xz mirror://gentoo/texlive-module-textgreek.source-2017.tar.xz mirror://gentoo/texlive-module-textopo.source-2017.tar.xz mirror://gentoo/texlive-module-thmbox.source-2017.tar.xz mirror://gentoo/texlive-module-turnstile.source-2017.tar.xz mirror://gentoo/texlive-module-ulqda.source-2017.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2017.tar.xz mirror://gentoo/texlive-module-xymtex.source-2017.tar.xz mirror://gentoo/texlive-module-yhmath.source-2017.tar.xz mirror://gentoo/texlive-module-youngtab.source-2017.tar.xz mirror://gentoo/texlive-module-ytableau.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=35338c4846c7fb9ea1bef33ece020cf4
+_md5_=200640c9d35ff0decd6c7208f3dde364
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2017 b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
index 3d82346bc055..bc822a7195fe 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=BSD GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2017.tar.xz mirror://gentoo/texlive-module-bbcard-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial-2017.tar.xz mirror://gentoo/texlive-module-cmarrows-2017.tar.xz mirror://gentoo/texlive-module-drv-2017.tar.xz mirror://gentoo/texlive-module-dviincl-2017.tar.xz mirror://gentoo/texlive-module-emp-2017.tar.xz mirror://gentoo/texlive-module-epsincl-2017.tar.xz mirror://gentoo/texlive-module-expressg-2017.tar.xz mirror://gentoo/texlive-module-exteps-2017.tar.xz mirror://gentoo/texlive-module-featpost-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2017.tar.xz mirror://gentoo/texlive-module-garrigues-2017.tar.xz mirror://gentoo/texlive-module-gmp-2017.tar.xz mirror://gentoo/texlive-module-hatching-2017.tar.xz mirror://gentoo/texlive-module-latexmp-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph-2017.tar.xz mirror://gentoo/texlive-module-metago-2017.tar.xz mirror://gentoo/texlive-module-metaobj-2017.tar.xz mirror://gentoo/texlive-module-metaplot-2017.tar.xz mirror://gentoo/texlive-module-metapost-2017.tar.xz mirror://gentoo/texlive-module-metauml-2017.tar.xz mirror://gentoo/texlive-module-mfpic-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2017.tar.xz mirror://gentoo/texlive-module-mp3d-2017.tar.xz mirror://gentoo/texlive-module-mparrows-2017.tar.xz mirror://gentoo/texlive-module-mpattern-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics-2017.tar.xz mirror://gentoo/texlive-module-mptrees-2017.tar.xz mirror://gentoo/texlive-module-piechartmp-2017.tar.xz mirror://gentoo/texlive-module-repere-2017.tar.xz mirror://gentoo/texlive-module-roex-2017.tar.xz mirror://gentoo/texlive-module-roundrect-2017.tar.xz mirror://gentoo/texlive-module-shapes-2017.tar.xz mirror://gentoo/texlive-module-slideshow-2017.tar.xz mirror://gentoo/texlive-module-splines-2017.tar.xz mirror://gentoo/texlive-module-suanpan-2017.tar.xz mirror://gentoo/texlive-module-textpath-2017.tar.xz mirror://gentoo/texlive-module-threeddice-2017.tar.xz mirror://gentoo/texlive-module-collection-metapost-2017.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2017.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-drv.doc-2017.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2017.tar.xz mirror://gentoo/texlive-module-emp.doc-2017.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2017.tar.xz mirror://gentoo/texlive-module-expressg.doc-2017.tar.xz mirror://gentoo/texlive-module-exteps.doc-2017.tar.xz mirror://gentoo/texlive-module-featpost.doc-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2017.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2017.tar.xz mirror://gentoo/texlive-module-gmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hatching.doc-2017.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2017.tar.xz mirror://gentoo/texlive-module-metago.doc-2017.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2017.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost.doc-2017.tar.xz mirror://gentoo/texlive-module-metauml.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2017.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2017.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2017.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2017.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2017.tar.xz mirror://gentoo/texlive-module-repere.doc-2017.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-shapes.doc-2017.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2017.tar.xz mirror://gentoo/texlive-module-splines.doc-2017.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2017.tar.xz mirror://gentoo/texlive-module-textpath.doc-2017.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2017.tar.xz mirror://gentoo/texlive-module-expressg.source-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2017.tar.xz mirror://gentoo/texlive-module-gmp.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-roex.source-2017.tar.xz mirror://gentoo/texlive-module-roundrect.source-2017.tar.xz mirror://gentoo/texlive-module-shapes.source-2017.tar.xz mirror://gentoo/texlive-module-splines.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0190d204e889bea51c20dfe663538130
+_md5_=14641041ef1372d7bb83ba8fa2c07707
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2017 b/metadata/md5-cache/dev-texlive/texlive-music-2017
index ec675df0bcda..8ee5ab043a76 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LGPL-2.1 LPPL-1.2 LPPL-1.3 MIT
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<app-text/texlive-core-2011 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2017.tar.xz mirror://gentoo/texlive-module-autosp-2017.tar.xz mirror://gentoo/texlive-module-bagpipe-2017.tar.xz mirror://gentoo/texlive-module-figbas-2017.tar.xz mirror://gentoo/texlive-module-gchords-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd-2017.tar.xz mirror://gentoo/texlive-module-guitar-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2017.tar.xz mirror://gentoo/texlive-module-harmony-2017.tar.xz mirror://gentoo/texlive-module-leadsheets-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2017.tar.xz mirror://gentoo/texlive-module-m-tx-2017.tar.xz mirror://gentoo/texlive-module-musixguit-2017.tar.xz mirror://gentoo/texlive-module-musixtex-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2017.tar.xz mirror://gentoo/texlive-module-musixtnt-2017.tar.xz mirror://gentoo/texlive-module-piano-2017.tar.xz mirror://gentoo/texlive-module-pmx-2017.tar.xz mirror://gentoo/texlive-module-pmxchords-2017.tar.xz mirror://gentoo/texlive-module-songbook-2017.tar.xz mirror://gentoo/texlive-module-songs-2017.tar.xz mirror://gentoo/texlive-module-xpiano-2017.tar.xz mirror://gentoo/texlive-module-collection-music-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2017.tar.xz mirror://gentoo/texlive-module-autosp.doc-2017.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2017.tar.xz mirror://gentoo/texlive-module-figbas.doc-2017.tar.xz mirror://gentoo/texlive-module-gchords.doc-2017.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2017.tar.xz mirror://gentoo/texlive-module-guitar.doc-2017.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2017.tar.xz mirror://gentoo/texlive-module-harmony.doc-2017.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2017.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2017.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2017.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2017.tar.xz mirror://gentoo/texlive-module-piano.doc-2017.tar.xz mirror://gentoo/texlive-module-pmx.doc-2017.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2017.tar.xz mirror://gentoo/texlive-module-songbook.doc-2017.tar.xz mirror://gentoo/texlive-module-songs.doc-2017.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2017.tar.xz mirror://gentoo/texlive-module-guitar.source-2017.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2017.tar.xz mirror://gentoo/texlive-module-musixtex.source-2017.tar.xz mirror://gentoo/texlive-module-songbook.source-2017.tar.xz mirror://gentoo/texlive-module-songs.source-2017.tar.xz mirror://gentoo/texlive-module-xpiano.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7cff504f87bde67e5188587424480b8e
+_md5_=d2d998f74d5eee9af860d34487d7e956
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2017 b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
index d86a6943db15..7972a0946054 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Apache-2.0 BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-latexextra-2009 !<dev-texlive/texlive-texinfo-2009 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aobs-tikz-2017.tar.xz mirror://gentoo/texlive-module-askmaps-2017.tar.xz mirror://gentoo/texlive-module-asyfig-2017.tar.xz mirror://gentoo/texlive-module-asypictureb-2017.tar.xz mirror://gentoo/texlive-module-autoarea-2017.tar.xz mirror://gentoo/texlive-module-bardiag-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch-2017.tar.xz mirror://gentoo/texlive-module-binarytree-2017.tar.xz mirror://gentoo/texlive-module-blochsphere-2017.tar.xz mirror://gentoo/texlive-module-bloques-2017.tar.xz mirror://gentoo/texlive-module-blox-2017.tar.xz mirror://gentoo/texlive-module-bodegraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraph-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs-2017.tar.xz mirror://gentoo/texlive-module-braids-2017.tar.xz mirror://gentoo/texlive-module-bxeepic-2017.tar.xz mirror://gentoo/texlive-module-cachepic-2017.tar.xz mirror://gentoo/texlive-module-callouts-2017.tar.xz mirror://gentoo/texlive-module-celtic-2017.tar.xz mirror://gentoo/texlive-module-chemfig-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2017.tar.xz mirror://gentoo/texlive-module-circuitikz-2017.tar.xz mirror://gentoo/texlive-module-curve-2017.tar.xz mirror://gentoo/texlive-module-curve2e-2017.tar.xz mirror://gentoo/texlive-module-curves-2017.tar.xz mirror://gentoo/texlive-module-dcpic-2017.tar.xz mirror://gentoo/texlive-module-diagmac2-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex-2017.tar.xz mirror://gentoo/texlive-module-dottex-2017.tar.xz mirror://gentoo/texlive-module-dratex-2017.tar.xz mirror://gentoo/texlive-module-drs-2017.tar.xz mirror://gentoo/texlive-module-duotenzor-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw-2017.tar.xz mirror://gentoo/texlive-module-eepic-2017.tar.xz mirror://gentoo/texlive-module-ellipse-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2017.tar.xz mirror://gentoo/texlive-module-esk-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram-2017.tar.xz mirror://gentoo/texlive-module-fig4latex-2017.tar.xz mirror://gentoo/texlive-module-fitbox-2017.tar.xz mirror://gentoo/texlive-module-flowchart-2017.tar.xz mirror://gentoo/texlive-module-forest-2017.tar.xz mirror://gentoo/texlive-module-genealogytree-2017.tar.xz mirror://gentoo/texlive-module-getmap-2017.tar.xz mirror://gentoo/texlive-module-gincltex-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex-2017.tar.xz mirror://gentoo/texlive-module-gradientframe-2017.tar.xz mirror://gentoo/texlive-module-grafcet-2017.tar.xz mirror://gentoo/texlive-module-graphviz-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2017.tar.xz mirror://gentoo/texlive-module-harveyballs-2017.tar.xz mirror://gentoo/texlive-module-here-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz-2017.tar.xz mirror://gentoo/texlive-module-hobby-2017.tar.xz mirror://gentoo/texlive-module-hvfloat-2017.tar.xz mirror://gentoo/texlive-module-knitting-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern-2017.tar.xz mirror://gentoo/texlive-module-ladder-2017.tar.xz mirror://gentoo/texlive-module-lapdf-2017.tar.xz mirror://gentoo/texlive-module-latex-make-2017.tar.xz mirror://gentoo/texlive-module-lpic-2017.tar.xz mirror://gentoo/texlive-module-lroundrect-2017.tar.xz mirror://gentoo/texlive-module-luamesh-2017.tar.xz mirror://gentoo/texlive-module-makeshape-2017.tar.xz mirror://gentoo/texlive-module-mathspic-2017.tar.xz mirror://gentoo/texlive-module-miniplot-2017.tar.xz mirror://gentoo/texlive-module-mkpic-2017.tar.xz mirror://gentoo/texlive-module-modiagram-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2017.tar.xz mirror://gentoo/texlive-module-numericplots-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram-2017.tar.xz mirror://gentoo/texlive-module-petri-nets-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2017.tar.xz mirror://gentoo/texlive-module-pgfopts-2017.tar.xz mirror://gentoo/texlive-module-pgfornament-2017.tar.xz mirror://gentoo/texlive-module-pgfplots-2017.tar.xz mirror://gentoo/texlive-module-picinpar-2017.tar.xz mirror://gentoo/texlive-module-pict2e-2017.tar.xz mirror://gentoo/texlive-module-pictex-2017.tar.xz mirror://gentoo/texlive-module-pictex2-2017.tar.xz mirror://gentoo/texlive-module-pinlabel-2017.tar.xz mirror://gentoo/texlive-module-pmgraph-2017.tar.xz mirror://gentoo/texlive-module-prerex-2017.tar.xz mirror://gentoo/texlive-module-productbox-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2017.tar.xz mirror://gentoo/texlive-module-qcircuit-2017.tar.xz mirror://gentoo/texlive-module-qrcode-2017.tar.xz mirror://gentoo/texlive-module-randbild-2017.tar.xz mirror://gentoo/texlive-module-randomwalk-2017.tar.xz mirror://gentoo/texlive-module-reotex-2017.tar.xz mirror://gentoo/texlive-module-rviewport-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz-2017.tar.xz mirror://gentoo/texlive-module-schemabloc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman-2017.tar.xz mirror://gentoo/texlive-module-scratch-2017.tar.xz mirror://gentoo/texlive-module-setdeck-2017.tar.xz mirror://gentoo/texlive-module-signchart-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram-2017.tar.xz mirror://gentoo/texlive-module-spath3-2017.tar.xz mirror://gentoo/texlive-module-swimgraf-2017.tar.xz mirror://gentoo/texlive-module-table-fct-2017.tar.xz mirror://gentoo/texlive-module-texdraw-2017.tar.xz mirror://gentoo/texlive-module-ticollege-2017.tar.xz mirror://gentoo/texlive-module-tipfr-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics-2017.tar.xz mirror://gentoo/texlive-module-tikz-page-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude-2017.tar.xz mirror://gentoo/texlive-module-tikzmark-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople-2017.tar.xz mirror://gentoo/texlive-module-tikzposter-2017.tar.xz mirror://gentoo/texlive-module-tikzscale-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2017.tar.xz mirror://gentoo/texlive-module-tqft-2017.tar.xz mirror://gentoo/texlive-module-tkz-base-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab-2017.tar.xz mirror://gentoo/texlive-module-tsemlines-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex-2017.tar.xz mirror://gentoo/texlive-module-venndiagram-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks-2017.tar.xz mirror://gentoo/texlive-module-xpicture-2017.tar.xz mirror://gentoo/texlive-module-xypic-2017.tar.xz mirror://gentoo/texlive-module-collection-pictures-2017.tar.xz doc? ( mirror://gentoo/texlive-module-aobs-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2017.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2017.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2017.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2017.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2017.tar.xz mirror://gentoo/texlive-module-bloques.doc-2017.tar.xz mirror://gentoo/texlive-module-blox.doc-2017.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2017.tar.xz mirror://gentoo/texlive-module-braids.doc-2017.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2017.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2017.tar.xz mirror://gentoo/texlive-module-callouts.doc-2017.tar.xz mirror://gentoo/texlive-module-celtic.doc-2017.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2017.tar.xz mirror://gentoo/texlive-module-curve.doc-2017.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2017.tar.xz mirror://gentoo/texlive-module-curves.doc-2017.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2017.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2017.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-dottex.doc-2017.tar.xz mirror://gentoo/texlive-module-dratex.doc-2017.tar.xz mirror://gentoo/texlive-module-drs.doc-2017.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-eepic.doc-2017.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2017.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2017.tar.xz mirror://gentoo/texlive-module-esk.doc-2017.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2017.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2017.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2017.tar.xz mirror://gentoo/texlive-module-forest.doc-2017.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2017.tar.xz mirror://gentoo/texlive-module-getmap.doc-2017.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2017.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2017.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2017.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2017.tar.xz mirror://gentoo/texlive-module-here.doc-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-hobby.doc-2017.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2017.tar.xz mirror://gentoo/texlive-module-knitting.doc-2017.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-ladder.doc-2017.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2017.tar.xz mirror://gentoo/texlive-module-lpic.doc-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2017.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2017.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2017.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2017.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2017.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2017.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2017.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2017.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2017.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2017.tar.xz mirror://gentoo/texlive-module-pictex.doc-2017.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2017.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2017.tar.xz mirror://gentoo/texlive-module-prerex.doc-2017.tar.xz mirror://gentoo/texlive-module-productbox.doc-2017.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2017.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2017.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2017.tar.xz mirror://gentoo/texlive-module-randbild.doc-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2017.tar.xz mirror://gentoo/texlive-module-reotex.doc-2017.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2017.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2017.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2017.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2017.tar.xz mirror://gentoo/texlive-module-scratch.doc-2017.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2017.tar.xz mirror://gentoo/texlive-module-signchart.doc-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-spath3.doc-2017.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2017.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2017.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2017.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2017.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2017.tar.xz mirror://gentoo/texlive-module-tqft.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2017.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2017.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2017.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2017.tar.xz mirror://gentoo/texlive-module-xypic.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-asyfig.source-2017.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2017.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2017.tar.xz mirror://gentoo/texlive-module-binarytree.source-2017.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2017.tar.xz mirror://gentoo/texlive-module-blox.source-2017.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2017.tar.xz mirror://gentoo/texlive-module-braids.source-2017.tar.xz mirror://gentoo/texlive-module-celtic.source-2017.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-curve.source-2017.tar.xz mirror://gentoo/texlive-module-curve2e.source-2017.tar.xz mirror://gentoo/texlive-module-curves.source-2017.tar.xz mirror://gentoo/texlive-module-dottex.source-2017.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2017.tar.xz mirror://gentoo/texlive-module-ellipse.source-2017.tar.xz mirror://gentoo/texlive-module-esk.source-2017.tar.xz mirror://gentoo/texlive-module-fitbox.source-2017.tar.xz mirror://gentoo/texlive-module-flowchart.source-2017.tar.xz mirror://gentoo/texlive-module-forest.source-2017.tar.xz mirror://gentoo/texlive-module-gincltex.source-2017.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2017.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2017.tar.xz mirror://gentoo/texlive-module-graphviz.source-2017.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2017.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2017.tar.xz mirror://gentoo/texlive-module-hobby.source-2017.tar.xz mirror://gentoo/texlive-module-latex-make.source-2017.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2017.tar.xz mirror://gentoo/texlive-module-makeshape.source-2017.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2017.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2017.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2017.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2017.tar.xz mirror://gentoo/texlive-module-pict2e.source-2017.tar.xz mirror://gentoo/texlive-module-productbox.source-2017.tar.xz mirror://gentoo/texlive-module-qrcode.source-2017.tar.xz mirror://gentoo/texlive-module-randbild.source-2017.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2017.tar.xz mirror://gentoo/texlive-module-rviewport.source-2017.tar.xz mirror://gentoo/texlive-module-signchart.source-2017.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2017.tar.xz mirror://gentoo/texlive-module-spath3.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2017.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2017.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2017.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2017.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2017.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2017.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2017.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2017.tar.xz mirror://gentoo/texlive-module-tqft.source-2017.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2017.tar.xz mirror://gentoo/texlive-module-xpicture.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=35f12e074b7d0610e7e9db3f81199f3d
+_md5_=88ca5a8873fdcee23211ff0f7347a059
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
index e0247151daf8..fc960d8e4e47 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Plain (La)TeX packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !<dev-texlive/texlive-langvietnamese-2009 !dev-texlive/texlive-texinfo !=dev-texlive/texlive-basic-2007* !<dev-texlive/texlive-texinfo-2009 !<dev-texlive/texlive-latexextra-2010 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2017.tar.xz mirror://gentoo/texlive-module-abstyles-2017.tar.xz mirror://gentoo/texlive-module-apnum-2017.tar.xz mirror://gentoo/texlive-module-autoaligne-2017.tar.xz mirror://gentoo/texlive-module-barr-2017.tar.xz mirror://gentoo/texlive-module-bitelist-2017.tar.xz mirror://gentoo/texlive-module-borceux-2017.tar.xz mirror://gentoo/texlive-module-c-pascal-2017.tar.xz mirror://gentoo/texlive-module-catcodes-2017.tar.xz mirror://gentoo/texlive-module-chronosys-2017.tar.xz mirror://gentoo/texlive-module-colorsep-2017.tar.xz mirror://gentoo/texlive-module-dinat-2017.tar.xz mirror://gentoo/texlive-module-dirtree-2017.tar.xz mirror://gentoo/texlive-module-docbytex-2017.tar.xz mirror://gentoo/texlive-module-dowith-2017.tar.xz mirror://gentoo/texlive-module-eijkhout-2017.tar.xz mirror://gentoo/texlive-module-encxvlna-2017.tar.xz mirror://gentoo/texlive-module-epigram-2017.tar.xz mirror://gentoo/texlive-module-epsf-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx-2017.tar.xz mirror://gentoo/texlive-module-fenixpar-2017.tar.xz mirror://gentoo/texlive-module-figflow-2017.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2017.tar.xz mirror://gentoo/texlive-module-fltpoint-2017.tar.xz mirror://gentoo/texlive-module-fntproof-2017.tar.xz mirror://gentoo/texlive-module-font-change-2017.tar.xz mirror://gentoo/texlive-module-fontch-2017.tar.xz mirror://gentoo/texlive-module-fontname-2017.tar.xz mirror://gentoo/texlive-module-gates-2017.tar.xz mirror://gentoo/texlive-module-genmisc-2017.tar.xz mirror://gentoo/texlive-module-getoptk-2017.tar.xz mirror://gentoo/texlive-module-gfnotation-2017.tar.xz mirror://gentoo/texlive-module-gobble-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln-2017.tar.xz mirror://gentoo/texlive-module-gtl-2017.tar.xz mirror://gentoo/texlive-module-hlist-2017.tar.xz mirror://gentoo/texlive-module-hyplain-2017.tar.xz mirror://gentoo/texlive-module-ifetex-2017.tar.xz mirror://gentoo/texlive-module-iftex-2017.tar.xz mirror://gentoo/texlive-module-insbox-2017.tar.xz mirror://gentoo/texlive-module-js-misc-2017.tar.xz mirror://gentoo/texlive-module-kastrup-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists-2017.tar.xz mirror://gentoo/texlive-module-langcode-2017.tar.xz mirror://gentoo/texlive-module-lecturer-2017.tar.xz mirror://gentoo/texlive-module-librarian-2017.tar.xz mirror://gentoo/texlive-module-listofitems-2017.tar.xz mirror://gentoo/texlive-module-mathdots-2017.tar.xz mirror://gentoo/texlive-module-metatex-2017.tar.xz mirror://gentoo/texlive-module-midnight-2017.tar.xz mirror://gentoo/texlive-module-mkpattern-2017.tar.xz mirror://gentoo/texlive-module-multido-2017.tar.xz mirror://gentoo/texlive-module-navigator-2017.tar.xz mirror://gentoo/texlive-module-newsletr-2017.tar.xz mirror://gentoo/texlive-module-ofs-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc-2017.tar.xz mirror://gentoo/texlive-module-path-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans-2017.tar.xz mirror://gentoo/texlive-module-pitex-2017.tar.xz mirror://gentoo/texlive-module-placeins-plain-2017.tar.xz mirror://gentoo/texlive-module-plainpkg-2017.tar.xz mirror://gentoo/texlive-module-plipsum-2017.tar.xz mirror://gentoo/texlive-module-plnfss-2017.tar.xz mirror://gentoo/texlive-module-plstmary-2017.tar.xz mirror://gentoo/texlive-module-present-2017.tar.xz mirror://gentoo/texlive-module-randomlist-2017.tar.xz mirror://gentoo/texlive-module-resumemac-2017.tar.xz mirror://gentoo/texlive-module-schemata-2017.tar.xz mirror://gentoo/texlive-module-shade-2017.tar.xz mirror://gentoo/texlive-module-systeme-2017.tar.xz mirror://gentoo/texlive-module-tabto-generic-2017.tar.xz mirror://gentoo/texlive-module-termmenu-2017.tar.xz mirror://gentoo/texlive-module-tex-ps-2017.tar.xz mirror://gentoo/texlive-module-tex4ht-2017.tar.xz mirror://gentoo/texlive-module-texapi-2017.tar.xz mirror://gentoo/texlive-module-texinfo-2017.tar.xz mirror://gentoo/texlive-module-timetable-2017.tar.xz mirror://gentoo/texlive-module-tracklang-2017.tar.xz mirror://gentoo/texlive-module-treetex-2017.tar.xz mirror://gentoo/texlive-module-trigonometry-2017.tar.xz mirror://gentoo/texlive-module-ulem-2017.tar.xz mirror://gentoo/texlive-module-upca-2017.tar.xz mirror://gentoo/texlive-module-varisize-2017.tar.xz mirror://gentoo/texlive-module-xii-2017.tar.xz mirror://gentoo/texlive-module-xlop-2017.tar.xz mirror://gentoo/texlive-module-yax-2017.tar.xz mirror://gentoo/texlive-module-collection-plaingeneric-2017.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2017.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2017.tar.xz mirror://gentoo/texlive-module-apnum.doc-2017.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2017.tar.xz mirror://gentoo/texlive-module-barr.doc-2017.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2017.tar.xz mirror://gentoo/texlive-module-borceux.doc-2017.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2017.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2017.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2017.tar.xz mirror://gentoo/texlive-module-dinat.doc-2017.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2017.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2017.tar.xz mirror://gentoo/texlive-module-dowith.doc-2017.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf.doc-2017.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2017.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2017.tar.xz mirror://gentoo/texlive-module-figflow.doc-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2017.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change.doc-2017.tar.xz mirror://gentoo/texlive-module-fontch.doc-2017.tar.xz mirror://gentoo/texlive-module-fontname.doc-2017.tar.xz mirror://gentoo/texlive-module-gates.doc-2017.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2017.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2017.tar.xz mirror://gentoo/texlive-module-gobble.doc-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2017.tar.xz mirror://gentoo/texlive-module-gtl.doc-2017.tar.xz mirror://gentoo/texlive-module-hlist.doc-2017.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2017.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2017.tar.xz mirror://gentoo/texlive-module-iftex.doc-2017.tar.xz mirror://gentoo/texlive-module-insbox.doc-2017.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2017.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2017.tar.xz mirror://gentoo/texlive-module-langcode.doc-2017.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2017.tar.xz mirror://gentoo/texlive-module-librarian.doc-2017.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2017.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2017.tar.xz mirror://gentoo/texlive-module-metatex.doc-2017.tar.xz mirror://gentoo/texlive-module-midnight.doc-2017.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-multido.doc-2017.tar.xz mirror://gentoo/texlive-module-navigator.doc-2017.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2017.tar.xz mirror://gentoo/texlive-module-ofs.doc-2017.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2017.tar.xz mirror://gentoo/texlive-module-path.doc-2017.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2017.tar.xz mirror://gentoo/texlive-module-pitex.doc-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2017.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2017.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2017.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2017.tar.xz mirror://gentoo/texlive-module-present.doc-2017.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2017.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2017.tar.xz mirror://gentoo/texlive-module-schemata.doc-2017.tar.xz mirror://gentoo/texlive-module-shade.doc-2017.tar.xz mirror://gentoo/texlive-module-systeme.doc-2017.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-texapi.doc-2017.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2017.tar.xz mirror://gentoo/texlive-module-treetex.doc-2017.tar.xz mirror://gentoo/texlive-module-trigonometry.doc-2017.tar.xz mirror://gentoo/texlive-module-ulem.doc-2017.tar.xz mirror://gentoo/texlive-module-upca.doc-2017.tar.xz mirror://gentoo/texlive-module-varisize.doc-2017.tar.xz mirror://gentoo/texlive-module-xii.doc-2017.tar.xz mirror://gentoo/texlive-module-xlop.doc-2017.tar.xz mirror://gentoo/texlive-module-yax.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2017.tar.xz mirror://gentoo/texlive-module-catcodes.source-2017.tar.xz mirror://gentoo/texlive-module-dirtree.source-2017.tar.xz mirror://gentoo/texlive-module-dowith.source-2017.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2017.tar.xz mirror://gentoo/texlive-module-gobble.source-2017.tar.xz mirror://gentoo/texlive-module-graphics-pln.source-2017.tar.xz mirror://gentoo/texlive-module-gtl.source-2017.tar.xz mirror://gentoo/texlive-module-ifetex.source-2017.tar.xz mirror://gentoo/texlive-module-kastrup.source-2017.tar.xz mirror://gentoo/texlive-module-langcode.source-2017.tar.xz mirror://gentoo/texlive-module-mathdots.source-2017.tar.xz mirror://gentoo/texlive-module-multido.source-2017.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2017.tar.xz mirror://gentoo/texlive-module-randomlist.source-2017.tar.xz mirror://gentoo/texlive-module-schemata.source-2017.tar.xz mirror://gentoo/texlive-module-termmenu.source-2017.tar.xz mirror://gentoo/texlive-module-tracklang.source-2017.tar.xz mirror://gentoo/texlive-module-xlop.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4d5ec40cb5122b5a63f8d91dc4a29f79
+_md5_=54e352fb1aeb8d99c8fe80c6c6a07433
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
index 5aeee365b72a..5fd3d36f7f4d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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-1 GPL-2 LGPL-2 LPPL-1.3
 RDEPEND=>=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-plaingeneric-2017 dev-tex/pgf >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2017.tar.xz mirror://gentoo/texlive-module-bclogo-2017.tar.xz mirror://gentoo/texlive-module-dsptricks-2017.tar.xz mirror://gentoo/texlive-module-makeplot-2017.tar.xz mirror://gentoo/texlive-module-pdftricks-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2017.tar.xz mirror://gentoo/texlive-module-psbao-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-3d-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow-2017.tar.xz mirror://gentoo/texlive-module-pst-am-2017.tar.xz mirror://gentoo/texlive-module-pst-asr-2017.tar.xz mirror://gentoo/texlive-module-pst-bar-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier-2017.tar.xz mirror://gentoo/texlive-module-pst-blur-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar-2017.tar.xz mirror://gentoo/texlive-module-pst-cie-2017.tar.xz mirror://gentoo/texlive-module-pst-circ-2017.tar.xz mirror://gentoo/texlive-module-pst-coil-2017.tar.xz mirror://gentoo/texlive-module-pst-cox-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2017.tar.xz mirror://gentoo/texlive-module-pst-eps-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl-2017.tar.xz mirror://gentoo/texlive-module-pst-exa-2017.tar.xz mirror://gentoo/texlive-module-pst-fill-2017.tar.xz mirror://gentoo/texlive-module-pst-fit-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal-2017.tar.xz mirror://gentoo/texlive-module-pst-fun-2017.tar.xz mirror://gentoo/texlive-module-pst-func-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt-2017.tar.xz mirror://gentoo/texlive-module-pst-geo-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2017.tar.xz mirror://gentoo/texlive-module-pst-grad-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree-2017.tar.xz mirror://gentoo/texlive-module-pst-knot-2017.tar.xz mirror://gentoo/texlive-module-pst-labo-2017.tar.xz mirror://gentoo/texlive-module-pst-layout-2017.tar.xz mirror://gentoo/texlive-module-pst-lens-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2017.tar.xz mirror://gentoo/texlive-module-pst-math-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror-2017.tar.xz mirror://gentoo/texlive-module-pst-node-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2017.tar.xz mirror://gentoo/texlive-module-pst-ode-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp-2017.tar.xz mirror://gentoo/texlive-module-pst-optic-2017.tar.xz mirror://gentoo/texlive-module-pst-osci-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl-2017.tar.xz mirror://gentoo/texlive-module-pst-pad-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective-2017.tar.xz mirror://gentoo/texlive-module-pst-platon-2017.tar.xz mirror://gentoo/texlive-module-pst-plot-2017.tar.xz mirror://gentoo/texlive-module-pst-poly-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans-2017.tar.xz mirror://gentoo/texlive-module-pst-shell-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2017.tar.xz mirror://gentoo/texlive-module-pst-stru-2017.tar.xz mirror://gentoo/texlive-module-pst-support-2017.tar.xz mirror://gentoo/texlive-module-pst-text-2017.tar.xz mirror://gentoo/texlive-module-pst-thick-2017.tar.xz mirror://gentoo/texlive-module-pst-tools-2017.tar.xz mirror://gentoo/texlive-module-pst-tree-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz-2017.tar.xz mirror://gentoo/texlive-module-pst-uml-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf-2017.tar.xz mirror://gentoo/texlive-module-pstricks-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2017.tar.xz mirror://gentoo/texlive-module-rputover-2017.tar.xz mirror://gentoo/texlive-module-uml-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2017.tar.xz mirror://gentoo/texlive-module-vocaltract-2017.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2017.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2017.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2017.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2017.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2017.tar.xz mirror://gentoo/texlive-module-psbao.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spinner.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2017.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2017.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2017.tar.xz mirror://gentoo/texlive-module-rputover.doc-2017.tar.xz mirror://gentoo/texlive-module-uml.doc-2017.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2017.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2017.tar.xz mirror://gentoo/texlive-module-makeplot.source-2017.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2017.tar.xz mirror://gentoo/texlive-module-pst-am.source-2017.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2017.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2017.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2017.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2017.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fit.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2017.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2017.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2017.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.source-2017.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2017.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2017.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2017.tar.xz mirror://gentoo/texlive-module-pst-pulley.source-2017.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2017.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2017.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2017.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.source-2017.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2017.tar.xz mirror://gentoo/texlive-module-pst-text.source-2017.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2017.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2017.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2017.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2017.tar.xz mirror://gentoo/texlive-module-uml.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c44827fc8d2507be231f20fc767f67a3
+_md5_=7a33f6d684e4ba1f82903b972405365a
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2017 b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
index 005053ed8368..d0cfee886e25 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-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=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2017 !<dev-texlive/texlive-latexextra-2014 >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran-2017.tar.xz mirror://gentoo/texlive-module-aastex-2017.tar.xz mirror://gentoo/texlive-module-abntex2-2017.tar.xz mirror://gentoo/texlive-module-acmart-2017.tar.xz mirror://gentoo/texlive-module-acmconf-2017.tar.xz mirror://gentoo/texlive-module-active-conf-2017.tar.xz mirror://gentoo/texlive-module-adfathesis-2017.tar.xz mirror://gentoo/texlive-module-afparticle-2017.tar.xz mirror://gentoo/texlive-module-afthesis-2017.tar.xz mirror://gentoo/texlive-module-aguplus-2017.tar.xz mirror://gentoo/texlive-module-aiaa-2017.tar.xz mirror://gentoo/texlive-module-ametsoc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam-2017.tar.xz mirror://gentoo/texlive-module-aomart-2017.tar.xz mirror://gentoo/texlive-module-apa-2017.tar.xz mirror://gentoo/texlive-module-apa6-2017.tar.xz mirror://gentoo/texlive-module-apa6e-2017.tar.xz mirror://gentoo/texlive-module-arsclassica-2017.tar.xz mirror://gentoo/texlive-module-articleingud-2017.tar.xz mirror://gentoo/texlive-module-asaetr-2017.tar.xz mirror://gentoo/texlive-module-ascelike-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2017.tar.xz mirror://gentoo/texlive-module-bangorexam-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona-2017.tar.xz mirror://gentoo/texlive-module-bgteubner-2017.tar.xz mirror://gentoo/texlive-module-br-lex-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-cascadilla-2017.tar.xz mirror://gentoo/texlive-module-chem-journal-2017.tar.xz mirror://gentoo/texlive-module-classicthesis-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis-2017.tar.xz mirror://gentoo/texlive-module-cmpj-2017.tar.xz mirror://gentoo/texlive-module-confproc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis-2017.tar.xz mirror://gentoo/texlive-module-dccpaper-2017.tar.xz mirror://gentoo/texlive-module-dithesis-2017.tar.xz mirror://gentoo/texlive-module-ebook-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis-2017.tar.xz mirror://gentoo/texlive-module-ejpecp-2017.tar.xz mirror://gentoo/texlive-module-ekaia-2017.tar.xz mirror://gentoo/texlive-module-elbioimp-2017.tar.xz mirror://gentoo/texlive-module-elsarticle-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis-2017.tar.xz mirror://gentoo/texlive-module-emisa-2017.tar.xz mirror://gentoo/texlive-module-erdc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm-2017.tar.xz mirror://gentoo/texlive-module-fbithesis-2017.tar.xz mirror://gentoo/texlive-module-fcavtex-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2017.tar.xz mirror://gentoo/texlive-module-fei-2017.tar.xz mirror://gentoo/texlive-module-gaceta-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2017.tar.xz mirror://gentoo/texlive-module-grant-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis-2017.tar.xz mirror://gentoo/texlive-module-gzt-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal-2017.tar.xz mirror://gentoo/texlive-module-har2nat-2017.tar.xz mirror://gentoo/texlive-module-hobete-2017.tar.xz mirror://gentoo/texlive-module-hustthesis-2017.tar.xz mirror://gentoo/texlive-module-icsv-2017.tar.xz mirror://gentoo/texlive-module-ieeepes-2017.tar.xz mirror://gentoo/texlive-module-ijmart-2017.tar.xz mirror://gentoo/texlive-module-ijsra-2017.tar.xz mirror://gentoo/texlive-module-imac-2017.tar.xz mirror://gentoo/texlive-module-imtekda-2017.tar.xz mirror://gentoo/texlive-module-iscram-2017.tar.xz mirror://gentoo/texlive-module-jacow-2017.tar.xz mirror://gentoo/texlive-module-jmlr-2017.tar.xz mirror://gentoo/texlive-module-jpsj-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs-2017.tar.xz mirror://gentoo/texlive-module-kluwer-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2017.tar.xz mirror://gentoo/texlive-module-langsci-2017.tar.xz mirror://gentoo/texlive-module-lion-msc-2017.tar.xz mirror://gentoo/texlive-module-lni-2017.tar.xz mirror://gentoo/texlive-module-lps-2017.tar.xz mirror://gentoo/texlive-module-matc3-2017.tar.xz mirror://gentoo/texlive-module-matc3mem-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis-2017.tar.xz mirror://gentoo/texlive-module-mentis-2017.tar.xz mirror://gentoo/texlive-module-mnras-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis-2017.tar.xz mirror://gentoo/texlive-module-mucproc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis-2017.tar.xz mirror://gentoo/texlive-module-musuos-2017.tar.xz mirror://gentoo/texlive-module-muthesis-2017.tar.xz mirror://gentoo/texlive-module-mynsfc-2017.tar.xz mirror://gentoo/texlive-module-nature-2017.tar.xz mirror://gentoo/texlive-module-navydocs-2017.tar.xz mirror://gentoo/texlive-module-nddiss-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2017.tar.xz mirror://gentoo/texlive-module-novel-2017.tar.xz mirror://gentoo/texlive-module-nwejm-2017.tar.xz mirror://gentoo/texlive-module-nih-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2017.tar.xz mirror://gentoo/texlive-module-nostarch-2017.tar.xz mirror://gentoo/texlive-module-nrc-2017.tar.xz mirror://gentoo/texlive-module-onrannual-2017.tar.xz mirror://gentoo/texlive-module-opteng-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2017.tar.xz mirror://gentoo/texlive-module-pittetd-2017.tar.xz mirror://gentoo/texlive-module-pkuthss-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2017.tar.xz mirror://gentoo/texlive-module-pracjourn-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2017.tar.xz mirror://gentoo/texlive-module-proposal-2017.tar.xz mirror://gentoo/texlive-module-ptptex-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica-2017.tar.xz mirror://gentoo/texlive-module-resumecls-2017.tar.xz mirror://gentoo/texlive-module-revtex-2017.tar.xz mirror://gentoo/texlive-module-revtex4-2017.tar.xz mirror://gentoo/texlive-module-ryethesis-2017.tar.xz mirror://gentoo/texlive-module-sageep-2017.tar.xz mirror://gentoo/texlive-module-sapthesis-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl-2017.tar.xz mirror://gentoo/texlive-module-schule-2017.tar.xz mirror://gentoo/texlive-module-sduthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesis-2017.tar.xz mirror://gentoo/texlive-module-seuthesix-2017.tar.xz mirror://gentoo/texlive-module-soton-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis-2017.tar.xz mirror://gentoo/texlive-module-spie-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch-2017.tar.xz mirror://gentoo/texlive-module-suftesi-2017.tar.xz mirror://gentoo/texlive-module-sugconf-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2017.tar.xz mirror://gentoo/texlive-module-texilikechaps-2017.tar.xz mirror://gentoo/texlive-module-texilikecover-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2017.tar.xz mirror://gentoo/texlive-module-thuthesis-2017.tar.xz mirror://gentoo/texlive-module-toptesi-2017.tar.xz mirror://gentoo/texlive-module-tudscr-2017.tar.xz mirror://gentoo/texlive-module-tugboat-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2017.tar.xz mirror://gentoo/texlive-module-turabian-2017.tar.xz mirror://gentoo/texlive-module-tui-2017.tar.xz mirror://gentoo/texlive-module-uaclasses-2017.tar.xz mirror://gentoo/texlive-module-uafthesis-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2017.tar.xz mirror://gentoo/texlive-module-ucthesis-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis-2017.tar.xz mirror://gentoo/texlive-module-ulthese-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation-2017.tar.xz mirror://gentoo/texlive-module-umthesis-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis-2017.tar.xz mirror://gentoo/texlive-module-unamth-template-2017.tar.xz mirror://gentoo/texlive-module-unamthesis-2017.tar.xz mirror://gentoo/texlive-module-unswcover-2017.tar.xz mirror://gentoo/texlive-module-uothesis-2017.tar.xz mirror://gentoo/texlive-module-urcls-2017.tar.xz mirror://gentoo/texlive-module-uowthesis-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2017.tar.xz mirror://gentoo/texlive-module-uspatent-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis-2017.tar.xz mirror://gentoo/texlive-module-uwthesis-2017.tar.xz mirror://gentoo/texlive-module-vancouver-2017.tar.xz mirror://gentoo/texlive-module-xduthesis-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky-2017.tar.xz mirror://gentoo/texlive-module-yathesis-2017.tar.xz mirror://gentoo/texlive-module-york-thesis-2017.tar.xz mirror://gentoo/texlive-module-collection-publishers-2017.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2017.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2017.tar.xz mirror://gentoo/texlive-module-aastex.doc-2017.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2017.tar.xz mirror://gentoo/texlive-module-acmart.doc-2017.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2017.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2017.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2017.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2017.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2017.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2017.tar.xz mirror://gentoo/texlive-module-aomart.doc-2017.tar.xz mirror://gentoo/texlive-module-apa.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6.doc-2017.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2017.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2017.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2017.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2017.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2017.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2017.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2017.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2017.tar.xz mirror://gentoo/texlive-module-confproc.doc-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2017.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2017.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-emisa.doc-2017.tar.xz mirror://gentoo/texlive-module-erdc.doc-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2017.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-fei.doc-2017.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2017.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2017.tar.xz mirror://gentoo/texlive-module-grant.doc-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-gzt.doc-2017.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2017.tar.xz mirror://gentoo/texlive-module-hobete.doc-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-icsv.doc-2017.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2017.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2017.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2017.tar.xz mirror://gentoo/texlive-module-imac.doc-2017.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2017.tar.xz mirror://gentoo/texlive-module-iscram.doc-2017.tar.xz mirror://gentoo/texlive-module-jacow.doc-2017.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2017.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2017.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2017.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-langsci.doc-2017.tar.xz mirror://gentoo/texlive-module-lion-msc.doc-2017.tar.xz mirror://gentoo/texlive-module-lni.doc-2017.tar.xz mirror://gentoo/texlive-module-lps.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3.doc-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mentis.doc-2017.tar.xz mirror://gentoo/texlive-module-mnras.doc-2017.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mucproc.doc-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-musuos.doc-2017.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2017.tar.xz mirror://gentoo/texlive-module-nature.doc-2017.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2017.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2017.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-novel.doc-2017.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2017.tar.xz mirror://gentoo/texlive-module-nih.doc-2017.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2017.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2017.tar.xz mirror://gentoo/texlive-module-nrc.doc-2017.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2017.tar.xz mirror://gentoo/texlive-module-opteng.doc-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2017.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2017.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2017.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2017.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2017.tar.xz mirror://gentoo/texlive-module-proposal.doc-2017.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2017.tar.xz mirror://gentoo/texlive-module-psu-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2017.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex.doc-2017.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2017.tar.xz mirror://gentoo/texlive-module-sageep.doc-2017.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2017.tar.xz mirror://gentoo/texlive-module-schule.doc-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2017.tar.xz mirror://gentoo/texlive-module-soton.doc-2017.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-spie.doc-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2017.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2017.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2017.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2017.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2017.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2017.tar.xz mirror://gentoo/texlive-module-turabian.doc-2017.tar.xz mirror://gentoo/texlive-module-tui.doc-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2017.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2017.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2017.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2017.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2017.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2017.tar.xz mirror://gentoo/texlive-module-urcls.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2017.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2017.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2017.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2017.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2017.tar.xz mirror://gentoo/texlive-module-acmart.source-2017.tar.xz mirror://gentoo/texlive-module-acmconf.source-2017.tar.xz mirror://gentoo/texlive-module-active-conf.source-2017.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2017.tar.xz mirror://gentoo/texlive-module-afparticle.source-2017.tar.xz mirror://gentoo/texlive-module-aiaa.source-2017.tar.xz mirror://gentoo/texlive-module-aomart.source-2017.tar.xz mirror://gentoo/texlive-module-apa6.source-2017.tar.xz mirror://gentoo/texlive-module-apa6e.source-2017.tar.xz mirror://gentoo/texlive-module-articleingud.source-2017.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2017.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2017.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2017.tar.xz mirror://gentoo/texlive-module-confproc.source-2017.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2017.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2017.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2017.tar.xz mirror://gentoo/texlive-module-ekaia.source-2017.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2017.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2017.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2017.tar.xz mirror://gentoo/texlive-module-emisa.source-2017.tar.xz mirror://gentoo/texlive-module-erdc.source-2017.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2017.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2017.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2017.tar.xz mirror://gentoo/texlive-module-fei.source-2017.tar.xz mirror://gentoo/texlive-module-grant.source-2017.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2017.tar.xz mirror://gentoo/texlive-module-gzt.source-2017.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2017.tar.xz mirror://gentoo/texlive-module-icsv.source-2017.tar.xz mirror://gentoo/texlive-module-ijmart.source-2017.tar.xz mirror://gentoo/texlive-module-imtekda.source-2017.tar.xz mirror://gentoo/texlive-module-jmlr.source-2017.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2017.tar.xz mirror://gentoo/texlive-module-kluwer.source-2017.tar.xz mirror://gentoo/texlive-module-lni.source-2017.tar.xz mirror://gentoo/texlive-module-lps.source-2017.tar.xz mirror://gentoo/texlive-module-matc3.source-2017.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2017.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2017.tar.xz mirror://gentoo/texlive-module-mentis.source-2017.tar.xz mirror://gentoo/texlive-module-mucproc.source-2017.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2017.tar.xz mirror://gentoo/texlive-module-musuos.source-2017.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2017.tar.xz mirror://gentoo/texlive-module-navydocs.source-2017.tar.xz mirror://gentoo/texlive-module-nddiss.source-2017.tar.xz mirror://gentoo/texlive-module-nwejm.source-2017.tar.xz mirror://gentoo/texlive-module-nostarch.source-2017.tar.xz mirror://gentoo/texlive-module-nrc.source-2017.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2017.tar.xz mirror://gentoo/texlive-module-pittetd.source-2017.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2017.tar.xz mirror://gentoo/texlive-module-proposal.source-2017.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2017.tar.xz mirror://gentoo/texlive-module-resumecls.source-2017.tar.xz mirror://gentoo/texlive-module-revtex.source-2017.tar.xz mirror://gentoo/texlive-module-revtex4.source-2017.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2017.tar.xz mirror://gentoo/texlive-module-sageep.source-2017.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2017.tar.xz mirror://gentoo/texlive-module-schule.source-2017.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2017.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2017.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2017.tar.xz mirror://gentoo/texlive-module-suftesi.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2017.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2017.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2017.tar.xz mirror://gentoo/texlive-module-toptesi.source-2017.tar.xz mirror://gentoo/texlive-module-tudscr.source-2017.tar.xz mirror://gentoo/texlive-module-tugboat.source-2017.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2017.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2017.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2017.tar.xz mirror://gentoo/texlive-module-uhhassignment.source-2017.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2017.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2017.tar.xz mirror://gentoo/texlive-module-ulthese.source-2017.tar.xz mirror://gentoo/texlive-module-uothesis.source-2017.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2017.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2017.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2017.tar.xz mirror://gentoo/texlive-module-yathesis.source-2017.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2a195e138fd8fb584a42166b6e3054a9
+_md5_=028352c150b37f7c4ef88edd8e22d319
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2017 b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
index 411a36d6692d..f337b356416f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive XeTeX and packages
 EAPI=5
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=X source doc
-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=Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2017 !=app-text/texlive-core-2007* >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience !<dev-texlive/texlive-mathextra-2012 dev-texlive/texlive-luatex >=app-text/texlive-core-2017
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2017.tar.xz mirror://gentoo/texlive-module-awesomebox-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2017.tar.xz mirror://gentoo/texlive-module-bidicontour-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2017.tar.xz mirror://gentoo/texlive-module-fontbook-2017.tar.xz mirror://gentoo/texlive-module-fontwrap-2017.tar.xz mirror://gentoo/texlive-module-interchar-2017.tar.xz mirror://gentoo/texlive-module-philokalia-2017.tar.xz mirror://gentoo/texlive-module-ptext-2017.tar.xz mirror://gentoo/texlive-module-quran-2017.tar.xz mirror://gentoo/texlive-module-realscripts-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2017.tar.xz mirror://gentoo/texlive-module-unisugar-2017.tar.xz mirror://gentoo/texlive-module-xebaposter-2017.tar.xz mirror://gentoo/texlive-module-xecjk-2017.tar.xz mirror://gentoo/texlive-module-xecolor-2017.tar.xz mirror://gentoo/texlive-module-xecyr-2017.tar.xz mirror://gentoo/texlive-module-xeindex-2017.tar.xz mirror://gentoo/texlive-module-xesearch-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor-2017.tar.xz mirror://gentoo/texlive-module-xetex-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2017.tar.xz mirror://gentoo/texlive-module-xetexconfig-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2017.tar.xz mirror://gentoo/texlive-module-xetexko-2017.tar.xz mirror://gentoo/texlive-module-xevlna-2017.tar.xz mirror://gentoo/texlive-module-collection-xetex-2017.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2017.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2017.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2017.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2017.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2017.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2017.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2017.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2017.tar.xz mirror://gentoo/texlive-module-interchar.doc-2017.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2017.tar.xz mirror://gentoo/texlive-module-ptext.doc-2017.tar.xz mirror://gentoo/texlive-module-quran.doc-2017.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2017.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2017.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2017.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2017.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2017.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2017.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2017.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2017.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2017.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2017.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2017.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2017.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2017.tar.xz mirror://gentoo/texlive-module-fontbook.source-2017.tar.xz mirror://gentoo/texlive-module-philokalia.source-2017.tar.xz mirror://gentoo/texlive-module-realscripts.source-2017.tar.xz mirror://gentoo/texlive-module-xecjk.source-2017.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2017.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	texlive-module	c0d611850cfb6f43e490d9abc709fab7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=199613cb7ede01ea09d05944ad2168d5
+_md5_=846a6c7923d54efe78cd356ca3325298
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index fab8dae219c7..561bf7fa9e61 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/beediff-1.9 b/metadata/md5-cache/dev-util/beediff-1.9
deleted file mode 100644
index 0dcd249aa970..000000000000
--- a/metadata/md5-cache/dev-util/beediff-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=A graphical user interface for comparing and merging files
-EAPI=5
-HOMEPAGE=http://www.beesoft.pl/index.php?id=beediff
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://www.beesoft.pl/download/beediff_1.9_src.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0640c89a9e7d6ce876a672a84e56aa9a
diff --git a/metadata/md5-cache/dev-util/coccigrep-1.13 b/metadata/md5-cache/dev-util/coccigrep-1.13
index c52161b95e6a..af3e2e46fa34 100644
--- a/metadata/md5-cache/dev-util/coccigrep-1.13
+++ b/metadata/md5-cache/dev-util/coccigrep-1.13
@@ -4,11 +4,11 @@ DESCRIPTION=A semantic grep for the C language
 EAPI=6
 HOMEPAGE=http://home.regit.org/software/coccigrep/
 IUSE=doc emacs vim python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-util/coccinelle[python] emacs? ( virtual/emacs ) vim? ( || ( app-editors/vim app-editors/gvim ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/regit/coccigrep/archive/v1.13.tar.gz -> coccigrep-1.13.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ba586314a470d68c61c73d20955abf5
+_md5_=b2371563d600f8a4a0fe64cffa402721
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.5 b/metadata/md5-cache/dev-util/coccinelle-1.0.5
index 0ee971038867..b66c04d0e182 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.5
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Program matching and transformation engine
 EAPI=5
 HOMEPAGE=http://coccinelle.lip6.fr/
 IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) 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(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.5.tgz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fcc63bb31b045e156c3f16a451163ce8
+_md5_=8a031fd88c63b44dc98000061e103fe6
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.6 b/metadata/md5-cache/dev-util/coccinelle-1.0.6
index 8cf19413128f..64ddfb0f7796 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.6
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Program matching and transformation engine
 EAPI=6
 HOMEPAGE=http://coccinelle.lip6.fr/
 IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) 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(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=362f9197f07943b9c64e0620e7f44e5b
+_md5_=5699c094bfb3dc2ba124479977373f21
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.0 b/metadata/md5-cache/dev-util/drone-cli-0.8.0
deleted file mode 100644
index 9568b33c139b..000000000000
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Command-line interface for Drone
-EAPI=6
-HOMEPAGE=https://github.com/drone/drone-cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!<dev-util/drone-0.7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/drone/drone-cli/archive/d7b19e6f6f581880352f232ba3453e0b769a9dca.tar.gz -> drone-cli-0.8.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=41cec9ba92a9482d5b2746db898610a5
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.1 b/metadata/md5-cache/dev-util/drone-cli-0.8.1
deleted file mode 100644
index 56289fc706ff..000000000000
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=Command-line interface for Drone
-EAPI=6
-HOMEPAGE=https://github.com/drone/drone-cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!!<dev-util/drone-0.7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.1.tar.gz -> drone-cli-0.8.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=8d7bf968c1c1644397fddee1ae332453
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.2 b/metadata/md5-cache/dev-util/drone-cli-0.8.2
new file mode 100644
index 000000000000..020bfc92e000
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!<dev-util/drone-0.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.2.tar.gz -> drone-cli-0.8.2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=d6e80b8da82e1d604b5047b84a1735e4
diff --git a/metadata/md5-cache/dev-util/goland-2017.3 b/metadata/md5-cache/dev-util/goland-2017.3
deleted file mode 100644
index 315adf9cdb87..000000000000
--- a/metadata/md5-cache/dev-util/goland-2017.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Golang IDE by JetBrains
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/go
-KEYWORDS=~amd64
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=dev-lang/go
-SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-2017.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0a722fd2df349bdd585757860daa80ba
diff --git a/metadata/md5-cache/dev-util/goland-2017.3.2 b/metadata/md5-cache/dev-util/goland-2017.3.2
new file mode 100644
index 000000000000..8c16497544de
--- /dev/null
+++ b/metadata/md5-cache/dev-util/goland-2017.3.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2017.3.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1f72eda1cd7399299df19a090f81bafa
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-5.0 b/metadata/md5-cache/dev-util/include-what-you-use-5.0
new file mode 100644
index 000000000000..5d2e461f79e8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/include-what-you-use-5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=6
+HOMEPAGE=https://include-what-you-use.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_5.0.tar.gz -> include-what-you-use-5.0.src.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=72c2b4b2168ee979155293abef911a1b
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.107 b/metadata/md5-cache/dev-util/jenkins-bin-2.107
new file mode 100644
index 000000000000..d0a3949aa0a6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.107
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.107/jenkins.war -> jenkins-bin-2.107.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=159ffe109a2f5e178fedc19fa2a54c14
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.89.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.89.2
deleted file mode 100644
index 2636e1cd3967..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.89.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Extensible continuous integration server
-EAPI=6
-HOMEPAGE=http://jenkins-ci.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.89.2/jenkins.war -> jenkins-bin-2.89.2.war
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1985c920b4162d4f6ce97d4b66581d14
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.89.4 b/metadata/md5-cache/dev-util/jenkins-bin-2.89.4
new file mode 100644
index 000000000000..231dc52d44f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.89.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.89.4/jenkins.war -> jenkins-bin-2.89.4.war
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=73722204c34b6321353338ae930563c1
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.95 b/metadata/md5-cache/dev-util/jenkins-bin-2.95
deleted file mode 100644
index 64de3b3197e6..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.95
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Extensible continuous integration server
-EAPI=6
-HOMEPAGE=http://jenkins-ci.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.95/jenkins.war -> jenkins-bin-2.95.war
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=62e8d5a174d9794790c833c251dc4e85
diff --git a/metadata/md5-cache/dev-util/rosdep-0.11.5 b/metadata/md5-cache/dev-util/rosdep-0.11.5
deleted file mode 100644
index 27e15988c881..000000000000
--- a/metadata/md5-cache/dev-util/rosdep-0.11.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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=Command-line tool for installing ROS system dependencies
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rosdep
-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
-LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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://download.ros.org/downloads/rosdep/rosdep-0.11.5.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.11.5.tar.gz -> rosdep-0.11.5.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_=90b296116b17712b52331e7bab814c50
diff --git a/metadata/md5-cache/dev-util/rosdep-0.11.6 b/metadata/md5-cache/dev-util/rosdep-0.11.6
deleted file mode 100644
index cd0a4d74e69a..000000000000
--- a/metadata/md5-cache/dev-util/rosdep-0.11.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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=Command-line tool for installing ROS system dependencies
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rosdep
-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
-LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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://download.ros.org/downloads/rosdep/rosdep-0.11.6.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.11.6.tar.gz -> rosdep-0.11.6.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_=90b296116b17712b52331e7bab814c50
diff --git a/metadata/md5-cache/dev-util/rosdep-0.12.1 b/metadata/md5-cache/dev-util/rosdep-0.12.1
new file mode 100644
index 000000000000..7c2de0085249
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rosdep-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[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=Command-line tool for installing ROS system dependencies
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosdep
+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
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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://download.ros.org/downloads/rosdep/rosdep-0.12.1.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.12.1.tar.gz -> rosdep-0.12.1.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_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index 326477c148a4..acc4c078b29e 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 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(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 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=Command-line tool for installing ROS system dependencies
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosdep
@@ -9,4 +9,4 @@ RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	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_=90b296116b17712b52331e7bab814c50
+_md5_=cc0c08934d7fdad3ffc5255ab88cf1ce
diff --git a/metadata/md5-cache/dev-util/strace-4.16 b/metadata/md5-cache/dev-util/strace-4.16
deleted file mode 100644
index 1517217682dd..000000000000
--- a/metadata/md5-cache/dev-util/strace-4.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
-DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/strace/
-IUSE=aio perl static unwind
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=mirror://sourceforge/strace/strace-4.16.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8afd5825afc28af4b090a468cb79727c
diff --git a/metadata/md5-cache/dev-util/strace-4.21 b/metadata/md5-cache/dev-util/strace-4.21
new file mode 100644
index 000000000000..766cb19657e7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-4.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/strace/
+IUSE=aio perl static unwind
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v4.21/strace-4.21.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a6f0df0732137d3bac5d5eb06ccce1d9
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index 8141166a40b1..8dfaad8f7ec1 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7e52e2abea1a1b9741205daf21d7abae
+_md5_=849f1c3f4f0ceac193fab26fab49ab03
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 033de24ddc08..abcbe20297cc 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-2.16.1 b/metadata/md5-cache/dev-vcs/git-2.16.1
index cf810395cb75..558afdc20b40 100644
--- a/metadata/md5-cache/dev-vcs/git-2.16.1
+++ b/metadata/md5-cache/dev-vcs/git-2.16.1
@@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion 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 ~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 ~ppc-aix ~x64-cygwin ~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
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.16.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
+_md5_=3c24fe56c0663654159bad0e1139c61d
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index bbf76069c00b..e6e8a8f460d9 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
+_md5_=02e60675629a469f87fe855b1d358c15
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index bbf76069c00b..e6e8a8f460d9 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
+_md5_=02e60675629a469f87fe855b1d358c15
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index bbf76069c00b..e6e8a8f460d9 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
+_md5_=02e60675629a469f87fe855b1d358c15
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index bbf76069c00b..e6e8a8f460d9 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ff4052aeca5bba26de0a2bc8408f5c
+_md5_=02e60675629a469f87fe855b1d358c15
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.5 b/metadata/md5-cache/dev-vcs/tortoisehg-4.5
new file mode 100644
index 000000000000..c0dc68b703f0
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) 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=Set of graphical tools for Mercurial
+EAPI=6
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6 dev-python/iniparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[network,svg,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.5.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_=3f74f7d737859a466638d0da94761f0f
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 2b3e78cc6ba0..6f5f0bc5e524 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_7(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=952fc6cabd4f2103dfec96f61bffb27e
+_md5_=3f74f7d737859a466638d0da94761f0f
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 0ead85b9a6f1..13d4ec8ae6ca 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180206 b/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180206
deleted file mode 100644
index e38725a4358a..000000000000
--- a/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180206
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm pretend
-DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libogg:= media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib:=[minizip] virtual/jpeg:0
-DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
-EAPI=6
-HOMEPAGE=http://urbanterror.info https://github.com/mickael9/ioq3
-IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libogg:= media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib:=[minizip] virtual/jpeg:0
-REQUIRED_USE=|| ( client server )
-SLOT=0
-SRC_URI=https://github.com/mickael9/ioq3/archive/11a2b7462574a913e8960014cfc504f37903a3d6.tar.gz -> urbanterror-4.3.2_p20180206.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=725934537bbbd57d84e59a5b5f9f80f9
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180211 b/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180211
new file mode 100644
index 000000000000..eceba2c57024
--- /dev/null
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.2_p20180211
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm pretend
+DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libogg:= media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib:=[minizip] virtual/jpeg:0
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=6
+HOMEPAGE=http://urbanterror.info https://github.com/mickael9/ioq3
+IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libogg:= media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.2 sys-libs/zlib:=[minizip] virtual/jpeg:0
+REQUIRED_USE=|| ( client server )
+SLOT=0
+SRC_URI=https://github.com/mickael9/ioq3/archive/41425855eba78b31dde895116c4db2e8ce77a2b8.tar.gz -> urbanterror-4.3.2_p20180211.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f479acaf03b56f02c900a135c221ef9d
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index d6425f3a070d..3968fcda2ef2 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/cinnamon-control-center-2.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
deleted file mode 100644
index 27d88c567647..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-1.1[glib] >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common app-arch/xz-utils >=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=Cinnamons's main interface to configure various aspects of the desktop
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=+colord +cups input_devices_wacom debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-1.1[glib] >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.8.1.tar.gz -> cinnamon-control-center-2.8.1.tar.gz
-_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_=de6baab4f01e33154e27b5721cfcd416
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 0e4bf8a58d40..7b4e2103fae3 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/akonadi-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-17.12.1
deleted file mode 100644
index f322620619d3..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-17.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) 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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=6
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-17.12.2
new file mode 100644
index 000000000000..cee2d3cc7f70
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-17.12.2
@@ -0,0 +1,15 @@
+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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) 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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=6
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 x11-misc/shared-mime-info sqlite? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
deleted file mode 100644
index b60e91558ad1..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ca879f245848cce518db77992d05805b
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.2
new file mode 100644
index 000000000000..1e19531078d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-calendar-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ca879f245848cce518db77992d05805b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
deleted file mode 100644
index b8bf0db2ca3d..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi contact integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-contacts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=12b715649347b94ae0aa26ff37555a61
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.2
new file mode 100644
index 000000000000..49dc47268dbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi contact integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-contacts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=12b715649347b94ae0aa26ff37555a61
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
deleted file mode 100644
index 92fd8890d952..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.2
new file mode 100644
index 000000000000..938d178d6298
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.2
@@ -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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-import-wizard-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
deleted file mode 100644
index e4288a6cda6c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi mime types
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.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/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-mime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=714b811db60bee10aac6bcea42abbcb1
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.2
new file mode 100644
index 000000000000..52aa11cc0c46
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi mime types
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.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/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-mime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=714b811db60bee10aac6bcea42abbcb1
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
deleted file mode 100644
index a599f3c01678..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-apps/akonadi-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for akonadi notes integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-notes-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.2
new file mode 100644
index 000000000000..0f1463cbe8e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-apps/akonadi-17.12.2:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for akonadi notes integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-notes-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
deleted file mode 100644
index a492db391a37..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-17.12.1:5[mysql,postgres,sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-search-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.2 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.2
new file mode 100644
index 000000000000..1763bf0f941e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-17.12.2:5[mysql,postgres,sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-search-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
deleted file mode 100644
index 2f4e9863b310..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadiconsole-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=38836db7ab983fb6652ab0abbb63e116
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.2 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.2
new file mode 100644
index 000000000000..e4081b8b69fe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadiconsole-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=38836db7ab983fb6652ab0abbb63e116
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.1 b/metadata/md5-cache/kde-apps/akregator-17.12.1
deleted file mode 100644
index 3bcdf340d1b8..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=kde-apps/syndication-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=News feed aggregator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=kde-apps/syndication-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akregator-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6d63687dda7afcfc0c3e861faeb6d614
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.2 b/metadata/md5-cache/kde-apps/akregator-17.12.2
new file mode 100644
index 000000000000..643d610a276b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=kde-apps/syndication-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=kde-apps/syndication-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akregator-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=aed0de615d1aec2226acb986d17cebd4
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.2-r1 b/metadata/md5-cache/kde-apps/akregator-17.12.2-r1
new file mode 100644
index 000000000000..a4498063fc6d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-17.12.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=kde-apps/syndication-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=News feed aggregator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=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/kcrash-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/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=kde-apps/syndication-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akregator-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=470c938a8bed40cb238aa34658922df5
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.1 b/metadata/md5-cache/kde-apps/analitza-17.12.1
deleted file mode 100644
index d1e3daef90e2..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for mathematical features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/analitza-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.2 b/metadata/md5-cache/kde-apps/analitza-17.12.2
new file mode 100644
index 000000000000..55acb06533f6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for mathematical features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/analitza-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.1 b/metadata/md5-cache/kde-apps/ark-17.12.1
deleted file mode 100644
index 7090f08e4f2c..000000000000
--- a/metadata/md5-cache/kde-apps/ark-17.12.1
+++ /dev/null
@@ -1,14 +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/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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Archiving tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip zlib test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ark-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a2aead06fe85a6b66f44eeebd312af7a
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.2 b/metadata/md5-cache/kde-apps/ark-17.12.2
new file mode 100644
index 000000000000..4fffb5e47079
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-17.12.2
@@ -0,0 +1,14 @@
+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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Archiving tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip zlib test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.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/kcrash-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/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib?] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ark-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a2aead06fe85a6b66f44eeebd312af7a
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.1 b/metadata/md5-cache/kde-apps/artikulate-17.12.1
deleted file mode 100644
index 2947bfe64e32..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-17.12.1
+++ /dev/null
@@ -1,14 +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/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/language/artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/artikulate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.2 b/metadata/md5-cache/kde-apps/artikulate-17.12.2
new file mode 100644
index 000000000000..505c6345fdb8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/language/artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/artikulate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
deleted file mode 100644
index d86a440eb842..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=kde-apps/libkcompactdisc-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=kde-apps/libkcompactdisc-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/audiocd-kio-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.2 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.2
new file mode 100644
index 000000000000..4dcf9a688214
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.2
@@ -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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.2:5 >=kde-apps/libkcompactdisc-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.2:5 >=kde-apps/libkcompactdisc-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/audiocd-kio-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
deleted file mode 100644
index 87560f50efae..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Widget library for baloo
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/baloo-widgets-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.2 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.2
new file mode 100644
index 000000000000..6bd74278b817
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Widget library for baloo
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/baloo-widgets-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.1 b/metadata/md5-cache/kde-apps/blinken-17.12.1
deleted file mode 100644
index bc4e05ed55c0..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the Simon Says game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/blinken-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.2 b/metadata/md5-cache/kde-apps/blinken-17.12.2
new file mode 100644
index 000000000000..0a4175b8b509
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the Simon Says game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/blinken-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.1 b/metadata/md5-cache/kde-apps/bomber-17.12.1
deleted file mode 100644
index cddf1a8065af..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE arcade bombing game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bomber/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/bomber-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.2 b/metadata/md5-cache/kde-apps/bomber-17.12.2
new file mode 100644
index 000000000000..12eb162ed1b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE arcade bombing game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bomber/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/bomber-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.1 b/metadata/md5-cache/kde-apps/bovo-17.12.1
deleted file mode 100644
index db54e79c9c6b..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/bovo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/bovo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.2 b/metadata/md5-cache/kde-apps/bovo-17.12.2
new file mode 100644
index 000000000000..6e1a6dfc9617
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/bovo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/bovo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
deleted file mode 100644
index 6ebcb31779d8..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.2 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.2
new file mode 100644
index 000000000000..7b6c798bc559
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.1 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
deleted file mode 100644
index e753f0a71da7..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar support library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/calendarsupport-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5e11627aaecb67bb19d093ffcfadfa87
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.2 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.2
new file mode 100644
index 000000000000..955c5d582046
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kholidays-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar support library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kholidays-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/calendarsupport-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e62040446efa9635fb2a3ead5b42a78f
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.1 b/metadata/md5-cache/kde-apps/cantor-17.12.1
deleted file mode 100644
index 0e300d140fb9..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-17.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend 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/kcrash-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
-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/kcrash-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/cantor-17.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.2 b/metadata/md5-cache/kde-apps/cantor-17.12.2
new file mode 100644
index 000000000000..0b3732a3d800
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-17.12.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend 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/kcrash-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python2_7
+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/kcrash-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 analitza? ( >=kde-apps/analitza-17.12.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/cantor-17.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.1 b/metadata/md5-cache/kde-apps/cervisia-17.12.1
deleted file mode 100644
index b1641b201311..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=CVS frontend by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/cervisia-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.2 b/metadata/md5-cache/kde-apps/cervisia-17.12.2
new file mode 100644
index 000000000000..49ce0ba4955d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-17.12.2
@@ -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/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=CVS frontend by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/cervisia-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-17.12.1
deleted file mode 100644
index 4c4f4eb5b28b..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/kinit-5.40.0:5 >=kde-frameworks/kio-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
-IUSE=semantic-desktop thumbnail test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kcrash-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/kinit-5.40.0:5 >=kde-frameworks/kio-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.1:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) >=kde-apps/kio-extras-17.12.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-17.12.1:5 >=kde-apps/thumbnailers-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.2 b/metadata/md5-cache/kde-apps/dolphin-17.12.2
new file mode 100644
index 000000000000..35551eed1071
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-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/kinit-5.40.0:5 >=kde-frameworks/kio-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin
+IUSE=semantic-desktop thumbnail test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kcrash-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/kinit-5.40.0:5 >=kde-frameworks/kio-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-apps/baloo-widgets-17.12.2:5 ) !semantic-desktop? ( >=kde-frameworks/kdelibs4support-5.40.0:5 ) >=kde-apps/kio-extras-17.12.2:5 thumbnail? ( >=kde-apps/ffmpegthumbs-17.12.2:5 >=kde-apps/thumbnailers-17.12.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/dolphin-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
deleted file mode 100644
index 006e5ac03f57..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Dolphin plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=bazaar dropbox git mercurial subversion debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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-apps/kompare-17.12.1:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-plugins-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.2
new file mode 100644
index 000000000000..d6658195c2fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Dolphin plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=bazaar dropbox git mercurial subversion debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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-apps/kompare-17.12.2:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/dolphin-plugins-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.1 b/metadata/md5-cache/kde-apps/dragon-17.12.1
deleted file mode 100644
index a2f42143c680..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A simple video player
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/dragon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.2 b/metadata/md5-cache/kde-apps/dragon-17.12.2
new file mode 100644
index 000000000000..73d9efaec92e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A simple video player
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/dragon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.1 b/metadata/md5-cache/kde-apps/eventviews-17.12.1
deleted file mode 100644
index 32ad338248ee..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/eventviews-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.2 b/metadata/md5-cache/kde-apps/eventviews-17.12.2
new file mode 100644
index 000000000000..a79420fe4cc8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.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/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/eventviews-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
deleted file mode 100644
index 0a74fa3f4c6e..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ffmpegthumbs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.2
new file mode 100644
index 000000000000..3074851f9946
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ffmpegthumbs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.1 b/metadata/md5-cache/kde-apps/filelight-17.12.1
deleted file mode 100644
index cacf0f2e78c9..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/filelight-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.2 b/metadata/md5-cache/kde-apps/filelight-17.12.2
new file mode 100644
index 000000000000..b1040885a6c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-17.12.2
@@ -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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/filelight-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.1 b/metadata/md5-cache/kde-apps/granatier-17.12.1
deleted file mode 100644
index 492717f4ac9a..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bomberman game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/granatier/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/granatier-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.2 b/metadata/md5-cache/kde-apps/granatier-17.12.2
new file mode 100644
index 000000000000..ebdc5d8f7bad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bomberman game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/granatier/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/granatier-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
deleted file mode 100644
index ec156df0ee9e..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantlee-editor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.2 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.2
new file mode 100644
index 000000000000..c118e5655603
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.2
@@ -0,0 +1,13 @@
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/grantlee-editor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.1 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
deleted file mode 100644
index 1facaf463e2f..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for Grantlee plugins
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantleetheme-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.2 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.2
new file mode 100644
index 000000000000..f3dae2f0c0af
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for Grantlee plugins
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/grantleetheme-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.1 b/metadata/md5-cache/kde-apps/gwenview-17.12.1
deleted file mode 100644
index 1e96be02dc41..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.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/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/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.1:5= ) raw? ( >=kde-apps/libkdcraw-17.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE image viewer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=fits kipi raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kactivities-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/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/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.1:5= ) raw? ( >=kde-apps/libkdcraw-17.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.40.0:5 >=dev-qt/qtimageformats-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/gwenview-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.2 b/metadata/md5-cache/kde-apps/gwenview-17.12.2
new file mode 100644
index 000000000000..018f1379bd25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-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/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/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.2:5= ) raw? ( >=kde-apps/libkdcraw-17.12.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE image viewer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=fits kipi raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kactivities-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/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/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-17.12.2:5= ) raw? ( >=kde-apps/libkdcraw-17.12.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.40.0:5 >=dev-qt/qtimageformats-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/gwenview-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
deleted file mode 100644
index b06be0e0f8c4..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Incidence editor for korganizer
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/incidenceeditor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.2 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.2
new file mode 100644
index 000000000000..7baa63097212
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Incidence editor for korganizer
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/incidenceeditor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.1 b/metadata/md5-cache/kde-apps/juk-17.12.1
deleted file mode 100644
index f88dbe06d882..000000000000
--- a/metadata/md5-cache/kde-apps/juk-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/juk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.2 b/metadata/md5-cache/kde-apps/juk-17.12.2
new file mode 100644
index 000000000000..eb3124216115
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/juk/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/juk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.1 b/metadata/md5-cache/kde-apps/k3b-17.12.1
deleted file mode 100644
index 163e2258924d..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-17.12.1
+++ /dev/null
@@ -1,14 +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/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/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/K3b
-IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FDL-1.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/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/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/k3b-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.2 b/metadata/md5-cache/kde-apps/k3b-17.12.2
new file mode 100644
index 000000000000..0cf6b0e6ec86
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-17.12.2
@@ -0,0 +1,14 @@
+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/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/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/K3b
+IUSE=dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.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/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/kfilemetadata-5.40.0:5[taglib?] >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/k3b-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
deleted file mode 100644
index b66a906618f1..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-integration-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.2
new file mode 100644
index 000000000000..93e6887a2201
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kaccounts-integration-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
deleted file mode 100644
index 05a040e67d91..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-util/intltool 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE accounts providers
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-providers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.2
new file mode 100644
index 000000000000..f059b9308e40
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-util/intltool 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE accounts providers
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kaccounts-providers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.1 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
deleted file mode 100644
index e3731caa4bc4..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaddressbook-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.2 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.2
new file mode 100644
index 000000000000..c191ab612004
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-17.12.2:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kaddressbook/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kaddressbook-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.1 b/metadata/md5-cache/kde-apps/kajongg-17.12.1
deleted file mode 100644
index db51a2de0f46..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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(+)?] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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(+)?] >=kde-apps/libkmahjongg-17.12.1:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kajongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.2 b/metadata/md5-cache/kde-apps/kajongg-17.12.2
new file mode 100644
index 000000000000..2aac6d37d365
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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(+)?] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kajongg/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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_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(+)?] >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/twisted-16.6.0[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(+)?] >=kde-apps/libkmahjongg-17.12.2:5 !kde-apps/kajongg:4 !<kde-apps/kde4-l10n-17.03.90:4
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kajongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.1 b/metadata/md5-cache/kde-apps/kalarm-17.12.1
deleted file mode 100644
index 0ecc2dc8ba97..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarm-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=524a0c2398d6cb25e0247079c3633a35
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.2 b/metadata/md5-cache/kde-apps/kalarm-17.12.2
new file mode 100644
index 000000000000..2cca53d6909c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kholidays-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kalarmcal-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kholidays-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kalarmcal-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kalarm-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3d5a62ab27ea3ce2d7e639b902449f27
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.1 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
deleted file mode 100644
index 263659df5e6a..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarmcal-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fb5966e650ff5a137e8e6d578692fc7a
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.2 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.2
new file mode 100644
index 000000000000..431d67bd2895
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kalarmcal-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=35bbd8a3cf97b42b0ee319cb5c567e39
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.1 b/metadata/md5-cache/kde-apps/kalgebra-17.12.1
deleted file mode 100644
index ab2432efd019..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=MathML-based graph calculator by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalgebra-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.2 b/metadata/md5-cache/kde-apps/kalgebra-17.12.2
new file mode 100644
index 000000000000..efb424eb8299
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=MathML-based graph calculator by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kalgebra-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1 b/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1
deleted file mode 100644
index 9a6a08817424..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalzium-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=24d7273ff8bbaa048e1c0c2c179ce233
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.2 b/metadata/md5-cache/kde-apps/kalzium-17.12.2
new file mode 100644
index 000000000000..fa63900c4bf7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-17.12.2
@@ -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/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kalzium-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a61ada4f924f3ee92f84538ee751dd99
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.1 b/metadata/md5-cache/kde-apps/kamera-17.12.1
deleted file mode 100644
index 0d801422c1ee..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kamera-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.2 b/metadata/md5-cache/kde-apps/kamera-17.12.2
new file mode 100644
index 000000000000..8dac143ba8c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kamera-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.1 b/metadata/md5-cache/kde-apps/kanagram-17.12.1
deleted file mode 100644
index a8303287d923..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on anagrams of words
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kanagram-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.2 b/metadata/md5-cache/kde-apps/kanagram-17.12.2
new file mode 100644
index 000000000000..71656b2401c9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on anagrams of words
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.2:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kanagram-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.1 b/metadata/md5-cache/kde-apps/kapman-17.12.1
deleted file mode 100644
index eed8a84980e1..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kapman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapman-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.2 b/metadata/md5-cache/kde-apps/kapman-17.12.2
new file mode 100644
index 000000000000..c169e96b04f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kapman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kapman-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.1 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
deleted file mode 100644
index 52b9b9cbe718..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
-IUSE=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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapptemplate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.2 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.2
new file mode 100644
index 000000000000..6d77b3de3a4a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.12.2
@@ -0,0 +1,13 @@
+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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A shell script to create the necessary framework to develop KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kapptemplate
+IUSE=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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kapptemplate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.1-r1 b/metadata/md5-cache/kde-apps/kate-17.12.1-r1
deleted file mode 100644
index d4bde3dc5599..000000000000
--- a/metadata/md5-cache/kde-apps/kate-17.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kate is an advanced text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
-IUSE=+addons test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b8d10f896c7a4497c0c19e8aea7e3e61
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.2 b/metadata/md5-cache/kde-apps/kate-17.12.2
new file mode 100644
index 000000000000..e0ce67cf789d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kate is an advanced text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kate https://kate-editor.org/
+IUSE=+addons test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6ddbd0d7eee6ef75cf86e3672f5b499b
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.1 b/metadata/md5-cache/kde-apps/katomic-17.12.1
deleted file mode 100644
index 22efb3dfbb25..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/katomic-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.2 b/metadata/md5-cache/kde-apps/katomic-17.12.2
new file mode 100644
index 000000000000..d58a60c69bb2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/katomic/ https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/katomic-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.1 b/metadata/md5-cache/kde-apps/kblackbox-17.12.1
deleted file mode 100644
index e250d979976f..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-17.12.1
+++ /dev/null
@@ -1,13 +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/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Blackbox Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblackbox-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.2 b/metadata/md5-cache/kde-apps/kblackbox-17.12.2
new file mode 100644
index 000000000000..5f8b35941655
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Blackbox Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kblackbox-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.1 b/metadata/md5-cache/kde-apps/kblocks-17.12.1
deleted file mode 100644
index 0b9b60b74b63..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A single-player Tetris-like KDE game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kblocks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblocks-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.2 b/metadata/md5-cache/kde-apps/kblocks-17.12.2
new file mode 100644
index 000000000000..33114b70d5a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A single-player Tetris-like KDE game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kblocks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kblocks-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.1 b/metadata/md5-cache/kde-apps/kblog-17.12.1
deleted file mode 100644
index 32e87bdbdd86..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/syndication-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/syndication-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.2 b/metadata/md5-cache/kde-apps/kblog-17.12.2
new file mode 100644
index 000000000000..cbdc4087890e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/syndication-17.12.2:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/syndication-17.12.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kblog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.1 b/metadata/md5-cache/kde-apps/kbounce-17.12.1
deleted file mode 100644
index 03c39e56fed2..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbounce-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.2 b/metadata/md5-cache/kde-apps/kbounce-17.12.2
new file mode 100644
index 000000000000..15a7dc1580bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbounce/ https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kbounce-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.1 b/metadata/md5-cache/kde-apps/kbreakout-17.12.1
deleted file mode 100644
index 2de75a724ce6..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breakout-like game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbreakout-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.2 b/metadata/md5-cache/kde-apps/kbreakout-17.12.2
new file mode 100644
index 000000000000..dfe1b2f94854
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breakout-like game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kbreakout/ https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kbreakout-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.1 b/metadata/md5-cache/kde-apps/kbruch-17.12.1
deleted file mode 100644
index 46dedb385072..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbruch-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.2 b/metadata/md5-cache/kde-apps/kbruch-17.12.2
new file mode 100644
index 000000000000..cb5cd95873b7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kbruch-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.1 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
deleted file mode 100644
index c29568958abc..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcachegrind-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.2 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.2
new file mode 100644
index 000000000000..dddc35205bfb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcachegrind-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.1 b/metadata/md5-cache/kde-apps/kcalc-17.12.1
deleted file mode 100644
index e6f3180baee9..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE calculator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.2 b/metadata/md5-cache/kde-apps/kcalc-17.12.2
new file mode 100644
index 000000000000..bfcf26664892
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE calculator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcalc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.1 b/metadata/md5-cache/kde-apps/kcalcore-17.12.1
deleted file mode 100644
index 049e66520c53..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= sys-devel/bison 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalcore-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.2 b/metadata/md5-cache/kde-apps/kcalcore-17.12.2
new file mode 100644
index 000000000000..f67e5621be7d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= sys-devel/bison 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcalcore-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.1 b/metadata/md5-cache/kde-apps/kcalutils-17.12.1
deleted file mode 100644
index 492998571b9e..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.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/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalutils-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=24f7271bbaf43ae761f5a385f33ef95f
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.2 b/metadata/md5-cache/kde-apps/kcalutils-17.12.2
new file mode 100644
index 000000000000..18fe53ea1c78
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.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/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcalutils-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=24f7271bbaf43ae761f5a385f33ef95f
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.1 b/metadata/md5-cache/kde-apps/kcharselect-17.12.1
deleted file mode 100644
index 0a6b7d59e091..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE character selection utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcharselect-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.2 b/metadata/md5-cache/kde-apps/kcharselect-17.12.2
new file mode 100644
index 000000000000..b892324e95bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE character selection utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kcharselect https://utils.kde.org/projects/kcharselect
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcharselect-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
deleted file mode 100644
index 1d6e860b521d..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE color selector/editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcolorchooser-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.2 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.2
new file mode 100644
index 000000000000..e32e66fc8f5f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE color selector/editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kcolorchooser/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcolorchooser-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.1 b/metadata/md5-cache/kde-apps/kcontacts-17.12.1
deleted file mode 100644
index 0ec15b69af8d..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcontacts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=148fb5f93144399536f4d1ea45af4470
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.2 b/metadata/md5-cache/kde-apps/kcontacts-17.12.2
new file mode 100644
index 000000000000..3152baf05bc1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcontacts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=148fb5f93144399536f4d1ea45af4470
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.1 b/metadata/md5-cache/kde-apps/kcron-17.12.1
deleted file mode 100644
index 428c65cce38e..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Task Scheduler
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcron-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.2 b/metadata/md5-cache/kde-apps/kcron-17.12.2
new file mode 100644
index 000000000000..4321f36eb45e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Task Scheduler
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kcron-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.1 b/metadata/md5-cache/kde-apps/kdav-17.12.1
deleted file mode 100644
index 794616dcd0db..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdav-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.2 b/metadata/md5-cache/kde-apps/kdav-17.12.2
new file mode 100644
index 000000000000..6a59183185c5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdav-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
deleted file mode 100644
index b89064fa5c94..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-17.12.1 >=kde-apps/kdeadmin-meta-17.12.1 >=kde-apps/kdecore-meta-17.12.1 >=kde-apps/kdeedu-meta-17.12.1 >=kde-apps/kdegames-meta-17.12.1 >=kde-apps/kdegraphics-meta-17.12.1 >=kde-apps/kdemultimedia-meta-17.12.1 >=kde-apps/kdenetwork-meta-17.12.1 >=kde-apps/kdeutils-meta-17.12.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.1 ) pim? ( >=kde-apps/kdepim-meta-17.12.1 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.1 ) !kde-apps/kde-apps-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.2
new file mode 100644
index 000000000000..472d91979191
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kate-17.12.2 >=kde-apps/kdeadmin-meta-17.12.2 >=kde-apps/kdecore-meta-17.12.2 >=kde-apps/kdeedu-meta-17.12.2 >=kde-apps/kdegames-meta-17.12.2 >=kde-apps/kdegraphics-meta-17.12.2 >=kde-apps/kdemultimedia-meta-17.12.2 >=kde-apps/kdenetwork-meta-17.12.2 >=kde-apps/kdeutils-meta-17.12.2 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.2 ) pim? ( >=kde-apps/kdepim-meta-17.12.2 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.2 ) !kde-apps/kde-apps-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
deleted file mode 100644
index af567395515f..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-scripts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.2
new file mode 100644
index 000000000000..aa6e3ee4c4ee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/kde4-l10n app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kde-dev-scripts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
deleted file mode 100644
index 3f882f78a955..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Development Utilities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-utils-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.2
new file mode 100644
index 000000000000..3645f3196d7e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Development Utilities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kde-dev-utils-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-meta-17.12.1
deleted file mode 100644
index 40a04702e246..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.2 b/metadata/md5-cache/kde-apps/kde-meta-17.12.2
new file mode 100644
index 000000000000..86f8d7fe4d26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-17.12.2 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
deleted file mode 100644
index f439a5ce50a6..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-17.12.1 >=kde-apps/kmousetool-17.12.1 >=kde-apps/kmouth-17.12.1 !kde-apps/kdeaccessibility-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.2
new file mode 100644
index 000000000000..f3f050c3f765
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-17.12.2 >=kde-apps/kmousetool-17.12.2 >=kde-apps/kmouth-17.12.2 !kde-apps/kdeaccessibility-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
deleted file mode 100644
index 0f3f5f8ba49c..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-17.12.1 cron? ( >=kde-apps/kcron-17.12.1 ) !kde-apps/kdeadmin-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.2
new file mode 100644
index 000000000000..c580d25d4088
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-17.12.2 cron? ( >=kde-apps/kcron-17.12.2 ) !kde-apps/kdeadmin-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
deleted file mode 100644
index 3d68ea9443fa..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.2
new file mode 100644
index 000000000000..2c94982ac04a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-17.12.2 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
deleted file mode 100644
index d0f306b61165..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdebugsettings-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.2 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.2
new file mode 100644
index 000000000000..01c94febcb40
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.2
@@ -0,0 +1,14 @@
+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/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdebugsettings-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
deleted file mode 100644
index 877ec37c3636..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-17.12.1 >=kde-apps/kdialog-17.12.1 >=kde-apps/keditbookmarks-17.12.1 >=kde-apps/kfind-17.12.1 || ( www-client/qupzilla >=kde-apps/konqueror-17.12.1 ) >=kde-apps/konsole-17.12.1 >=kde-apps/kwrite-17.12.1 handbook? ( >=kde-apps/khelpcenter-17.12.1 ) !kde-apps/kdecore-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b55ecb9037bb7597648e18f4d84071c2
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.2
new file mode 100644
index 000000000000..a953431fb354
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-17.12.2 >=kde-apps/kdialog-17.12.2 >=kde-apps/keditbookmarks-17.12.2 >=kde-apps/kfind-17.12.2 || ( www-client/qupzilla >=kde-apps/konqueror-17.12.2 ) >=kde-apps/konsole-17.12.2 >=kde-apps/kwrite-17.12.2 handbook? ( >=kde-apps/khelpcenter-17.12.2 ) !kde-apps/kdecore-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b55ecb9037bb7597648e18f4d84071c2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
deleted file mode 100644
index 529e049ad730..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdeedu-data-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.2 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.2
new file mode 100644
index 000000000000..f3b39a096b26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdeedu-data-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
deleted file mode 100644
index 55834ac0ba46..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=6
-HOMEPAGE=https://edu.kde.org
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-17.12.1 >=kde-apps/artikulate-17.12.1 >=kde-apps/blinken-17.12.1 >=kde-apps/cantor-17.12.1 >=kde-apps/kalgebra-17.12.1 >=kde-apps/kalzium-17.12.1 >=kde-apps/kanagram-17.12.1 >=kde-apps/kbruch-17.12.1 >=kde-apps/kdeedu-data-17.12.1 >=kde-apps/kgeography-17.12.1 >=kde-apps/khangman-17.12.1 >=kde-apps/kig-17.12.1 >=kde-apps/kiten-17.12.1 >=kde-apps/klettres-17.12.1 >=kde-apps/kmplot-17.12.1 >=kde-apps/kqtquickcharts-17.12.1 >=kde-apps/ktouch-17.12.1 >=kde-apps/kturtle-17.12.1 >=kde-apps/kwordquiz-17.12.1 >=kde-apps/libkeduvocdocument-17.12.1 >=kde-apps/marble-17.12.1 >=kde-apps/minuet-17.12.1 >=kde-apps/parley-17.12.1 >=kde-apps/rocs-17.12.1 >=kde-apps/step-17.12.1 !kde-apps/kdeedu-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fad2326e88a11480daf662622befb4b9
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.2
new file mode 100644
index 000000000000..193b9907466c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=6
+HOMEPAGE=https://edu.kde.org
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-17.12.2 >=kde-apps/artikulate-17.12.2 >=kde-apps/blinken-17.12.2 >=kde-apps/cantor-17.12.2 >=kde-apps/kalgebra-17.12.2 >=kde-apps/kalzium-17.12.2 >=kde-apps/kanagram-17.12.2 >=kde-apps/kbruch-17.12.2 >=kde-apps/kdeedu-data-17.12.2 >=kde-apps/kgeography-17.12.2 >=kde-apps/khangman-17.12.2 >=kde-apps/kig-17.12.2 >=kde-apps/kiten-17.12.2 >=kde-apps/klettres-17.12.2 >=kde-apps/kmplot-17.12.2 >=kde-apps/kqtquickcharts-17.12.2 >=kde-apps/ktouch-17.12.2 >=kde-apps/kturtle-17.12.2 >=kde-apps/kwordquiz-17.12.2 >=kde-apps/libkeduvocdocument-17.12.2 >=kde-apps/marble-17.12.2 >=kde-apps/minuet-17.12.2 >=kde-apps/parley-17.12.2 >=kde-apps/rocs-17.12.2 >=kde-apps/step-17.12.2 !kde-apps/kdeedu-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fad2326e88a11480daf662622befb4b9
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
deleted file mode 100644
index 7a3a9cbf5118..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=6
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-17.12.1 >=kde-apps/bovo-17.12.1 >=kde-apps/granatier-17.12.1 >=kde-apps/kapman-17.12.1 >=kde-apps/katomic-17.12.1 >=kde-apps/kblackbox-17.12.1 >=kde-apps/kblocks-17.12.1 >=kde-apps/kbounce-17.12.1 >=kde-apps/kbreakout-17.12.1 >=kde-apps/kdiamond-17.12.1 >=kde-apps/kfourinline-17.12.1 >=kde-apps/kgoldrunner-17.12.1 >=kde-apps/kigo-17.12.1 >=kde-apps/killbots-17.12.1 >=kde-apps/kiriki-17.12.1 >=kde-apps/kjumpingcube-17.12.1 >=kde-apps/klickety-17.12.1 >=kde-apps/klines-17.12.1 >=kde-apps/kmahjongg-17.12.1 >=kde-apps/kmines-17.12.1 >=kde-apps/knavalbattle-17.12.1 >=kde-apps/knetwalk-17.12.1 >=kde-apps/kolf-17.12.1 >=kde-apps/kollision-17.12.1 >=kde-apps/konquest-17.12.1 >=kde-apps/kpat-17.12.1 >=kde-apps/kreversi-17.12.1 >=kde-apps/kshisen-17.12.1 >=kde-apps/ksirk-17.12.1 >=kde-apps/ksnakeduel-17.12.1 >=kde-apps/kspaceduel-17.12.1 >=kde-apps/ksquares-17.12.1 >=kde-apps/ktuberling-17.12.1 >=kde-apps/libkdegames-17.12.1 >=kde-apps/libkmahjongg-17.12.1 >=kde-apps/lskat-17.12.1 >=kde-apps/palapeli-17.12.1 >=kde-apps/picmi-17.12.1 opengl? ( >=kde-apps/ksudoku-17.12.1 >=kde-apps/kubrick-17.12.1 ) python? ( >=kde-apps/kajongg-17.12.1 ) !kde-apps/kdegames-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.2
new file mode 100644
index 000000000000..85170a2fa1f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=6
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-17.12.2 >=kde-apps/bovo-17.12.2 >=kde-apps/granatier-17.12.2 >=kde-apps/kapman-17.12.2 >=kde-apps/katomic-17.12.2 >=kde-apps/kblackbox-17.12.2 >=kde-apps/kblocks-17.12.2 >=kde-apps/kbounce-17.12.2 >=kde-apps/kbreakout-17.12.2 >=kde-apps/kdiamond-17.12.2 >=kde-apps/kfourinline-17.12.2 >=kde-apps/kgoldrunner-17.12.2 >=kde-apps/kigo-17.12.2 >=kde-apps/killbots-17.12.2 >=kde-apps/kiriki-17.12.2 >=kde-apps/kjumpingcube-17.12.2 >=kde-apps/klickety-17.12.2 >=kde-apps/klines-17.12.2 >=kde-apps/kmahjongg-17.12.2 >=kde-apps/kmines-17.12.2 >=kde-apps/knavalbattle-17.12.2 >=kde-apps/knetwalk-17.12.2 >=kde-apps/kolf-17.12.2 >=kde-apps/kollision-17.12.2 >=kde-apps/konquest-17.12.2 >=kde-apps/kpat-17.12.2 >=kde-apps/kreversi-17.12.2 >=kde-apps/kshisen-17.12.2 >=kde-apps/ksirk-17.12.2 >=kde-apps/ksnakeduel-17.12.2 >=kde-apps/kspaceduel-17.12.2 >=kde-apps/ksquares-17.12.2 >=kde-apps/ktuberling-17.12.2 >=kde-apps/libkdegames-17.12.2 >=kde-apps/libkmahjongg-17.12.2 >=kde-apps/lskat-17.12.2 >=kde-apps/palapeli-17.12.2 >=kde-apps/picmi-17.12.2 opengl? ( >=kde-apps/ksudoku-17.12.2 >=kde-apps/kubrick-17.12.2 ) python? ( >=kde-apps/kajongg-17.12.2 ) !kde-apps/kdegames-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
deleted file mode 100644
index 8b976b82cb19..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-17.12.1 >=kde-apps/kamera-17.12.1 >=kde-apps/kcolorchooser-17.12.1 >=kde-apps/kdegraphics-mobipocket-17.12.1 >=kde-apps/kolourpaint-17.12.1 >=kde-apps/kruler-17.12.1 >=kde-apps/libkdcraw-17.12.1 >=kde-apps/libkexiv2-17.12.1 >=kde-apps/libkipi-17.12.1 >=kde-apps/okular-17.12.1 >=kde-apps/spectacle-17.12.1 >=kde-apps/svgpart-17.12.1 >=kde-apps/thumbnailers-17.12.1 scanner? ( >=kde-apps/libksane-17.12.1 ) !kde-apps/kdegraphics-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.2
new file mode 100644
index 000000000000..4cadb55a654c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-17.12.2 >=kde-apps/kamera-17.12.2 >=kde-apps/kcolorchooser-17.12.2 >=kde-apps/kdegraphics-mobipocket-17.12.2 >=kde-apps/kolourpaint-17.12.2 >=kde-apps/kruler-17.12.2 >=kde-apps/libkdcraw-17.12.2 >=kde-apps/libkexiv2-17.12.2 >=kde-apps/libkipi-17.12.2 >=kde-apps/okular-17.12.2 >=kde-apps/spectacle-17.12.2 >=kde-apps/svgpart-17.12.2 >=kde-apps/thumbnailers-17.12.2 scanner? ( >=kde-apps/libksane-17.12.2 ) !kde-apps/kdegraphics-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
deleted file mode 100644
index deeb4aef6d2d..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.2
new file mode 100644
index 000000000000..74202eabdaa3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdegraphics-mobipocket-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
deleted file mode 100644
index 5b98928e0071..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-17.12.1 >=kde-apps/juk-17.12.1 >=kde-apps/kdenlive-17.12.1 >=kde-apps/kmix-17.12.1 >=kde-apps/kwave-17.12.1 >=kde-apps/libkcddb-17.12.1 cdrom? ( >=kde-apps/audiocd-kio-17.12.1 >=kde-apps/k3b-17.12.1 >=kde-apps/libkcompactdisc-17.12.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.1 ) !kde-apps/kdemultimedia-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f6b67c399a121114b39562478c45c64d
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.2
new file mode 100644
index 000000000000..1c3722522e63
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-17.12.2 >=kde-apps/juk-17.12.2 >=kde-apps/kdenlive-17.12.2 >=kde-apps/kmix-17.12.2 >=kde-apps/kwave-17.12.2 >=kde-apps/libkcddb-17.12.2 cdrom? ( >=kde-apps/audiocd-kio-17.12.2 >=kde-apps/k3b-17.12.2 >=kde-apps/libkcompactdisc-17.12.2 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.2 ) !kde-apps/kdemultimedia-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f6b67c399a121114b39562478c45c64d
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
deleted file mode 100644
index 056f72acfd8c..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kcontrol filesharing config module for SMB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.2
new file mode 100644
index 000000000000..8f32cdaaff65
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.2
@@ -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/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kcontrol filesharing config module for SMB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdenetwork-filesharing-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
deleted file mode 100644
index e5896990d4a1..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-17.12.1 >=kde-apps/kget-17.12.1 >=kde-apps/krdc-17.12.1 >=kde-apps/krfb-17.12.1 >=kde-apps/plasma-telepathy-meta-17.12.1 >=kde-apps/zeroconf-ioslave-17.12.1 !kde-apps/kdenetwork-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=0864a5560d9ca2bca5050d667bebd1ca
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.2
new file mode 100644
index 000000000000..e94ffc7e51e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-17.12.2 >=kde-apps/kget-17.12.2 >=kde-apps/krdc-17.12.2 >=kde-apps/krfb-17.12.2 >=kde-apps/plasma-telepathy-meta-17.12.2 >=kde-apps/zeroconf-ioslave-17.12.2 !kde-apps/kdenetwork-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0864a5560d9ca2bca5050d667bebd1ca
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.1 b/metadata/md5-cache/kde-apps/kdenlive-17.12.1
deleted file mode 100644
index 2bb6f486411d..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=6
-HOMEPAGE=https://www.kdenlive.org/
-IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenlive-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=794abc15cefaba740e923c5794ef0d8c
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.2 b/metadata/md5-cache/kde-apps/kdenlive-17.12.2
new file mode 100644
index 000000000000..dbe32b30e3bb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.12.2
@@ -0,0 +1,13 @@
+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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=6
+HOMEPAGE=https://www.kdenlive.org/
+IUSE=freesound gles2 jogshuttle semantic-desktop v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/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/kservice-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 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdenlive-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=794abc15cefaba740e923c5794ef0d8c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3 b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
index 80c1e0c4dcea..c7364d6ba9cd 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdepim-addons-17.08.3.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	f969e0903765bc89fad95c1552831e5e	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_=defde6451a2317c914be98314680de69
+_md5_=97a4f45231bd270518c3220a3fe0ac66
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
deleted file mode 100644
index 56df02a2bd5f..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-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/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.1:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=importwizard test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-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/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-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/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.1:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-addons-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=17c2fc135e8e7195bcfae5a99233f5c6
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.2 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.2
new file mode 100644
index 000000000000..0cb8ca6ad640
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.2
@@ -0,0 +1,14 @@
+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/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-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/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/libktnef-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.2:5 ) >=app-crypt/gpgme-1.7.1[cxx,qt5] 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=importwizard test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+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/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-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/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/libktnef-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-17.12.2:5 ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdepim-addons-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=eb11701765a3f2d12b844674c5d568f4
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
deleted file mode 100644
index 1ec37e05fccc..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.2
new file mode 100644
index 000000000000..826c70bf9081
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdepim-apps-libs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
deleted file mode 100644
index f566aeb95bf0..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-17.12.1 >=kde-apps/akonadiconsole-17.12.1 >=kde-apps/akonadi-calendar-17.12.1 >=kde-apps/akonadi-contacts-17.12.1 >=kde-apps/akonadi-import-wizard-17.12.1 >=kde-apps/akonadi-mime-17.12.1 >=kde-apps/akonadi-notes-17.12.1 >=kde-apps/akonadi-search-17.12.1 >=kde-apps/akregator-17.12.1 >=kde-apps/calendarjanitor-17.12.1 >=kde-apps/calendarsupport-17.12.1 >=kde-apps/eventviews-17.12.1 >=kde-apps/grantlee-editor-17.12.1 >=kde-apps/grantleetheme-17.12.1 >=kde-apps/incidenceeditor-17.12.1 >=kde-apps/kaddressbook-17.12.1 >=kde-apps/kalarm-17.12.1 >=kde-apps/kalarmcal-17.12.1 >=kde-apps/kcalcore-17.12.1 >=kde-apps/kcalutils-17.12.1 >=kde-apps/kcontacts-17.12.1 >=kde-apps/kdepim-addons-17.12.1 >=kde-apps/kdepim-apps-libs-17.12.1 >=kde-apps/kdepim-runtime-17.12.1 >=kde-apps/kholidays-17.12.1 >=kde-apps/kidentitymanagement-17.12.1 >=kde-apps/kimap-17.12.1 >=kde-apps/kldap-17.12.1 >=kde-apps/kleopatra-17.12.1 >=kde-apps/kmail-17.12.1 >=kde-apps/kmail-account-wizard-17.12.1 >=kde-apps/kmailtransport-17.12.1 >=kde-apps/kmbox-17.12.1 >=kde-apps/kmime-17.12.1 >=kde-apps/knotes-17.12.1 >=kde-apps/konsolekalendar-17.12.1 >=kde-apps/kontact-17.12.1 >=kde-apps/kontactinterface-17.12.1 >=kde-apps/korganizer-17.12.1 >=kde-apps/kpimtextedit-17.12.1 >=kde-apps/ksmtp-17.12.1 >=kde-apps/libgravatar-17.12.1 >=kde-apps/libkdepim-17.12.1 >=kde-apps/libkgapi-17.12.1 >=kde-apps/libkleo-17.12.1 >=kde-apps/libksieve-17.12.1 >=kde-apps/libktnef-17.12.1 >=kde-apps/mailcommon-17.12.1 >=kde-apps/mailimporter-17.12.1 >=kde-apps/mbox-importer-17.12.1 >=kde-apps/messagelib-17.12.1 >=kde-apps/pim-data-exporter-17.12.1 >=kde-apps/pim-sieve-editor-17.12.1 >=kde-apps/pimcommon-17.12.1 >=kde-apps/syndication-17.12.1 !kde-apps/kdepim-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fdfbef72ec0b621d29033dfd1d832b61
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.2
new file mode 100644
index 000000000000..787f183a1705
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-frameworks/kholidays-5.40.0 >=kde-apps/akonadi-17.12.2 >=kde-apps/akonadiconsole-17.12.2 >=kde-apps/akonadi-calendar-17.12.2 >=kde-apps/akonadi-contacts-17.12.2 >=kde-apps/akonadi-import-wizard-17.12.2 >=kde-apps/akonadi-mime-17.12.2 >=kde-apps/akonadi-notes-17.12.2 >=kde-apps/akonadi-search-17.12.2 >=kde-apps/akregator-17.12.2 >=kde-apps/calendarjanitor-17.12.2 >=kde-apps/calendarsupport-17.12.2 >=kde-apps/eventviews-17.12.2 >=kde-apps/grantlee-editor-17.12.2 >=kde-apps/grantleetheme-17.12.2 >=kde-apps/incidenceeditor-17.12.2 >=kde-apps/kaddressbook-17.12.2 >=kde-apps/kalarm-17.12.2 >=kde-apps/kalarmcal-17.12.2 >=kde-apps/kcalcore-17.12.2 >=kde-apps/kcalutils-17.12.2 >=kde-apps/kcontacts-17.12.2 >=kde-apps/kdepim-addons-17.12.2 >=kde-apps/kdepim-apps-libs-17.12.2 >=kde-apps/kdepim-runtime-17.12.2 >=kde-apps/kidentitymanagement-17.12.2 >=kde-apps/kimap-17.12.2 >=kde-apps/kldap-17.12.2 >=kde-apps/kleopatra-17.12.2 >=kde-apps/kmail-17.12.2 >=kde-apps/kmail-account-wizard-17.12.2 >=kde-apps/kmailtransport-17.12.2 >=kde-apps/kmbox-17.12.2 >=kde-apps/kmime-17.12.2 >=kde-apps/knotes-17.12.2 >=kde-apps/konsolekalendar-17.12.2 >=kde-apps/kontact-17.12.2 >=kde-apps/kontactinterface-17.12.2 >=kde-apps/korganizer-17.12.2 >=kde-apps/kpimtextedit-17.12.2 >=kde-apps/ksmtp-17.12.2 >=kde-apps/libgravatar-17.12.2 >=kde-apps/libkdepim-17.12.2 >=kde-apps/libkgapi-17.12.2 >=kde-apps/libkleo-17.12.2 >=kde-apps/libksieve-17.12.2 >=kde-apps/libktnef-17.12.2 >=kde-apps/mailcommon-17.12.2 >=kde-apps/mailimporter-17.12.2 >=kde-apps/mbox-importer-17.12.2 >=kde-apps/messagelib-17.12.2 >=kde-apps/pim-data-exporter-17.12.2 >=kde-apps/pim-sieve-editor-17.12.2 >=kde-apps/pimcommon-17.12.2 >=kde-apps/syndication-17.12.2 !kde-apps/kdepim-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2569562ec6a2927739a7cb66b1f82700
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
deleted file mode 100644
index 5f3c62c3a72e..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdav-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkgapi-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-17.12.1:5[test] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdav-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkgapi-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-runtime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bddc5ac99087b20657606d4e79001c9b
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.2
new file mode 100644
index 000000000000..cc7b866d283e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/kalarmcal-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdav-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmbox-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkgapi-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-17.12.2:5[test] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/kalarmcal-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdav-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmbox-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkgapi-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/oxygen-icons-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdepim-runtime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bddc5ac99087b20657606d4e79001c9b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
deleted file mode 100644
index 71e273c63c4a..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.2
new file mode 100644
index 000000000000..4fb13beb2dc2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdesdk-kioslaves-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
deleted file mode 100644
index de1fe6344db3..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=cvs
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-plugins-17.12.1 >=kde-apps/kapptemplate-17.12.1 >=kde-apps/kcachegrind-17.12.1 >=kde-apps/kde-dev-scripts-17.12.1 >=kde-apps/kde-dev-utils-17.12.1 >=kde-apps/kdesdk-kioslaves-17.12.1 >=kde-apps/kdesdk-thumbnailers-17.12.1 >=kde-apps/kompare-17.12.1 >=kde-apps/kross-interpreters-17.12.1 >=kde-apps/libkomparediff2-17.12.1 >=kde-apps/lokalize-17.12.1 >=kde-apps/okteta-17.12.1 >=kde-apps/poxml-17.12.1 >=kde-apps/umbrello-17.12.1 cvs? ( >=kde-apps/cervisia-17.12.1 ) !kde-apps/kdesdk-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2758888f24f743555392ef164e1fcf94
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.2
new file mode 100644
index 000000000000..6c1d1674b96e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=cvs
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-plugins-17.12.2 >=kde-apps/kapptemplate-17.12.2 >=kde-apps/kcachegrind-17.12.2 >=kde-apps/kde-dev-scripts-17.12.2 >=kde-apps/kde-dev-utils-17.12.2 >=kde-apps/kdesdk-kioslaves-17.12.2 >=kde-apps/kdesdk-thumbnailers-17.12.2 >=kde-apps/kompare-17.12.2 >=kde-apps/kross-interpreters-17.12.2 >=kde-apps/libkomparediff2-17.12.2 >=kde-apps/lokalize-17.12.2 >=kde-apps/okteta-17.12.2 >=kde-apps/poxml-17.12.2 >=kde-apps/umbrello-17.12.2 cvs? ( >=kde-apps/cervisia-17.12.2 ) !kde-apps/kdesdk-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2758888f24f743555392ef164e1fcf94
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
deleted file mode 100644
index 42529c8ba23f..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.2
new file mode 100644
index 000000000000..37e35e9f0e4b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdesdk-thumbnailers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
deleted file mode 100644
index 4c303c068bab..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=cups floppy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-17.12.1 >=kde-apps/filelight-17.12.1 >=kde-apps/kcalc-17.12.1 >=kde-apps/kcharselect-17.12.1 >=kde-apps/kdebugsettings-17.12.1 >=kde-apps/kdf-17.12.1 >=kde-apps/kgpg-17.12.1 >=kde-apps/kimagemapeditor-17.12.1 >=kde-apps/kteatime-17.12.1 >=kde-apps/ktimer-17.12.1 >=kde-apps/kwalletmanager-17.12.1 >=kde-apps/sweeper-17.12.1 cups? ( >=kde-apps/print-manager-17.12.1 ) floppy? ( >=kde-apps/kfloppy-17.12.1 ) !kde-apps/kdeutils-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ab21cf3351c714255ac295dddbedcba2
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.2
new file mode 100644
index 000000000000..78e9a43c86ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
+IUSE=cups floppy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-17.12.2 >=kde-apps/filelight-17.12.2 >=kde-apps/kcalc-17.12.2 >=kde-apps/kcharselect-17.12.2 >=kde-apps/kdebugsettings-17.12.2 >=kde-apps/kdf-17.12.2 >=kde-apps/kgpg-17.12.2 >=kde-apps/kimagemapeditor-17.12.2 >=kde-apps/kteatime-17.12.2 >=kde-apps/ktimer-17.12.2 >=kde-apps/kwalletmanager-17.12.2 >=kde-apps/sweeper-17.12.2 cups? ( >=kde-apps/print-manager-17.12.2 ) floppy? ( >=kde-apps/kfloppy-17.12.2 ) !kde-apps/kdeutils-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ab21cf3351c714255ac295dddbedcba2
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.1 b/metadata/md5-cache/kde-apps/kdf-17.12.1
deleted file mode 100644
index 240bf64ac022..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE free disk space utility
-EAPI=6
-HOMEPAGE=https://utils.kde.org/projects/kdf
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdf-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.2 b/metadata/md5-cache/kde-apps/kdf-17.12.2
new file mode 100644
index 000000000000..1180f2cbe016
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE free disk space utility
+EAPI=6
+HOMEPAGE=https://utils.kde.org/projects/kdf
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdf-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.1 b/metadata/md5-cache/kde-apps/kdialog-17.12.1
deleted file mode 100644
index 49ca9d08d200..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdialog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.2 b/metadata/md5-cache/kde-apps/kdialog-17.12.2
new file mode 100644
index 000000000000..4b329a15c145
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-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/knotifications-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdialog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.1 b/metadata/md5-cache/kde-apps/kdiamond-17.12.1
deleted file mode 100644
index 7fd037b94b86..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE three-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdiamond-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.2 b/metadata/md5-cache/kde-apps/kdiamond-17.12.2
new file mode 100644
index 000000000000..3ae3be24d08b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE three-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kdiamond/ https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdiamond-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
deleted file mode 100644
index c6e336ec5e56..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/keditbookmarks-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.2 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.2
new file mode 100644
index 000000000000..db12e4a1476b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/keditbookmarks-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.1 b/metadata/md5-cache/kde-apps/kfind-17.12.1
deleted file mode 100644
index 625bcec3c7b8..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
-IUSE=debug +handbook
-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfind-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b50e517d22b1dde4520221d9f2d71405
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.2 b/metadata/md5-cache/kde-apps/kfind-17.12.2
new file mode 100644
index 000000000000..70c157339e42
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-17.12.2
@@ -0,0 +1,13 @@
+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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfind/
+IUSE=debug +handbook
+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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kfind-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b50e517d22b1dde4520221d9f2d71405
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.1 b/metadata/md5-cache/kde-apps/kfloppy-17.12.1
deleted file mode 100644
index ce0f495b281f..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfloppy-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.2 b/metadata/md5-cache/kde-apps/kfloppy-17.12.2
new file mode 100644
index 000000000000..02fb86f1a1ac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kfloppy/ https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kfloppy-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.1 b/metadata/md5-cache/kde-apps/kfourinline-17.12.1
deleted file mode 100644
index 92f572b8b223..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE four-in-a-row game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfourinline-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.2 b/metadata/md5-cache/kde-apps/kfourinline-17.12.2
new file mode 100644
index 000000000000..b93843c5917c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE four-in-a-row game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kfourinline/ https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kfourinline-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.1 b/metadata/md5-cache/kde-apps/kgeography-17.12.1
deleted file mode 100644
index bca870776873..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Geography learning tool
-EAPI=6
-HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgeography-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.2 b/metadata/md5-cache/kde-apps/kgeography-17.12.2
new file mode 100644
index 000000000000..553f7be43c86
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Geography learning tool
+EAPI=6
+HOMEPAGE=https://edu.kde.org/applications/miscellaneous/kgeography https://edu.kde.org/applications/all/kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kgeography-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.1 b/metadata/md5-cache/kde-apps/kget-17.12.1
deleted file mode 100644
index bd56cfd5366f..000000000000
--- a/metadata/md5-cache/kde-apps/kget-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-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/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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced download manager by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kget/
-IUSE=bittorrent gpg mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-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/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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kget-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=65a9736c7fb6338fffa8ca64b48123d3
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.2 b/metadata/md5-cache/kde-apps/kget-17.12.2
new file mode 100644
index 000000000000..8320d9348950
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-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/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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced download manager by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kget/
+IUSE=bittorrent gpg mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-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/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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kget-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=65a9736c7fb6338fffa8ca64b48123d3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
deleted file mode 100644
index f7858bc45b85..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgoldrunner-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.2 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.2
new file mode 100644
index 000000000000..7794118f1564
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kgoldrunner/ https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kgoldrunner-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.1 b/metadata/md5-cache/kde-apps/kgpg-17.12.1
deleted file mode 100644
index 299b2ccf4a11..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-17.12.1
+++ /dev/null
@@ -1,13 +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/kcodecs-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gpgme 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgpg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.2 b/metadata/md5-cache/kde-apps/kgpg-17.12.2
new file mode 100644
index 000000000000..910537230a30
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gpgme 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kgpg https://utils.kde.org/projects/kgpg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kgpg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.1 b/metadata/md5-cache/kde-apps/khangman-17.12.1
deleted file mode 100644
index ca1a48f13425..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classical hangman game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/khangman-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.2 b/metadata/md5-cache/kde-apps/khangman-17.12.2
new file mode 100644
index 000000000000..eb4e62be8fab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classical hangman game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/khangman https://edu.kde.org/khangman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.2:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/khangman-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.1 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
deleted file mode 100644
index 7c745f7f6df6..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The KDE Help Center
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/khelpcenter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.2 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.2
new file mode 100644
index 000000000000..5bd91e44f698
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.12.2
@@ -0,0 +1,13 @@
+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/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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The KDE Help Center
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KHelpCenter
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/khelpcenter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.12.1 b/metadata/md5-cache/kde-apps/kholidays-17.12.1
deleted file mode 100644
index 4ef8ce34a77d..000000000000
--- a/metadata/md5-cache/kde-apps/kholidays-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kholidays-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=887a19a07585116dd938068a964c095c
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
deleted file mode 100644
index 67828b14b68f..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for managing identitites
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kidentitymanagement-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.2
new file mode 100644
index 000000000000..1296d191424e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 >=kde-apps/kpimtextedit-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for managing identitites
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-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 >=kde-apps/kpimtextedit-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kidentitymanagement-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.1 b/metadata/md5-cache/kde-apps/kig-17.12.1
deleted file mode 100644
index 2121737fc389..000000000000
--- a/metadata/md5-cache/kde-apps/kig-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] >=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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
-IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] >=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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kig-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.2 b/metadata/md5-cache/kde-apps/kig-17.12.2
new file mode 100644
index 000000000000..8552636aa9aa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] >=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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kig https://edu.kde.org/kig
+IUSE=geogebra scripting python_targets_python2_7 debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)] >=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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.9.1:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kig-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.1 b/metadata/md5-cache/kde-apps/kigo-17.12.1
deleted file mode 100644
index 5a547f5c6bc0..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Go game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kigo/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kigo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.2 b/metadata/md5-cache/kde-apps/kigo-17.12.2
new file mode 100644
index 000000000000..d56f011232e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Go game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kigo/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kigo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.1 b/metadata/md5-cache/kde-apps/killbots-17.12.1
deleted file mode 100644
index 7f10d0eb83d5..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/killbots/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/killbots-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.2 b/metadata/md5-cache/kde-apps/killbots-17.12.2
new file mode 100644
index 000000000000..dc41c8fb4568
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/killbots/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/killbots-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
deleted file mode 100644
index 27080df3fdd1..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Generator of HTML image maps
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimagemapeditor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.2
new file mode 100644
index 000000000000..68cf49f848ce
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Generator of HTML image maps
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kimagemapeditor/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kimagemapeditor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.1 b/metadata/md5-cache/kde-apps/kimap-17.12.1
deleted file mode 100644
index b5a11386381d..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.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-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.2 b/metadata/md5-cache/kde-apps/kimap-17.12.2
new file mode 100644
index 000000000000..a7acb6e1dd51
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-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-apps/kmime-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.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-apps/kmime-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kimap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.1 b/metadata/md5-cache/kde-apps/kio-extras-17.12.1
deleted file mode 100644
index 893a704b45c0..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-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/kdnssd-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/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-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/kdnssd-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/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kio-extras-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=548b6de70c654ac17fd9d17f89322657
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.2 b/metadata/md5-cache/kde-apps/kio-extras-17.12.2
new file mode 100644
index 000000000000..5cce3cfba800
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-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/kdnssd-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/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities htmlthumbs +man mtp openexr phonon samba +sftp slp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-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/kdnssd-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/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 activities? ( >=kde-frameworks/kactivities-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) htmlthumbs? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] ) man? ( >=kde-frameworks/khtml-5.40.0:5 ) mtp? ( media-libs/libmtp:= ) openexr? ( media-libs/openexr ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) slp? ( net-libs/openslp ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kio-extras-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=548b6de70c654ac17fd9d17f89322657
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.1 b/metadata/md5-cache/kde-apps/kiriki-17.12.1
deleted file mode 100644
index a96666a7d5d9..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An addictive and fun dice game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiriki-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.2 b/metadata/md5-cache/kde-apps/kiriki-17.12.2
new file mode 100644
index 000000000000..d13e90048924
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An addictive and fun dice game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kiriki/ https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kiriki-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.1 b/metadata/md5-cache/kde-apps/kiten-17.12.1
deleted file mode 100644
index b873644fb1f7..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
-IUSE=debug +handbook
-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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiten-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.2 b/metadata/md5-cache/kde-apps/kiten-17.12.2
new file mode 100644
index 000000000000..f8dff01a3f7f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-17.12.2
@@ -0,0 +1,13 @@
+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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten
+IUSE=debug +handbook
+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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kiten-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
deleted file mode 100644
index 7406864502cd..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tactical one or two player game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kjumpingcube-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.2 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.2
new file mode 100644
index 000000000000..8d67182d463b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tactical one or two player game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kjumpingcube/ https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kjumpingcube-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.1 b/metadata/md5-cache/kde-apps/kldap-17.12.1
deleted file mode 100644
index d9d9be06b3b7..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kldap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.2 b/metadata/md5-cache/kde-apps/kldap-17.12.2
new file mode 100644
index 000000000000..e36c142a3e93
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-17.12.2
@@ -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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kldap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.1 b/metadata/md5-cache/kde-apps/kleopatra-17.12.1
deleted file mode 100644
index a38d68926dfe..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-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-apps/kmime-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-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-apps/kmime-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kleopatra-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.2 b/metadata/md5-cache/kde-apps/kleopatra-17.12.2
new file mode 100644
index 000000000000..bc69f4d93a99
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-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-apps/kmime-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-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-apps/kmime-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kleopatra-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5203a10deaadbee4f2f03fd4b89ecfb2
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.1 b/metadata/md5-cache/kde-apps/klettres-17.12.1
deleted file mode 100644
index 897be085b112..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Alphabet learning application
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/klettres-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.2 b/metadata/md5-cache/kde-apps/klettres-17.12.2
new file mode 100644
index 000000000000..a60d1565e401
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Alphabet learning application
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/klettres https://edu.kde.org/klettres
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/klettres-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.1 b/metadata/md5-cache/kde-apps/klickety-17.12.1
deleted file mode 100644
index f5ed79a0693e..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/klickety-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.2 b/metadata/md5-cache/kde-apps/klickety-17.12.2
new file mode 100644
index 000000000000..79c73d4d5f43
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A game almost the same as ksame, but a bit different by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/klickety-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.1 b/metadata/md5-cache/kde-apps/klines-17.12.1
deleted file mode 100644
index fb882b3bceca..000000000000
--- a/metadata/md5-cache/kde-apps/klines-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/klines-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.2 b/metadata/md5-cache/kde-apps/klines-17.12.2
new file mode 100644
index 000000000000..84a2bad30120
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/klines/ https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/klines-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.1 b/metadata/md5-cache/kde-apps/kmag-17.12.1
deleted file mode 100644
index 6f79f9694e41..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE screen magnifier
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmag-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.2 b/metadata/md5-cache/kde-apps/kmag-17.12.2
new file mode 100644
index 000000000000..7083df0d6244
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE screen magnifier
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmag/
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmag-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
deleted file mode 100644
index 9151954c212e..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A tile matching game for one or two players
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmahjongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.2 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.2
new file mode 100644
index 000000000000..9798d8abac98
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=kde-apps/libkmahjongg-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A tile matching game for one or two players
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmahjongg/ https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=kde-apps/libkmahjongg-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmahjongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.1-r1 b/metadata/md5-cache/kde-apps/kmail-17.12.1-r1
deleted file mode 100644
index 7ac696eb248c..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-17.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kldap-17.12.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-apps/kmail-account-wizard-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=dd72409b72c56cd7df5dec9596c3ca89
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.2 b/metadata/md5-cache/kde-apps/kmail-17.12.2
new file mode 100644
index 000000000000..4d83b1669560
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/libktnef-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kldap-17.12.2:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.2:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kmail/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-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/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/libktnef-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.2:5 >=kde-apps/kmail-account-wizard-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmail-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1ae430b3dae64f3dcc528bc125988c2f
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
deleted file mode 100644
index eb959e2810c6..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-account-wizard-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.2
new file mode 100644
index 000000000000..f3b5b46c9f19
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmail-account-wizard-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1
deleted file mode 100644
index a1c007dd9e3b..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmailtransport-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fb6c262b1b970b9845c8fc7adc9104bd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.2 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.2
new file mode 100644
index 000000000000..7197a66aa49e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/ksmtp-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mail transport service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/ksmtp-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmailtransport-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9a93aaa264a89b008a8d483cfc59e071
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.1 b/metadata/md5-cache/kde-apps/kmbox-17.12.1
deleted file mode 100644
index 25b4c205e279..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmbox-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.2 b/metadata/md5-cache/kde-apps/kmbox-17.12.2
new file mode 100644
index 000000000000..e508efb12f92
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-17.12.2:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmbox-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.1 b/metadata/md5-cache/kde-apps/kmime-17.12.1
deleted file mode 100644
index 6c12d8bbd415..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.2 b/metadata/md5-cache/kde-apps/kmime-17.12.2
new file mode 100644
index 000000000000..b0b9793db63e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.1 b/metadata/md5-cache/kde-apps/kmines-17.12.1
deleted file mode 100644
index 42d556110798..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Classic mine sweeper game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmines-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.2 b/metadata/md5-cache/kde-apps/kmines-17.12.2
new file mode 100644
index 000000000000..c5a0c5eeb2ca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Classic mine sweeper game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kmines/ https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmines-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.1 b/metadata/md5-cache/kde-apps/kmix-17.12.1
deleted file mode 100644
index e7f061b90155..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-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/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma mixer gui
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
-IUSE=alsa pulseaudio debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-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/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmix-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.2 b/metadata/md5-cache/kde-apps/kmix-17.12.2
new file mode 100644
index 000000000000..05551be4c998
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-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/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma mixer gui
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/multimedia/kmix/
+IUSE=alsa pulseaudio debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-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/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmix-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.1 b/metadata/md5-cache/kde-apps/kmousetool-17.12.1
deleted file mode 100644
index 85abe875cddb..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-libs/libXext x11-libs/libXt x11-proto/xproto 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmousetool-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bc810b85c89f63d3ad8945b7d0f4c513
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.2 b/metadata/md5-cache/kde-apps/kmousetool-17.12.2
new file mode 100644
index 000000000000..59009771903b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-libs/libXext x11-libs/libXt x11-proto/xproto 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmousetool/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmousetool-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=bc810b85c89f63d3ad8945b7d0f4c513
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.1 b/metadata/md5-cache/kde-apps/kmouth-17.12.1
deleted file mode 100644
index dd75941ee4be..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmouth-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.2 b/metadata/md5-cache/kde-apps/kmouth-17.12.2
new file mode 100644
index 000000000000..34b0cc3b7581
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kmouth/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmouth-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.1 b/metadata/md5-cache/kde-apps/kmplot-17.12.1
deleted file mode 100644
index cd061c2cde03..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mathematical function plotter
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmplot-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.2 b/metadata/md5-cache/kde-apps/kmplot-17.12.2
new file mode 100644
index 000000000000..3a946d080365
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mathematical function plotter
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kmplot-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.1 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
deleted file mode 100644
index 875a6f8ae1a0..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Battleship clone by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/knavalbattle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.2 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.2
new file mode 100644
index 000000000000..1e5ae15fd1e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.12.2
@@ -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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Battleship clone by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/navalbattle/ https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/knavalbattle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.1 b/metadata/md5-cache/kde-apps/knetwalk-17.12.1
deleted file mode 100644
index 553e85acd40d..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/knetwalk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.2 b/metadata/md5-cache/kde-apps/knetwalk-17.12.2
new file mode 100644
index 000000000000..848d92ebff1f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knetwalk/ https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/knetwalk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.1 b/metadata/md5-cache/kde-apps/knotes-17.12.1
deleted file mode 100644
index 7875e5691151..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-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/kparts-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Note taking application
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-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/kparts-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/knotes-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.2 b/metadata/md5-cache/kde-apps/knotes-17.12.2
new file mode 100644
index 000000000000..d7e1ac8d1919
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-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/kparts-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Note taking application
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-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/kparts-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/knotes-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.1 b/metadata/md5-cache/kde-apps/kolf-17.12.1
deleted file mode 100644
index e45c8ce01300..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Minigolf game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolf-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.2 b/metadata/md5-cache/kde-apps/kolf-17.12.2
new file mode 100644
index 000000000000..7a7392cfd731
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Minigolf game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kolf/ https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kolf-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.1 b/metadata/md5-cache/kde-apps/kollision-17.12.1
deleted file mode 100644
index ea0fb0129d1e..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple ball dodging game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kollision-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.2 b/metadata/md5-cache/kde-apps/kollision-17.12.2
new file mode 100644
index 000000000000..0ecc06d6e458
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple ball dodging game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kollision/ https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kollision-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.1 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
deleted file mode 100644
index 2feb29b8fcaf..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.1:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Paint Program by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolourpaint-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.2 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.2
new file mode 100644
index 000000000000..0e40adb4ba8b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.2:5 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Paint Program by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kolourpaint/
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kolourpaint-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.1 b/metadata/md5-cache/kde-apps/kompare-17.12.1
deleted file mode 100644
index afb171710b44..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A program to view the differences between files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kompare-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.2 b/metadata/md5-cache/kde-apps/kompare-17.12.2
new file mode 100644
index 000000000000..3d692e24b4a5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-17.12.2
@@ -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/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A program to view the differences between files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/kompare http://www.caffeinated.me.uk/kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kompare-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.1 b/metadata/md5-cache/kde-apps/konqueror-17.12.1
deleted file mode 100644
index 846033abb863..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-17.12.1
+++ /dev/null
@@ -1,14 +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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) activities? ( >=kde-frameworks/kactivities-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
-IUSE=activities speech tidy X test debug +handbook 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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=kde-apps/kfind-17.12.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/konqueror-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3bf841515709ddd381afb8bd0135d204
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.2 b/metadata/md5-cache/kde-apps/konqueror-17.12.2
new file mode 100644
index 000000000000..f18ff6a7d936
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-17.12.2
@@ -0,0 +1,14 @@
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) activities? ( >=kde-frameworks/kactivities-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/konqueror/ https://konqueror.org/
+IUSE=activities speech tidy X test debug +handbook 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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tidy? ( app-text/htmltidy ) X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=kde-apps/kfind-17.12.2:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/konqueror-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3bf841515709ddd381afb8bd0135d204
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.1 b/metadata/md5-cache/kde-apps/konquest-17.12.1
deleted file mode 100644
index 6f73a21cb1b8..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/konquest-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.2 b/metadata/md5-cache/kde-apps/konquest-17.12.2
new file mode 100644
index 000000000000..8c93696597ef
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/konquest/ https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/konquest-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.1-r1 b/metadata/md5-cache/kde-apps/konsole-17.12.1-r1
deleted file mode 100644
index 769035fa5696..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-17.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kpty-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE's terminal emulator
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kpty-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/konsole-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=35f5c3868d72db8a6e71a4680094127b
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.2 b/metadata/md5-cache/kde-apps/konsole-17.12.2
new file mode 100644
index 000000000000..fa09f6c149fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kpty-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE's terminal emulator
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-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/kpty-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/konsole-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2babb6ce386018344757ba7f74899618
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
deleted file mode 100644
index 6931bf5e864d..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.2 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.2
new file mode 100644
index 000000000000..8e779e895a48
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.1 b/metadata/md5-cache/kde-apps/kontact-17.12.1
deleted file mode 100644
index 12b87d311320..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kcrash-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontact-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.2 b/metadata/md5-cache/kde-apps/kontact-17.12.2
new file mode 100644
index 000000000000..1c4ed1e35bfd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/kcrash-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kontact-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.1 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
deleted file mode 100644
index bf23293890b4..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontactinterface-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.2 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.2
new file mode 100644
index 000000000000..9b7d4a827fc1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kontactinterface-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029 b/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029
deleted file mode 100644
index 9a842e2cb320..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/libkleo-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.40.0:5 >=kde-apps/kidentitymanagement-17.08.3:5 ) x11-proto/scrnsaverproto 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 ) 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=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/libkleo-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.40.0:5 >=kde-apps/kidentitymanagement-17.08.3:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=https://github.com/KDE/kopete/archive/d7dbacb483124d5d6a8ad30586ec126c8514a715.tar.gz -> kopete-17.08.3_p20171029.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3666437bf7aea8e38257468c0d8238e
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.1 b/metadata/md5-cache/kde-apps/korganizer-17.12.1
deleted file mode 100644
index 089c4c8b1f2b..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-apps/kldap-17.12.1:5 >=dev-qt/designer-5.9.1:5 test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/korganizer/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/korganizer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5e0d5d1f582fc64deb8a95bb83763425
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.2 b/metadata/md5-cache/kde-apps/korganizer-17.12.2
new file mode 100644
index 000000000000..15f21f4f573a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kholidays-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) >=kde-apps/kldap-17.12.2:5 >=dev-qt/designer-5.9.1:5 test? ( >=kde-apps/akonadi-17.12.2:5[sqlite,tools] ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/korganizer/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kholidays-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/kparts-5.40.0:5 >=kde-frameworks/kservice-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-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-calendar-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/akonadi-notes-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/eventviews-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kontactinterface-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/korganizer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7ffe3b147734d6dc51ca296778c8ba5e
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.1 b/metadata/md5-cache/kde-apps/kpat-17.12.1
deleted file mode 100644
index 1da2a2efe6c8..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE patience game
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpat-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.2 b/metadata/md5-cache/kde-apps/kpat-17.12.2
new file mode 100644
index 000000000000..e3e44fe8e3ac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE patience game
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kpat-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
deleted file mode 100644
index ad26e77fb28d..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kemoticons-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.40.0: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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=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/kemoticons-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpimtextedit-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.2 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.2
new file mode 100644
index 000000000000..6c775a72b88f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kemoticons-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) test? ( >=kde-frameworks/ktextwidgets-5.40.0: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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=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/kemoticons-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/grantlee:5 speech? ( >=dev-qt/qtspeech-5.9.1:5 ) !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kpimtextedit-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
deleted file mode 100644
index 53c0b59cd111..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kqtquickcharts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.2
new file mode 100644
index 000000000000..3824f14d0463
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kqtquickcharts-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.1 b/metadata/md5-cache/kde-apps/krdc-17.12.1
deleted file mode 100644
index 9f2fddd683f6..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-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/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-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/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/krdc/
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-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/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-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/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/krdc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.2 b/metadata/md5-cache/kde-apps/krdc-17.12.2
new file mode 100644
index 000000000000..e037a79ac810
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-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/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-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/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/krdc/
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-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/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-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/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/krdc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.1 b/metadata/md5-cache/kde-apps/kreversi-17.12.1
deleted file mode 100644
index 3442bb04fe87..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Board game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kreversi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.2 b/metadata/md5-cache/kde-apps/kreversi-17.12.2
new file mode 100644
index 000000000000..99279ab94102
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Board game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kreversi/ https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kreversi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.1 b/metadata/md5-cache/kde-apps/krfb-17.12.1
deleted file mode 100644
index c3944b95c24d..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/krfb/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/krfb-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.2 b/metadata/md5-cache/kde-apps/krfb-17.12.2
new file mode 100644
index 000000000000..3306c77f76da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/krfb/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/krfb-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1
deleted file mode 100644
index 1f4d901a80ee..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kross-interpreters-17.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c92157cfe30e039372b41236ed7fd1a6
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.2 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.2
new file mode 100644
index 000000000000..0773e16d69ae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+python ruby debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 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(+)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kross-interpreters-17.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c92157cfe30e039372b41236ed7fd1a6
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.1 b/metadata/md5-cache/kde-apps/kruler-17.12.1
deleted file mode 100644
index e90cff578056..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/knotifications-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen ruler for Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=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/knotifications-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kruler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.2 b/metadata/md5-cache/kde-apps/kruler-17.12.2
new file mode 100644
index 000000000000..86a7a165c1a4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/knotifications-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen ruler for Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/kruler/
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=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/knotifications-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kruler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.1 b/metadata/md5-cache/kde-apps/kshisen-17.12.1
deleted file mode 100644
index 21212603b98a..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE game similiar to Mahjongg
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kshisen-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.2 b/metadata/md5-cache/kde-apps/kshisen-17.12.2
new file mode 100644
index 000000000000..c8f3b589586a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=kde-apps/libkmahjongg-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE game similiar to Mahjongg
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kshisen/ https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=kde-apps/libkmahjongg-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kshisen-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.1 b/metadata/md5-cache/kde-apps/ksirk-17.12.1
deleted file mode 100644
index 8f6c3729c527..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-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/knewstuff-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Port of the board game risk
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-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/kcrash-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/knewstuff-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 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksirk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7d587c4d35a7ed0315be6ea7b6c66785
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.2 b/metadata/md5-cache/kde-apps/ksirk-17.12.2
new file mode 100644
index 000000000000..f659fb32c03d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-17.12.2
@@ -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/kcrash-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/knewstuff-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Port of the board game risk
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksirk/ https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+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/kcrash-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/knewstuff-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 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksirk-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7d587c4d35a7ed0315be6ea7b6c66785
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.1 b/metadata/md5-cache/kde-apps/ksmtp-17.12.1
deleted file mode 100644
index 9bf085461e89..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksmtp-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.2 b/metadata/md5-cache/kde-apps/ksmtp-17.12.2
new file mode 100644
index 000000000000..9f1eba335816
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl 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 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.2:5 >=dev-qt/qtnetwork-5.9.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksmtp-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
deleted file mode 100644
index 9e8fddb91b5d..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Tron game
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksnakeduel-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.2 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.2
new file mode 100644
index 000000000000..b2f181105974
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Tron game
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksnakeduel/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksnakeduel-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.1 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
deleted file mode 100644
index 5a2621c3991c..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Space Game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kspaceduel-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.2 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.2
new file mode 100644
index 000000000000..15404ebccb71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Space Game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kspaceduel/ https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kspaceduel-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.1 b/metadata/md5-cache/kde-apps/ksquares-17.12.1
deleted file mode 100644
index 438d89cd20a0..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE clone of the game squares
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksquares-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.2 b/metadata/md5-cache/kde-apps/ksquares-17.12.2
new file mode 100644
index 000000000000..e0a5a303d8f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE clone of the game squares
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksquares/ https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksquares-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.1 b/metadata/md5-cache/kde-apps/ksudoku-17.12.1
deleted file mode 100644
index d4c1137108c9..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-17.12.1
+++ /dev/null
@@ -1,13 +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/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksudoku-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.2 b/metadata/md5-cache/kde-apps/ksudoku-17.12.2
new file mode 100644
index 000000000000..a75e23e269bd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ksudoku/ https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksudoku-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.1 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
deleted file mode 100644
index 8ff889f0ac46..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
+++ /dev/null
@@ -1,14 +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/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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System log viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
-IUSE=systemd 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/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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksystemlog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.2 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.2
new file mode 100644
index 000000000000..a65ba9e00443
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.12.2
@@ -0,0 +1,14 @@
+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/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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System log viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/ksystemlog/
+IUSE=systemd 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/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/kservice-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.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ksystemlog-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.1 b/metadata/md5-cache/kde-apps/kteatime-17.12.1
deleted file mode 100644
index ec83fd46b0a7..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kteatime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.2 b/metadata/md5-cache/kde-apps/kteatime-17.12.2
new file mode 100644
index 000000000000..f227132dabd9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kteatime-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.1 b/metadata/md5-cache/kde-apps/ktimer-17.12.1
deleted file mode 100644
index d79eb3b7b580..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Timer
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktimer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.2 b/metadata/md5-cache/kde-apps/ktimer-17.12.2
new file mode 100644
index 000000000000..289c8b82ad95
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Timer
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/ktimer https://utils.kde.org/projects/ktimer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktimer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.1 b/metadata/md5-cache/kde-apps/ktouch-17.12.1
deleted file mode 100644
index 82e4b2b07499..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/ktouch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktouch-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.2 b/metadata/md5-cache/kde-apps/ktouch-17.12.2
new file mode 100644
index 000000000000..6a64e30865de
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/ktouch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-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/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktouch-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
deleted file mode 100644
index 3abd8cb1aeb5..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 net-libs/libaccounts-glib 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=experimental debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.2
new file mode 100644
index 000000000000..d76c0f5d2d35
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 net-libs/libaccounts-glib 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=experimental debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.2:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-accounts-kcm-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.1 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
deleted file mode 100644
index 02af6404d324..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-approver-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.2 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.2
new file mode 100644
index 000000000000..d995a5262087
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-approver-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
deleted file mode 100644
index 6b0bf3cbcda9..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-auth-handler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1cd0a3041d5b9cc30f75ec1228fa54ae
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.2
new file mode 100644
index 000000000000..6be0957a3a1e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.2:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-auth-handler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1cd0a3041d5b9cc30f75ec1228fa54ae
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
deleted file mode 100644
index c90c5bd168de..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy audio/video conferencing ui
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-call-ui-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.2
new file mode 100644
index 000000000000..db80af7a54a2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy audio/video conferencing ui
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-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/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-call-ui-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
deleted file mode 100644
index e10ca088ecf8..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/kiconthemes-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/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy common library
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-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/kiconthemes-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/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-common-internals-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.2
new file mode 100644
index 000000000000..a78ab00c3972
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/kiconthemes-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/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtnetwork-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy common library
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-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/kiconthemes-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/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-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/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-common-internals-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
deleted file mode 100644
index 91967385563b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact list
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-list-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.2
new file mode 100644
index 000000000000..d1dc974ed771
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.2
@@ -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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact list
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-contact-list-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
deleted file mode 100644
index 0a9f68cbb9f1..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-runner-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.2
new file mode 100644
index 000000000000..e410688c254f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-contact-runner-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
deleted file mode 100644
index df6564eebabd..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.2
new file mode 100644
index 000000000000..bd34c9c687a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/ki18n-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-desktop-applets-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
deleted file mode 100644
index 670c890aa33d..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-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-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.2
new file mode 100644
index 000000000000..f5cc509e2316
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-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-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-filetransfer-handler-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
deleted file mode 100644
index 9a998adcc5ff..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=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/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-kded-module-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.2
new file mode 100644
index 000000000000..d7abebe9cb5a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=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/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-kded-module-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
deleted file mode 100644
index 8f4ffcca186a..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-apps/ktp-filetransfer-handler-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-send-file-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.2 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.2
new file mode 100644
index 000000000000..f5cacb4dc7f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.40.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-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/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.2:5 >=kde-apps/ktp-filetransfer-handler-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-send-file-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
deleted file mode 100644
index cb6efef439e0..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
+++ /dev/null
@@ -1,13 +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/kcmutils-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/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.1:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=6
-HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
-IUSE=speech debug
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-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/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.1:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-text-ui-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.2
new file mode 100644
index 000000000000..0e1d4545846f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-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/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.2:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=6
+HOMEPAGE=https://community.kde.org/Real-Time_Communication_and_Collaboration
+IUSE=speech debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-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/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-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/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-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-apps/ktp-common-internals-17.12.2:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktp-text-ui-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.1 b/metadata/md5-cache/kde-apps/ktuberling-17.12.1
deleted file mode 100644
index 9d9d8507cf55..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Potato game for kids by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktuberling-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.2 b/metadata/md5-cache/kde-apps/ktuberling-17.12.2
new file mode 100644
index 000000000000..216d11fdeba1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Potato game for kids by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/ktuberling/ https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktuberling-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.1 b/metadata/md5-cache/kde-apps/kturtle-17.12.1
deleted file mode 100644
index e038d9ef758e..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kturtle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.2 b/metadata/md5-cache/kde-apps/kturtle-17.12.2
new file mode 100644
index 000000000000..83704c6a6c73
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kturtle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.1 b/metadata/md5-cache/kde-apps/kubrick-17.12.1
deleted file mode 100644
index 238200fdf0db..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/kubrick/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kubrick-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.2 b/metadata/md5-cache/kde-apps/kubrick-17.12.2
new file mode 100644
index 000000000000..43949d846c1f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/kubrick/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kubrick-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
deleted file mode 100644
index e2de7eb465eb..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
+++ /dev/null
@@ -1,13 +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/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Wallet management tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwalletmanager-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.2 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.2
new file mode 100644
index 000000000000..4d906b34fe2e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Wallet management tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-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/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kwalletmanager-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.1 b/metadata/md5-cache/kde-apps/kwave-17.12.1
deleted file mode 100644
index 019aa6e38f6e..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-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/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=6
-HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-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/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwave-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.2 b/metadata/md5-cache/kde-apps/kwave-17.12.2
new file mode 100644
index 000000000000..e2c633a28087
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-17.12.2
@@ -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/kcrash-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/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-17.12.2:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=6
+HOMEPAGE=http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.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/kcrash-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/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kwave-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.1 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
deleted file mode 100644
index c7e47e1f047d..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-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/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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A powerful flashcard and vocabulary learning program
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-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/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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwordquiz-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.2 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.2
new file mode 100644
index 000000000000..775ebe8fee7e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-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/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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A powerful flashcard and vocabulary learning program
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-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/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/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kwordquiz-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.1 b/metadata/md5-cache/kde-apps/kwrite-17.12.1
deleted file mode 100644
index fdd137fc7e60..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE simple text editor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.2 b/metadata/md5-cache/kde-apps/kwrite-17.12.2
new file mode 100644
index 000000000000..55611050c141
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE simple text editor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/kwrite
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kate-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.1 b/metadata/md5-cache/kde-apps/libgravatar-17.12.1
deleted file mode 100644
index 9a22a0deea47..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for gravatar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.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-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libgravatar-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.2 b/metadata/md5-cache/kde-apps/libgravatar-17.12.2
new file mode 100644
index 000000000000..79d489b4a257
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for gravatar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.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-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libgravatar-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.1 b/metadata/md5-cache/kde-apps/libkcddb-17.12.1
deleted file mode 100644
index 093a6d09a1a1..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library for CDDB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcddb-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.2 b/metadata/md5-cache/kde-apps/libkcddb-17.12.2
new file mode 100644
index 000000000000..56c16bdd7e28
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library for CDDB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkcddb-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
deleted file mode 100644
index 6446dde1a412..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcompactdisc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.2
new file mode 100644
index 000000000000..b74ff1792b91
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkcompactdisc-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.1 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
deleted file mode 100644
index f0cfc3cd3994..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdcraw-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.2 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.2
new file mode 100644
index 000000000000..a62a3245f268
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkdcraw-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.1 b/metadata/md5-cache/kde-apps/libkdegames-17.12.1
deleted file mode 100644
index 6baf919086aa..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Base library common to many KDE games
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdegames-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.2 b/metadata/md5-cache/kde-apps/libkdegames-17.12.2
new file mode 100644
index 000000000000..68a39a5ed9b0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.12.2
@@ -0,0 +1,13 @@
+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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Base library common to many KDE games
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=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/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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkdegames-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.1 b/metadata/md5-cache/kde-apps/libkdepim-17.12.1
deleted file mode 100644
index ec32f1f8e2c9..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdepim-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.2 b/metadata/md5-cache/kde-apps/libkdepim-17.12.2
new file mode 100644
index 000000000000..712f1411630f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/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/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/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-search-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkdepim-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
deleted file mode 100644
index 91f9920738ef..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
+++ /dev/null
@@ -1,13 +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/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkeduvocdocument-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.2
new file mode 100644
index 000000000000..ac4ff2a2ecfc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkeduvocdocument-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.1 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
deleted file mode 100644
index fb58844a1d50..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkexiv2-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.2 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.2
new file mode 100644
index 000000000000..960477fd6bab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Image Plugin Interface: an exiv2 library wrapper
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkexiv2-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.1-r1 b/metadata/md5-cache/kde-apps/libkgapi-17.12.1-r1
deleted file mode 100644
index 87599c8213ed..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-17.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/libkgapi.git
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgapi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7937ee2880c92759dce23dee10929761
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.2 b/metadata/md5-cache/kde-apps/libkgapi-17.12.2
new file mode 100644
index 000000000000..9eba1e4b465e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/libkgapi.git
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkgapi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.1 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
deleted file mode 100644
index be42eccb5554..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-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-apps/marble-17.12.1:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=6
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-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-apps/marble-17.12.1:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgeomap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.2 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.2
new file mode 100644
index 000000000000..029a6768aa06
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-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-apps/marble-17.12.2:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=6
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-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-apps/marble-17.12.2:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkgeomap-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.1 b/metadata/md5-cache/kde-apps/libkipi-17.12.1
deleted file mode 100644
index 5412c2cfb4da..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkipi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.2 b/metadata/md5-cache/kde-apps/libkipi-17.12.2
new file mode 100644
index 000000000000..6d8e7055c730
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkipi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.1 b/metadata/md5-cache/kde-apps/libkleo-17.12.1
deleted file mode 100644
index 0c87d9b688fc..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for encryption handling
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkleo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.2 b/metadata/md5-cache/kde-apps/libkleo-17.12.2
new file mode 100644
index 000000000000..c3444914f9d9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for encryption handling
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkleo-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
deleted file mode 100644
index 73a259585da6..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkmahjongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.2 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.2
new file mode 100644
index 000000000000..5d3e10abcee6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.2
@@ -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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+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/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkmahjongg-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
deleted file mode 100644
index 102760a452bd..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE library to compare files and strings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkomparediff2-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.2 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.2
new file mode 100644
index 000000000000..0985917d04be
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE library to compare files and strings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-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/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libkomparediff2-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.1 b/metadata/md5-cache/kde-apps/libksane-17.12.1
deleted file mode 100644
index 8ff75f226915..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksane-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c6e6c58cb19f02f56b03eeac0b7f6693
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.2 b/metadata/md5-cache/kde-apps/libksane-17.12.2
new file mode 100644
index 000000000000..e1fc99b24ac4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libksane-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c6e6c58cb19f02f56b03eeac0b7f6693
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.1 b/metadata/md5-cache/kde-apps/libksieve-17.12.1
deleted file mode 100644
index 772f6e72e2b3..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-17.12.1
+++ /dev/null
@@ -1,14 +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/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/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-17.12.1:5 >=kde-apps/kmailtransport-17.12.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksieve-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.2 b/metadata/md5-cache/kde-apps/libksieve-17.12.2
new file mode 100644
index 000000000000..46ebaea1495e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-17.12.2
@@ -0,0 +1,14 @@
+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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+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/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-frameworks/syntax-highlighting-5.40.0:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/libksieve-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.1 b/metadata/md5-cache/kde-apps/libktnef-17.12.1
deleted file mode 100644
index e5c4d815b9eb..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for handling TNEF data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktnef-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.2 b/metadata/md5-cache/kde-apps/libktnef-17.12.2
new file mode 100644
index 000000000000..6e3b96ad8aec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for handling TNEF data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcalutils-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/ktnef-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.1 b/metadata/md5-cache/kde-apps/lokalize-17.12.1
deleted file mode 100644
index c602d22878b1..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
-IUSE=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 debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/lokalize-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c620f02ee70224779b40da303cb5febe
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.2 b/metadata/md5-cache/kde-apps/lokalize-17.12.2
new file mode 100644
index 000000000000..4996a15adc22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/lokalize http://l10n.kde.org/tools
+IUSE=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 debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=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(+)?] >=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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[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(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/lokalize-17.12.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c620f02ee70224779b40da303cb5febe
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.1 b/metadata/md5-cache/kde-apps/lskat-17.12.1
deleted file mode 100644
index 269c6c6b1824..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Skat game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/lskat-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.2 b/metadata/md5-cache/kde-apps/lskat-17.12.2
new file mode 100644
index 000000000000..6a6974d6a017
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Skat game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/lskat/ https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/lskat-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.1 b/metadata/md5-cache/kde-apps/mailcommon-17.12.1
deleted file mode 100644
index 8cd0fbd1a866..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-17.12.1
+++ /dev/null
@@ -1,14 +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/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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt 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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common mail library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailcommon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.2 b/metadata/md5-cache/kde-apps/mailcommon-17.12.2
new file mode 100644
index 000000000000..2621f52e7e97
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt 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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common mail library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=kde-apps/messagelib-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/mailcommon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.1 b/metadata/md5-cache/kde-apps/mailimporter-17.12.1
deleted file mode 100644
index 7690de3143b1..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-17.12.1
+++ /dev/null
@@ -1,13 +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/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to import mail from various sources
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailimporter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.2 b/metadata/md5-cache/kde-apps/mailimporter-17.12.2
new file mode 100644
index 000000000000..59d97216fa6b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to import mail from various sources
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/mailimporter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.1 b/metadata/md5-cache/kde-apps/marble-17.12.1
deleted file mode 100644
index 80c746f8fdc1..000000000000
--- a/metadata/md5-cache/kde-apps/marble-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=6
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5/17.12
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/marble-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.2 b/metadata/md5-cache/kde-apps/marble-17.12.2
new file mode 100644
index 000000000000..fe54221645b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=6
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 aprs? ( >=dev-qt/qtserialport-5.9.1:5 ) dbus? ( >=dev-qt/qtdbus-5.9.1:5 ) designer? ( >=dev-qt/designer-5.9.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5/17.12
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/marble-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.1 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
deleted file mode 100644
index 077364f2db29..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/mbox-importer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.2 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.2
new file mode 100644
index 000000000000..89e894ef2b41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/mailimporter-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/mbox-importer-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.1 b/metadata/md5-cache/kde-apps/messagelib-17.12.1
deleted file mode 100644
index fd2c035eacbf..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-17.12.1
+++ /dev/null
@@ -1,14 +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/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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Libraries for messaging functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmbox-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/messagelib-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.2 b/metadata/md5-cache/kde-apps/messagelib-17.12.2
new file mode 100644
index 000000000000..ad650f408814
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmbox-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Libraries for messaging functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.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/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/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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/syntax-highlighting-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/grantleetheme-17.12.2:5 >=kde-apps/incidenceeditor-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kdepim-apps-libs-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kldap-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmbox-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libgravatar-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/libkleo-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0:5 !<kde-apps/kdepim-addons-16.08.50:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !=kde-apps/kmail-4.4*:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/messagelib-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.1 b/metadata/md5-cache/kde-apps/minuet-17.12.1
deleted file mode 100644
index 10eb5f4b34a1..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth virtual/pkgconfig 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A KDE Software for Music Education
-EAPI=6
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/minuet-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.2 b/metadata/md5-cache/kde-apps/minuet-17.12.2
new file mode 100644
index 000000000000..da22fe5639aa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth virtual/pkgconfig 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A KDE Software for Music Education
+EAPI=6
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/minuet-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okteta-17.12.1 b/metadata/md5-cache/kde-apps/okteta-17.12.1
deleted file mode 100644
index 91857f2ed992..000000000000
--- a/metadata/md5-cache/kde-apps/okteta-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE hexeditor
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
-IUSE=crypt designer test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/okteta-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ce52bb1e3e841e0ae3ede6aa8dc36327
diff --git a/metadata/md5-cache/kde-apps/okteta-17.12.2 b/metadata/md5-cache/kde-apps/okteta-17.12.2
new file mode 100644
index 000000000000..22830a847030
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okteta-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE hexeditor
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/okteta-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ce52bb1e3e841e0ae3ede6aa8dc36327
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.1 b/metadata/md5-cache/kde-apps/okular-17.12.1
deleted file mode 100644
index 6b012d49f4c2..000000000000
--- a/metadata/md5-cache/kde-apps/okular-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.1:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( kde-frameworks/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.1:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( kde-frameworks/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.40.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/okular-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d61ab9a2a2eb16032ed0239ca584da3a
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.2 b/metadata/md5-cache/kde-apps/okular-17.12.2
new file mode 100644
index 000000000000..3fa2559f3b19
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.2:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.2:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-1.2.1:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) 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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://okular.kde.org https://www.kde.org/applications/graphics/okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-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/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.2:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.2:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-1.2.1:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.40.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/okular-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ab3b3e2b325c4749c2d17d0f120e8bcc
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.1 b/metadata/md5-cache/kde-apps/palapeli-17.12.1
deleted file mode 100644
index 335367706357..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/palapeli/
-IUSE=debug +handbook
-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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/palapeli-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.2 b/metadata/md5-cache/kde-apps/palapeli-17.12.2
new file mode 100644
index 000000000000..8012be3e312e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-17.12.2
@@ -0,0 +1,13 @@
+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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/palapeli/
+IUSE=debug +handbook
+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/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/palapeli-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.1 b/metadata/md5-cache/kde-apps/parley-17.12.1
deleted file mode 100644
index 6abd1347e937..000000000000
--- a/metadata/md5-cache/kde-apps/parley-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-17.12.1:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-apps/libkeduvocdocument-17.12.1:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/parley-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.2 b/metadata/md5-cache/kde-apps/parley-17.12.2
new file mode 100644
index 000000000000..7d4b871d55a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-17.12.2:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt 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.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/parley https://edu.kde.org/applications/school/parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-apps/libkeduvocdocument-17.12.2:5 >=kde-frameworks/kcmutils-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/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-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 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/parley-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.1 b/metadata/md5-cache/kde-apps/picmi-17.12.1
deleted file mode 100644
index d5cf905b5e69..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=6
-HOMEPAGE=https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/picmi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.2 b/metadata/md5-cache/kde-apps/picmi-17.12.2
new file mode 100644
index 000000000000..31e758d704f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=6
+HOMEPAGE=https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.2:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/picmi-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
deleted file mode 100644
index 7f3cd3a0d3c0..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
+++ /dev/null
@@ -1,13 +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/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-data-exporter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3834b8b38f9cbe92cdf69b6f1913dc48
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.2
new file mode 100644
index 000000000000..08b67bfdac83
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kidentitymanagement-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/kmime-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=kde-apps/mailcommon-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/pim-data-exporter-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3834b8b38f9cbe92cdf69b6f1913dc48
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
deleted file mode 100644
index dd5360d1a288..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-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/kcrash-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-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/kcrash-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-sieve-editor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.2
new file mode 100644
index 000000000000..2188b5cd697d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-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/kcrash-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-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/kcrash-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/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/akonadi-mime-17.12.2:5 >=kde-apps/calendarsupport-17.12.2:5 >=kde-apps/kcalcore-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kmailtransport-17.12.2:5 >=kde-apps/libksieve-17.12.2:5 >=kde-apps/pimcommon-17.12.2:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/pim-sieve-editor-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.1 b/metadata/md5-cache/kde-apps/pimcommon-17.12.1
deleted file mode 100644
index 9b0fb1a17460..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.40.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-17.12.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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/pimcommon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.2 b/metadata/md5-cache/kde-apps/pimcommon-17.12.2
new file mode 100644
index 000000000000..e99a1dafb288
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kiconthemes-5.40.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-17.12.2: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 designer? ( >=kde-frameworks/kdesignerplugin-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.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/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.2:5 >=kde-apps/akonadi-contacts-17.12.2:5 >=kde-apps/kcontacts-17.12.2:5 >=kde-apps/kimap-17.12.2:5 >=kde-apps/kpimtextedit-17.12.2:5 >=kde-apps/libkdepim-17.12.2:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/pimcommon-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=ca596193de7d85f965eb6c36048be753
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
deleted file mode 100644
index f28eba3ab5d8..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=6
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
-RDEPEND=>=kde-apps/ktp-accounts-kcm-17.12.1 >=kde-apps/ktp-approver-17.12.1 >=kde-apps/ktp-auth-handler-17.12.1 >=kde-apps/ktp-common-internals-17.12.1 >=kde-apps/ktp-contact-list-17.12.1 >=kde-apps/ktp-contact-runner-17.12.1 >=kde-apps/ktp-desktop-applets-17.12.1 >=kde-apps/ktp-filetransfer-handler-17.12.1 >=kde-apps/ktp-kded-module-17.12.1 >=kde-apps/ktp-send-file-17.12.1 >=kde-apps/ktp-text-ui-17.12.1 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.1 ) !kde-apps/plasma-telepathy-meta:4
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.2
new file mode 100644
index 000000000000..f6f481f9b412
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=6
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
+RDEPEND=>=kde-apps/ktp-accounts-kcm-17.12.2 >=kde-apps/ktp-approver-17.12.2 >=kde-apps/ktp-auth-handler-17.12.2 >=kde-apps/ktp-common-internals-17.12.2 >=kde-apps/ktp-contact-list-17.12.2 >=kde-apps/ktp-contact-runner-17.12.2 >=kde-apps/ktp-desktop-applets-17.12.2 >=kde-apps/ktp-filetransfer-handler-17.12.2 >=kde-apps/ktp-kded-module-17.12.2 >=kde-apps/ktp-send-file-17.12.2 >=kde-apps/ktp-text-ui-17.12.2 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.2 ) !kde-apps/plasma-telepathy-meta:4
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.1 b/metadata/md5-cache/kde-apps/poxml-17.12.1
deleted file mode 100644
index 6b294d129a98..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/poxml-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.2 b/metadata/md5-cache/kde-apps/poxml-17.12.2
new file mode 100644
index 000000000000..3fc49d26cf18
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/poxml-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.1 b/metadata/md5-cache/kde-apps/print-manager-17.12.1
deleted file mode 100644
index a3ebaa076833..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/print-manager-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.2 b/metadata/md5-cache/kde-apps/print-manager-17.12.2
new file mode 100644
index 000000000000..a99006391393
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-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/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/print-manager-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.1 b/metadata/md5-cache/kde-apps/rocs-17.12.1
deleted file mode 100644
index 846fa3377ba7..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-17.12.1
+++ /dev/null
@@ -1,14 +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/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-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/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-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/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/rocs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.2 b/metadata/md5-cache/kde-apps/rocs-17.12.2
new file mode 100644
index 000000000000..bc91ba33ccc7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-17.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-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/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 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 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/rocs https://edu.kde.org/applications/mathematics/rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-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/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/rocs-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
deleted file mode 100644
index 8d285e9e3ae5..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet extension for signond
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.2
new file mode 100644
index 000000000000..b423e6d43fda
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond 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 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet extension for signond
+EAPI=6
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/signon-kwallet-extension-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.1 b/metadata/md5-cache/kde-apps/spectacle-17.12.1
deleted file mode 100644
index ba09cdcfeff8..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.1:5= ) share? ( kde-frameworks/purpose:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screenshot capture utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=kipi share debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=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/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.1:5= ) share? ( kde-frameworks/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/spectacle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=a58dd3d7d8c237f95e1aae6feff73998
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.2 b/metadata/md5-cache/kde-apps/spectacle-17.12.2
new file mode 100644
index 000000000000..b6574f44796e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.2:5= ) share? ( >=kde-frameworks/purpose-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screenshot capture utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=kipi share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=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/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-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 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.2:5= ) share? ( >=kde-frameworks/purpose-5.40.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/spectacle-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=11ecff6534c5e15b7f408d050ad7694c
diff --git a/metadata/md5-cache/kde-apps/step-17.12.1 b/metadata/md5-cache/kde-apps/step-17.12.1
deleted file mode 100644
index e10ba08acb33..000000000000
--- a/metadata/md5-cache/kde-apps/step-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Interactive physics simulator
-EAPI=6
-HOMEPAGE=https://edu.kde.org/step
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~x86
-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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/step-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e39a220c3b8e0421d9f1ac4eeffce482
diff --git a/metadata/md5-cache/kde-apps/step-17.12.2 b/metadata/md5-cache/kde-apps/step-17.12.2
new file mode 100644
index 000000000000..49dc2fe5a3d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-17.12.2
@@ -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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) nls? ( >=dev-qt/linguist-tools-5.9.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Interactive physics simulator
+EAPI=6
+HOMEPAGE=https://edu.kde.org/step
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~x86
+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/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-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/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-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/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/step-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=e39a220c3b8e0421d9f1ac4eeffce482
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.1 b/metadata/md5-cache/kde-apps/svgpart-17.12.1
deleted file mode 100644
index 3cf648b1da4e..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/svgpart-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.2 b/metadata/md5-cache/kde-apps/svgpart-17.12.2
new file mode 100644
index 000000000000..784b01b0ee1d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/svgpart-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.1 b/metadata/md5-cache/kde-apps/sweeper-17.12.1
deleted file mode 100644
index 9b9efdcf2753..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/sweeper-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.2 b/metadata/md5-cache/kde-apps/sweeper-17.12.2
new file mode 100644
index 000000000000..bd21cda8a525
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/sweeper https://utils.kde.org/projects/sweeper
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-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/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/sweeper-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.1 b/metadata/md5-cache/kde-apps/syndication-17.12.1
deleted file mode 100644
index 2fe555e955e4..000000000000
--- a/metadata/md5-cache/kde-apps/syndication-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/syndication-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.2 b/metadata/md5-cache/kde-apps/syndication-17.12.2
new file mode 100644
index 000000000000..19798b324685
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/syndication-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/syndication-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
deleted file mode 100644
index c9b6880b7435..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.1:5 >=kde-apps/libkexiv2-17.12.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.1:5 >=kde-apps/libkexiv2-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.2 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.2
new file mode 100644
index 000000000000..fad1d3c6fd2c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.2:5 >=kde-apps/libkexiv2-17.12.2:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.2:5 >=kde-apps/libkexiv2-17.12.2:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/kdegraphics-thumbnailers-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.1 b/metadata/md5-cache/kde-apps/umbrello-17.12.1
deleted file mode 100644
index 87e040eaf9f2..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-17.12.1
+++ /dev/null
@@ -1,13 +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/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/kcrash-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/kjobwidgets-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE UML Modeller
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
-IUSE=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/kcrash-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/kjobwidgets-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/umbrello-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.2 b/metadata/md5-cache/kde-apps/umbrello-17.12.2
new file mode 100644
index 000000000000..81b5ce86e820
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-17.12.2
@@ -0,0 +1,13 @@
+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/kcrash-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/kjobwidgets-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.40.0: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.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE UML Modeller
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/development/umbrello https://umbrello.kde.org
+IUSE=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/kcrash-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/kjobwidgets-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 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/umbrello-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
deleted file mode 100644
index 33911861764b..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.2
new file mode 100644
index 000000000000..c2eae32b9873
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.2/src/zeroconf-ioslave-17.12.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	f969e0903765bc89fad95c1552831e5e	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_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 6f023cfae53f..0c6f0ee6dd8e 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.42.0 b/metadata/md5-cache/kde-frameworks/attica-5.42.0
deleted file mode 100644
index 667106213ba0..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/attica-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=272d4128912609ff1bcd1905e9ab28f3
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.43.0 b/metadata/md5-cache/kde-frameworks/attica-5.43.0
new file mode 100644
index 000000000000..767a4ec01688
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/attica-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=272d4128912609ff1bcd1905e9ab28f3
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.42.0 b/metadata/md5-cache/kde-frameworks/baloo-5.42.0
deleted file mode 100644
index 98dc54166be3..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kfilemetadata-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kidletime-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kfilemetadata-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kidletime-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/baloo-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f9b8077a67c432cf8490d98bdd92f2e2
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.43.0 b/metadata/md5-cache/kde-frameworks/baloo-5.43.0
new file mode 100644
index 000000000000..a6911336b47c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kfilemetadata-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kidletime-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kfilemetadata-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kidletime-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/baloo-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f9b8077a67c432cf8490d98bdd92f2e2
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0
deleted file mode 100644
index 634eec549c01..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/bluez-qt-5.42.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c56161d95ba41891363e8e9a5fa8cc78
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0
new file mode 100644
index 000000000000..4881079947af
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/bluez-qt-5.43.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c56161d95ba41891363e8e9a5fa8cc78
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.0
deleted file mode 100644
index 520a8ac61f08..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-3
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/breeze-icons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=4db8280fac843ce30b8aefa8e82ed7aa
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0
new file mode 100644
index 000000000000..b666c00600f3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.43.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.43:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/breeze-icons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=17f0add66b425821672ea72242eae400
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.0
deleted file mode 100644
index 3b12084c1bb9..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/breeze-icons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=ebf8a705565eecce6da18dda1e915516
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0
new file mode 100644
index 000000000000..0dd9ebb3e8f5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.43.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.43:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/breeze-icons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=1b671feb97e59218633840d7c85ec2cb
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0-r1 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0-r1
deleted file mode 100644
index 680ca0155f10..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/extra-cmake-modules-5.42.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=998c656bf561ace2ca172ca34f09e3e7
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
new file mode 100644
index 000000000000..7223e4987234
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/extra-cmake-modules-5.43.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f56501b3a9a8cec976dd22334c43f82
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0
deleted file mode 100644
index c45888b68716..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knewstuff-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) 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.42: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=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knewstuff-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/frameworkintegration-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=9f1f403c964b89e911af28ff738c6383
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0
new file mode 100644
index 000000000000..cb3fa78ef802
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knewstuff-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) 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.43: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=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knewstuff-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/frameworkintegration-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=9f1f403c964b89e911af28ff738c6383
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.42.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.42.0
deleted file mode 100644
index 8773af914ebd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42: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/qtsql-5.7.1:5 >=dev-libs/boost-1.54 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for working with KDE activities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42: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/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kactivities-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=82cae55a50b20bae514b9aaa04cdbf21
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.43.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.43.0
new file mode 100644
index 000000000000..6f882f7128ef
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43: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/qtsql-5.7.1:5 >=dev-libs/boost-1.54 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for working with KDE activities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43: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/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kactivities-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=82cae55a50b20bae514b9aaa04cdbf21
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0
deleted file mode 100644
index eb178dc93ce6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=dev-libs/boost-1.54 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kactivities-stats-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=b2ddec7aa68aeebcc57c2a0ebfd14059
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0
new file mode 100644
index 000000000000..70901943badc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=dev-libs/boost-1.54 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kactivities-stats-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=b2ddec7aa68aeebcc57c2a0ebfd14059
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.42.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.42.0
deleted file mode 100644
index 6ab7335ab1d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)]
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[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/pyyaml[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-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kapidox-5.42.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee816bab864f6aaa71d809765351e6d7
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.43.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.43.0
new file mode 100644
index 000000000000..5ca9aa82ddc7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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(+)]
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen dev-python/jinja[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/pyyaml[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-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kapidox-5.43.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ee816bab864f6aaa71d809765351e6d7
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.42.0 b/metadata/md5-cache/kde-frameworks/karchive-5.42.0
deleted file mode 100644
index 6766615021f2..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/karchive-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6162f648bb031423a41318b073d1161b
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.43.0 b/metadata/md5-cache/kde-frameworks/karchive-5.43.0
new file mode 100644
index 000000000000..9267b8f154fb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+bzip2 +lzma debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/karchive-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6162f648bb031423a41318b073d1161b
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.42.0 b/metadata/md5-cache/kde-frameworks/kauth-5.42.0
deleted file mode 100644
index 707c9d5ea4cf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kauth-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=fe50ece8f6beeafc36c9c61e5270309b
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.43.0 b/metadata/md5-cache/kde-frameworks/kauth-5.43.0
new file mode 100644
index 000000000000..94b36f3ca454
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kauth-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=fe50ece8f6beeafc36c9c61e5270309b
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0
deleted file mode 100644
index a44182d94556..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.42:5 nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kbookmarks-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=926c456bc2cbb34aab6679a18f2ed263
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0
new file mode 100644
index 000000000000..795ed4866f6c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.43:5 nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kbookmarks-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=926c456bc2cbb34aab6679a18f2ed263
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0
deleted file mode 100644
index 2347f7c9e0a4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42: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/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42: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/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kcmutils-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6574dc65babe4d2e33ab65354d2c20ea
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0
new file mode 100644
index 000000000000..2446dd6da4df
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43: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/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43: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/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kcmutils-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6574dc65babe4d2e33ab65354d2c20ea
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0
deleted file mode 100644
index ac1d50aa9289..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kcodecs-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=378da3e62daa508a021c2de45333d588
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0
new file mode 100644
index 000000000000..2c8c0c0da869
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kcodecs-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=378da3e62daa508a021c2de45333d588
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0
deleted file mode 100644
index 70028e307328..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kcompletion-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=4347ba04c17e9850ba88833444f285b7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0
new file mode 100644
index 000000000000..79058d2062fa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kcompletion-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=4347ba04c17e9850ba88833444f285b7
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.42.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.42.0
deleted file mode 100644
index 3b7cf5bc6806..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kconfig-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=89fbfaff3a52eb554c80a85c9c3c210a
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.43.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.43.0
new file mode 100644
index 000000000000..53203e0f6129
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kconfig-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=89fbfaff3a52eb554c80a85c9c3c210a
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0
deleted file mode 100644
index f8a65192d1cb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.42: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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kconfigwidgets-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=834fdfa0193b33716aa57c0a101ec642
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0
new file mode 100644
index 000000000000..0255a08ef2d6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.43: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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kconfigwidgets-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=834fdfa0193b33716aa57c0a101ec642
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0
deleted file mode 100644
index b3fcad3fef2b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kcoreaddons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=db6dca60fd6df32f7163b9deb63514f7
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0
new file mode 100644
index 000000000000..65ca5ac56492
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kcoreaddons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=db6dca60fd6df32f7163b9deb63514f7
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.42.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.42.0
deleted file mode 100644
index d3f7a113b4c4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kcrash-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=23ffaa3864e6e7bbdbc06d91cd5f400f
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.43.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.43.0
new file mode 100644
index 000000000000..49c7d94f55e7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kcrash-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=23ffaa3864e6e7bbdbc06d91cd5f400f
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0
deleted file mode 100644
index 33d1c039491b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdbusaddons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6f4e636614f777f3c2fbb33761d2d4ff
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0
new file mode 100644
index 000000000000..8a808f98ca80
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdbusaddons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6f4e636614f777f3c2fbb33761d2d4ff
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0
deleted file mode 100644
index 5ecd0f013f58..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdeclarative-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=367f52e720c52fa38b1994ecf207c2e9
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0
new file mode 100644
index 000000000000..c37ed86767af
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdeclarative-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=367f52e720c52fa38b1994ecf207c2e9
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.42.0 b/metadata/md5-cache/kde-frameworks/kded-5.42.0
deleted file mode 100644
index d2c0a9e2bea2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kded-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6d18366b668bf05e5736e0ccebd0cf63
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.43.0 b/metadata/md5-cache/kde-frameworks/kded-5.43.0
new file mode 100644
index 000000000000..e6ee8710995c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kinit-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.43:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kinit-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kded-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6d18366b668bf05e5736e0ccebd0cf63
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0
deleted file mode 100644
index cc1cdc53be72..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kded-5.42:5 >=kde-frameworks/kdesignerplugin-5.42:5 >=kde-frameworks/kemoticons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kunitconversion-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.42:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42: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=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kded-5.42:5 >=kde-frameworks/kdesignerplugin-5.42:5 >=kde-frameworks/kemoticons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kunitconversion-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kitemmodels-5.42:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=49261df9484eb84af92612a7491e04e1
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0
new file mode 100644
index 000000000000..ada2a4d0a34c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kded-5.43:5 >=kde-frameworks/kdesignerplugin-5.43:5 >=kde-frameworks/kemoticons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kunitconversion-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.43:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43: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=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kded-5.43:5 >=kde-frameworks/kdesignerplugin-5.43:5 >=kde-frameworks/kemoticons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kunitconversion-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.43:5 >=kde-frameworks/kinit-5.43:5 >=kde-frameworks/kitemmodels-5.43:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=49261df9484eb84af92612a7491e04e1
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0
deleted file mode 100644
index ba2feeec86cf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kplotting-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.42:5 ) >=kde-frameworks/kdoctools-5.42:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=designer nls webkit debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kplotting-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.42:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdesignerplugin-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=3bf6799dcc7439850d295d1bba1a430b
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0
new file mode 100644
index 000000000000..5070dc236131
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kplotting-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.43:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 handbook? ( >=kde-frameworks/kdoctools-5.43:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=designer nls webkit debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kplotting-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.43:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdesignerplugin-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=3009839ebc22f6a6bae366fffbd7431e
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.42.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.42.0
deleted file mode 100644
index dee85006ef0f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kpty-5.42:5 >=kde-frameworks/kservice-5.42:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle super user actions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kpty-5.42:5 >=kde-frameworks/kservice-5.42:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdesu-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=4d9d855e5e6843f15ea3ddce4c749b31
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.43.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.43.0
new file mode 100644
index 000000000000..27f018eafa73
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kpty-5.43:5 >=kde-frameworks/kservice-5.43:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle super user actions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kpty-5.43:5 >=kde-frameworks/kservice-5.43:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdesu-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=4d9d855e5e6843f15ea3ddce4c749b31
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0
deleted file mode 100644
index 6a50b06d5c52..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdewebkit-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6495c0bb2421c1d46acbc29cf9903f3e
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0
new file mode 100644
index 000000000000..e5730f944539
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdewebkit-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6495c0bb2421c1d46acbc29cf9903f3e
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0
deleted file mode 100644
index 76f746de7c6f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdnssd-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=b67e5dd15c0ab39f99031131c64e63cf
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0
new file mode 100644
index 000000000000..9cbae18d9c93
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdnssd-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=b67e5dd15c0ab39f99031131c64e63cf
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0
deleted file mode 100644
index 28051791e7e6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI 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.42: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=Tools to generate documentation in various formats from DocBook files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.42:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kdoctools-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=05683a71c581dcfae46ddbcb15c3e22a
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0
new file mode 100644
index 000000000000..57ef904785a3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI 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.43: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=Tools to generate documentation in various formats from DocBook files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/karchive-5.43:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kdoctools-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=05683a71c581dcfae46ddbcb15c3e22a
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0
deleted file mode 100644
index f92f2b3fc0b5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kemoticons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=13039e88219306a131435b9ae69930ff
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0
new file mode 100644
index 000000000000..5d17630e656f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kservice-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kemoticons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=13039e88219306a131435b9ae69930ff
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0
deleted file mode 100644
index 0444ee643323..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.42:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for extracting file metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.42:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kfilemetadata-5.42.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e676c52f89a12da286e26a46e3f8d26
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0
new file mode 100644
index 000000000000..6db38d69d82a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.43:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for extracting file metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.43:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kfilemetadata-5.43.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3cbbda68e09d4b51fbd8c8bb93456d7
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0
deleted file mode 100644
index 2ee4ae4c1171..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kglobalaccel-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=d6e15eae3a51ac1c5b30f9a9de24b553
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0
new file mode 100644
index 000000000000..6a4ec134a050
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kglobalaccel-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=d6e15eae3a51ac1c5b30f9a9de24b553
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0
deleted file mode 100644
index 2e6153a6183c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kguiaddons-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=d97dc002c9735397704d6d5d64fd6686
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0
new file mode 100644
index 000000000000..65be2746d08a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kguiaddons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=d97dc002c9735397704d6d5d64fd6686
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.43.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.43.0
new file mode 100644
index 000000000000..2d5d355c3272
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43: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=Library to determine holidays and other special events for a geographical region
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kholidays-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=0fd5f358beb7af39243799c0b063bcf7
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.42.0 b/metadata/md5-cache/kde-frameworks/khtml-5.42.0
deleted file mode 100644
index a1532227cf2f..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kjs-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42: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=KHTML web rendering engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kjs-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/khtml-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=fa309a608a18ca622b5a3eaeb98bb729
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.43.0 b/metadata/md5-cache/kde-frameworks/khtml-5.43.0
new file mode 100644
index 000000000000..3901e2f4ae96
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kjs-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43: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=KHTML web rendering engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kjs-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwallet-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/khtml-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=fa309a608a18ca622b5a3eaeb98bb729
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.42.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.42.0
deleted file mode 100644
index 9bbafc4061e1..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test 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
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/ki18n-5.42.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9779ea95c907add1105106b8032c20cc
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.43.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.43.0
new file mode 100644
index 000000000000..8a1d73a0a94f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test 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
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/ki18n-5.43.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	f969e0903765bc89fad95c1552831e5e	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	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9779ea95c907add1105106b8032c20cc
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0
deleted file mode 100644
index 97bfdabca148..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kiconthemes-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f948676d4a0e93e4cd834e8b1d2df661
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0
new file mode 100644
index 000000000000..78e3302ad50f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kiconthemes-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f948676d4a0e93e4cd834e8b1d2df661
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.42.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.42.0
deleted file mode 100644
index 63e9ac1da40d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kidletime-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=b3001b01746d7369d1b12cf0596d6215
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.43.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.43.0
new file mode 100644
index 000000000000..d936926123d4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kidletime-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=b3001b01746d7369d1b12cf0596d6215
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0
deleted file mode 100644
index 82051c0990e6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) 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.42: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=Framework providing additional format plugins for Qt's image I/O system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eps openexr test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kimageformats-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f4ef7a2a5226f6b1ddac1cfcdc64c664
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0
new file mode 100644
index 000000000000..aa2773d33515
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) 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.43: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=Framework providing additional format plugins for Qt's image I/O system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kimageformats-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=986fc7cf5619b3016589226c12949e08
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.42.0 b/metadata/md5-cache/kde-frameworks/kinit-5.42.0
deleted file mode 100644
index 3d51dd585397..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.42:5 ) X? ( x11-proto/xproto ) 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.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kinit-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=5871a7371fc62257fa8a05089bca2398
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.43.0 b/metadata/md5-cache/kde-frameworks/kinit-5.43.0
new file mode 100644
index 000000000000..e250da799558
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.43:5 ) X? ( x11-proto/xproto ) 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.43:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kinit-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=5871a7371fc62257fa8a05089bca2398
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.42.0 b/metadata/md5-cache/kde-frameworks/kio-5.42.0
deleted file mode 100644
index 81ab6babaa3c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kbookmarks-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.42:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.42:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.42:5
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kbookmarks-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.42:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.42:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kio-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=3c553919ff1554d44b3563bbf2dc4926
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.43.0 b/metadata/md5-cache/kde-frameworks/kio-5.43.0
new file mode 100644
index 000000000000..81f48ebfb74e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.43.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kbookmarks-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.43:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.43:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.43:5
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kbookmarks-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/solid-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.43:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.43:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kio-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=3c553919ff1554d44b3563bbf2dc4926
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.42.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.42.0
deleted file mode 100644
index 1754719a09eb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42: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=Lightweight user interface framework for mobile and convergent applications
-EAPI=6
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kirigami2-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=048b5c3fd6578b42d37a7cf3e0cf9363
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.43.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.43.0
new file mode 100644
index 000000000000..d9e9816c906b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43: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=Lightweight user interface framework for mobile and convergent applications
+EAPI=6
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kirigami2-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=12debef4d6fcd4e49294be44863c92e3
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0
deleted file mode 100644
index 684a27ebbc20..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( >=dev-qt/qtwidgets-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kitemmodels-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=9b5029d136591559f64bc120f87a932b
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0
new file mode 100644
index 000000000000..53d916f982d9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( >=dev-qt/qtwidgets-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kitemmodels-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=9b5029d136591559f64bc120f87a932b
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0
deleted file mode 100644
index 882b6b36c8e9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kitemviews-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=df6df54cdad36b07e198ea497615813e
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0
new file mode 100644
index 000000000000..72b88665caca
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kitemviews-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=df6df54cdad36b07e198ea497615813e
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0
deleted file mode 100644
index 2e0c11e6b295..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kjobwidgets-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=8ceb7f4fe9821bda5f4d2fb3eb6ee05a
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0
new file mode 100644
index 000000000000..db34912a7ac2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kjobwidgets-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=8ceb7f4fe9821bda5f4d2fb3eb6ee05a
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.42.0 b/metadata/md5-cache/kde-frameworks/kjs-5.42.0
deleted file mode 100644
index ae220d21d06c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.42:5 dev-lang/perl 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.42: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=ECMAScipt compatible parser and engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kjs-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=e517b654d0860f18c6400416b2f23929
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.43.0 b/metadata/md5-cache/kde-frameworks/kjs-5.43.0
new file mode 100644
index 000000000000..6f88b5e39afe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre dev-lang/perl 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.43:5 handbook? ( >=kde-frameworks/kdoctools-5.43: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=ECMAScipt compatible parser and engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kjs-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=81ce71e8a02e918a6a0f8ba9f543ad5d
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0
deleted file mode 100644
index c571559356cb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kjs-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.42:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kjs-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kjsembed-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=d87ae37235075fd97111e1461f6e7b82
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0
new file mode 100644
index 000000000000..f2f894104f39
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kjs-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 handbook? ( >=kde-frameworks/kdoctools-5.43:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kjs-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kjsembed-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=0a3ee0e99ad67b6eee24cdcc04816c71
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0
deleted file mode 100644
index 5c55ef431093..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-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.42: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=Framework providing a common interface for KParts that can play media files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=4efa5c076abee87bedc1b748e3053551
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0
new file mode 100644
index 000000000000..d53289109fb7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-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.43: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=Framework providing a common interface for KParts that can play media files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=4efa5c076abee87bedc1b748e3053551
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0
deleted file mode 100644
index ee0ed1cfbcfd..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/knewstuff-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=dcf9fd98c448de261ca8933f47ad2d6a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0
new file mode 100644
index 000000000000..8b61b99ca644
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/attica-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/knewstuff-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=dcf9fd98c448de261ca8933f47ad2d6a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.42.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.42.0
deleted file mode 100644
index 786c51a15b9e..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=dbus nls speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/knotifications-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=ce3312b5fb6482147de5241990e4c11c
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.43.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.43.0
new file mode 100644
index 000000000000..ee890db00a04
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=dbus nls speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/knotifications-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=ce3312b5fb6482147de5241990e4c11c
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0
deleted file mode 100644
index d4bf222cd4e5..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/knotifyconfig-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f58337ebde2970d4c869483a52b0f5d9
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0
new file mode 100644
index 000000000000..f102b9b8d9b6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/knotifyconfig-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f58337ebde2970d4c869483a52b0f5d9
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.42.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.42.0
deleted file mode 100644
index 8e6273cbac15..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kpackage-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=24bfe4fb28b8685ce67ac46ee5ff58a5
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.43.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.43.0
new file mode 100644
index 000000000000..c378426dcf42
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 man? ( >=kde-frameworks/kdoctools-5.43:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kpackage-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=24bfe4fb28b8685ce67ac46ee5ff58a5
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.42.0 b/metadata/md5-cache/kde-frameworks/kparts-5.42.0
deleted file mode 100644
index be69abd54ed9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.42: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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kparts-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f577175f51edf0e6fbd6ac8abb4422b1
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.43.0 b/metadata/md5-cache/kde-frameworks/kparts-5.43.0
new file mode 100644
index 000000000000..664333d1740d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.43: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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kparts-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f577175f51edf0e6fbd6ac8abb4422b1
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.42.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.42.0
deleted file mode 100644
index 69950bb56e12..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE contact person abstraction library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kpeople-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=76d9365d1f09489bea1598e7e1969f1a
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.43.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.43.0
new file mode 100644
index 000000000000..03b300bdd5dc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE contact person abstraction library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kpeople.git
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kpeople-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=76d9365d1f09489bea1598e7e1969f1a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.42.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.42.0
deleted file mode 100644
index 28f74aac2784..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kplotting-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=930c75e3328e1cb8986e561664a8e618
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.43.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.43.0
new file mode 100644
index 000000000000..7f008c7dbad1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kplotting-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=930c75e3328e1cb8986e561664a8e618
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.42.0 b/metadata/md5-cache/kde-frameworks/kpty-5.42.0
deleted file mode 100644
index 590370d98840..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 sys-libs/libutempter 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kpty-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=20f7a6cd39ac8c27e3f4d21c0b437450
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.43.0 b/metadata/md5-cache/kde-frameworks/kpty-5.43.0
new file mode 100644
index 000000000000..272e15f8d8c7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 sys-libs/libutempter 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kpty-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=20f7a6cd39ac8c27e3f4d21c0b437450
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.42.0 b/metadata/md5-cache/kde-frameworks/kross-5.42.0
deleted file mode 100644
index 2399af86598d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.42: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.42: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=Framework for embedding scripting into applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kross-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=0b71613570ce74be08b000a94c906052
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.43.0 b/metadata/md5-cache/kde-frameworks/kross-5.43.0
new file mode 100644
index 000000000000..ece68a9d4688
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.43: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.43: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=Framework for embedding scripting into applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/portingAids/kross-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=0b71613570ce74be08b000a94c906052
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.42.0 b/metadata/md5-cache/kde-frameworks/krunner-5.42.0
deleted file mode 100644
index 2305002d0b1e..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/plasma-5.42:5 >=kde-frameworks/solid-5.42:5 >=kde-frameworks/threadweaver-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/plasma-5.42:5 >=kde-frameworks/solid-5.42:5 >=kde-frameworks/threadweaver-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/krunner-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=e072d08ad99dcce618650c3171ffbc99
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.43.0 b/metadata/md5-cache/kde-frameworks/krunner-5.43.0
new file mode 100644
index 000000000000..ae8190f7edaa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/plasma-5.43:5 >=kde-frameworks/solid-5.43:5 >=kde-frameworks/threadweaver-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/plasma-5.43:5 >=kde-frameworks/solid-5.43:5 >=kde-frameworks/threadweaver-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/krunner-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=e072d08ad99dcce618650c3171ffbc99
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.42.0 b/metadata/md5-cache/kde-frameworks/kservice-5.42.0
deleted file mode 100644
index d382a178d62b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.42:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kservice-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=d1255b02fd8e236b943893db5d2ce6ef
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.43.0 b/metadata/md5-cache/kde-frameworks/kservice-5.43.0
new file mode 100644
index 000000000000..ea740b47b9c7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.43:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kcrash-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kservice-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=d1255b02fd8e236b943893db5d2ce6ef
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0
deleted file mode 100644
index 099635ce7edb..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=kde-frameworks/syntax-highlighting-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.42: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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=kde-frameworks/syntax-highlighting-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/ktexteditor-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f30729c8ef0b9426cb8fe738d9e39b37
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0
new file mode 100644
index 000000000000..9540258c9766
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=kde-frameworks/syntax-highlighting-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.43: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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kauth-5.43:5 >=kde-frameworks/kcodecs-5.43:5 >=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/kjobwidgets-5.43:5 >=kde-frameworks/kparts-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=kde-frameworks/syntax-highlighting-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/ktexteditor-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f30729c8ef0b9426cb8fe738d9e39b37
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0
deleted file mode 100644
index 69a2d0baf51f..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/ktextwidgets-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=2c8beff7f9dd6799faa5ec0d82ff2ab7
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0
new file mode 100644
index 000000000000..fe0db0f69be9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/sonnet-5.43:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/ktextwidgets-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=2c8beff7f9dd6799faa5ec0d82ff2ab7
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0
deleted file mode 100644
index 6e4f7d4970a1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting units
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kunitconversion-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f9e929dd914f69e47c3f7846070e055e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0
new file mode 100644
index 000000000000..f8f3f325ba2d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting units
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.43:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kunitconversion-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f9e929dd914f69e47c3f7846070e055e
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.42.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.42.0
deleted file mode 100644
index 976290fce4cb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kwallet-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=f360dcfe404c371306515fe702d401ca
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.43.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.43.0
new file mode 100644
index 000000000000..14896bf7d2e5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.43:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdbusaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kwallet-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f360dcfe404c371306515fe702d401ca
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.42.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.42.0
deleted file mode 100644
index d37d8bdbcf88..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland.git
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kwayland-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=1399ddbc69f9a9500c90f8e33d457dc6
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.43.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.43.0
new file mode 100644
index 000000000000..46084e637876
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kwayland-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=1399ddbc69f9a9500c90f8e33d457dc6
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0
new file mode 100644
index 000000000000..cdd56861e169
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kwidgetsaddons-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=f60a3a1b79a05d61245a02c68af376fe
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0
deleted file mode 100644
index 22f82f7aab8b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kwindowsystem-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=ffbe0b37d9c4ce7bb607b5dc4eab77ce
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0
new file mode 100644
index 000000000000..e4274fac9367
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kwindowsystem-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=ffbe0b37d9c4ce7bb607b5dc4eab77ce
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0
deleted file mode 100644
index ecad1a7ae320..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.42: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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=attica test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.42:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kxmlgui-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=e9b8393232123ad095929f528dcc1105
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0
new file mode 100644
index 000000000000..4a021485b0ee
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.43: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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=attica test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kitemviews-5.43:5 >=kde-frameworks/ktextwidgets-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.43:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kxmlgui-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=e9b8393232123ad095929f528dcc1105
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0
deleted file mode 100644
index 588a17c2aca7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/kxmlrpcclient-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=208fa3b6f20be2c9355fc68099887bfc
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0
new file mode 100644
index 000000000000..fcea8f8cb378
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/kxmlrpcclient-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=208fa3b6f20be2c9355fc68099887bfc
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0
deleted file mode 100644
index 8a4eee5ec447..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/modemmanager-qt-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=cc321998618f4f378721f1a1ebcfb6ac
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0
new file mode 100644
index 000000000000..894ab79ce08b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/modemmanager-qt-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=cc321998618f4f378721f1a1ebcfb6ac
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0
deleted file mode 100644
index 01c7dd3a326a..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/networkmanager-qt-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=679e0792d08c99645434029b55fdc61d
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0
new file mode 100644
index 000000000000..64da8f96944f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/networkmanager-qt-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=679e0792d08c99645434029b55fdc61d
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.0
deleted file mode 100644
index 5bf522e92eab..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/oxygen-icons5-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=d91700002f32b0d14db54bde5b3d00e4
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0
new file mode 100644
index 000000000000..08b56c27402e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.43:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/oxygen-icons5-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=d91700002f32b0d14db54bde5b3d00e4
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.42.0 b/metadata/md5-cache/kde-frameworks/plasma-5.42.0
deleted file mode 100644
index 6db963510bef..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.42.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.42:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.42:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma framework
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.42:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/plasma-framework-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=52602b73d9e255076db6ed292491878b
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.43.0 b/metadata/md5-cache/kde-frameworks/plasma-5.43.0
new file mode 100644
index 000000000000..6fc90da4ddc3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.43:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.43:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma framework
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.43:5 >=kde-frameworks/karchive-5.43:5 >=kde-frameworks/kconfig-5.43:5 >=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/kdeclarative-5.43:5 >=kde-frameworks/kglobalaccel-5.43:5 >=kde-frameworks/kguiaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kio-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=kde-frameworks/knotifications-5.43:5 >=kde-frameworks/kpackage-5.43:5 >=kde-frameworks/kservice-5.43:5 >=kde-frameworks/kwidgetsaddons-5.43:5 >=kde-frameworks/kwindowsystem-5.43:5 >=kde-frameworks/kxmlgui-5.43:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.43:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/plasma-framework-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=52602b73d9e255076db6ed292491878b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.42.0 b/metadata/md5-cache/kde-frameworks/prison-5.42.0
deleted file mode 100644
index 1c8edf730cc9..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx 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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/prison.git
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/prison-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=e0b11ed327a523b05e1b5bd0fff4788c
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.43.0 b/metadata/md5-cache/kde-frameworks/prison-5.43.0
new file mode 100644
index 000000000000..4fe28fe79ad8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx 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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/prison.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/prison-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=e0b11ed327a523b05e1b5bd0fff4788c
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.43.0 b/metadata/md5-cache/kde-frameworks/purpose-5.43.0
new file mode 100644
index 000000000000..7d1cb3c7bd5f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.43.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) 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.43: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=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+kaccounts debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.43:5 >=kde-frameworks/ki18n-5.43:5 >=kde-frameworks/kio-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/purpose-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=4f093a18092da3812908b93e7190f2df
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0
deleted file mode 100644
index 53bf92e68efd..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42: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=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/qqc2-desktop-style-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=2568c27a224f73a206ff5459f020560b
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0
new file mode 100644
index 000000000000..bb10a5461dda
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43: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=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.43:5 >=kde-frameworks/kiconthemes-5.43:5 >=kde-frameworks/kirigami-5.43:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/qqc2-desktop-style-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=2568c27a224f73a206ff5459f020560b
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.42.0 b/metadata/md5-cache/kde-frameworks/solid-5.42.0
deleted file mode 100644
index aa92900ebf94..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/solid-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=6c8590c6e2b388d359474a6f0c0f482c
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.43.0 b/metadata/md5-cache/kde-frameworks/solid-5.43.0
new file mode 100644
index 000000000000..249090a05a4b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/solid-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=6c8590c6e2b388d359474a6f0c0f482c
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.42.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.42.0
deleted file mode 100644
index 8386c1fa0133..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=aspell +hunspell nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/sonnet-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=7c97c2e7e52e71919526b811000495c2
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.43.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.43.0
new file mode 100644
index 000000000000..ce993c41c588
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=aspell +hunspell nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/sonnet-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=7c97c2e7e52e71919526b811000495c2
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0
deleted file mode 100644
index b3482e399982..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/syntax-highlighting-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=686451df65c3fb0001e601d838eb9ecd
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0
new file mode 100644
index 000000000000..d7f6ad432b43
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for syntax highlighting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/syntax-highlighting-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=686451df65c3fb0001e601d838eb9ecd
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0
deleted file mode 100644
index 3a7467d1eacc..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.42
-SRC_URI=mirror://kde/stable/frameworks/5.42/threadweaver-5.42.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	f969e0903765bc89fad95c1552831e5e	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_=49f13ae000e6a4f83cc62b324e4c5ae9
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0
new file mode 100644
index 000000000000..dd7fe25b53a9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.43.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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.43:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.43:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.43
+SRC_URI=mirror://kde/stable/frameworks/5.43/threadweaver-5.43.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	f969e0903765bc89fad95c1552831e5e	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_=49f13ae000e6a4f83cc62b324e4c5ae9
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 2261ae91ea44..cf0d8422b7c2 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.1 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.1
new file mode 100644
index 000000000000..f8587dcbbd0d
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] ) 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 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KPart for rendering Markdown content
+EAPI=6
+HOMEPAGE=https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/
+IUSE=webkit debug
+KEYWORDS=~amd64
+LICENSE=!webkit? ( BSD ) LGPL-2.1+
+RDEPEND=>=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/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] ) >=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/kmarkdownwebview/0.5.1/src/kmarkdownwebview-0.5.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	f969e0903765bc89fad95c1552831e5e	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_=bf0efb0fadbf910899d63d911342c972
diff --git a/metadata/md5-cache/kde-misc/krename-4.90.90 b/metadata/md5-cache/kde-misc/krename-4.90.90
deleted file mode 100644
index 3a57c46a6df8..000000000000
--- a/metadata/md5-cache/kde-misc/krename-4.90.90
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) 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 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=Powerful batch file renamer
-EAPI=6
-HOMEPAGE=http://www.krename.net/
-IUSE=exif pdf taglib truetype debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename: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/unstable/krename/4.90.90/krename-4.90.90.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	f969e0903765bc89fad95c1552831e5e	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_=3d3637b4585a6c3dc4a89309aa1fbbe2
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0 b/metadata/md5-cache/kde-misc/krename-5.0.0
new file mode 100644
index 000000000000..00a9020296e6
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0
@@ -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/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) 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 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=Powerful batch file renamer
+EAPI=6
+HOMEPAGE=http://www.krename.net/
+IUSE=exif pdf taglib truetype debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-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/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kservice-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/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename: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/krename/5.0.0/src/krename-5.0.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	f969e0903765bc89fad95c1552831e5e	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_=b0a3facd67e6f6850d8c35e4d91dde6c
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c906810de43c..dfd42ee05060 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.12.0 b/metadata/md5-cache/kde-plasma/bluedevil-5.12.0
deleted file mode 100644
index 80e85605d2c7..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/bluedevil.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-plasma/kde-cli-tools-5.12.0:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/bluedevil-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.12.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.12.1
new file mode 100644
index 000000000000..38426c52f199
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/bluedevil.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-plasma/kde-cli-tools-5.12.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/bluedevil-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.12.0 b/metadata/md5-cache/kde-plasma/breeze-5.12.0
deleted file mode 100644
index 2c5740ea2f24..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.42.0:5 qt4? ( dev-util/automoc:0 ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze.git
-IUSE=qt4 wayland X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=qt4? ( X )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/breeze-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1aa3ed5ca2c367bae88b8bc81aac5de6
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.12.1 b/metadata/md5-cache/kde-plasma/breeze-5.12.1
new file mode 100644
index 000000000000..6ea229e20a97
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.42.0:5 qt4? ( dev-util/automoc:0 ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/breeze.git
+IUSE=qt4 wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=qt4? ( X )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/breeze-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1aa3ed5ca2c367bae88b8bc81aac5de6
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.0 b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.0
deleted file mode 100644
index 3c4224483315..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for GRUB
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/breeze-grub-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.12.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.1
new file mode 100644
index 000000000000..3181cf38cc2c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.12.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for GRUB
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/breeze-grub-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.0 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.0
deleted file mode 100644
index 1874a0935b6e..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/breeze-gtk-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.1
new file mode 100644
index 000000000000..f05e299b9840
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/breeze-gtk-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.0 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.0
deleted file mode 100644
index 8c736b0c09b5..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.42.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/breeze-plymouth-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.1
new file mode 100644
index 000000000000..3470a2bd93ca
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-boot/plymouth >=kde-frameworks/extra-cmake-modules-5.42.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/breeze-plymouth-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.12.0 b/metadata/md5-cache/kde-plasma/drkonqi-5.12.0
deleted file mode 100644
index b12321ab3e2f..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlrpcclient-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlrpcclient-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/drkonqi-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=9e2c7f630747e5e7d1a55a324f24fe66
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.12.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.12.1
new file mode 100644
index 000000000000..c368429f8821
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlrpcclient-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 ) >=dev-qt/qtconcurrent-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlrpcclient-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/drkonqi-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=9e2c7f630747e5e7d1a55a324f24fe66
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.0 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.0
deleted file mode 100644
index d7e6a66f5941..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/boost-1.54 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kactivitymanagerd-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=b6fdb8174cb3217164ff429319cfda0f
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.1
new file mode 100644
index 000000000000..384c92c75d35
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/boost-1.54 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5[sqlite] >=dev-qt/qtwidgets-5.9.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kactivitymanagerd-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=b6fdb8174cb3217164ff429319cfda0f
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.0 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.0
deleted file mode 100644
index 47c2394af697..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 kdesu? ( >=kde-frameworks/kdesu-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
-IUSE=+kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 kdesu? ( >=kde-frameworks/kdesu-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kde-cli-tools-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5807799b6d44ebef7fb664e5104119d3
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.1
new file mode 100644
index 000000000000..24bdf60d5b4f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 kdesu? ( >=kde-frameworks/kdesu-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
+IUSE=+kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 kdesu? ( >=kde-frameworks/kdesu-5.42.0:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kde-cli-tools-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5807799b6d44ebef7fb664e5104119d3
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.0 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.0
deleted file mode 100644
index e9dcc0b287bf..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor 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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.0:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kde-gtk-config-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=4615265b593490c44a10248e0671c5f0
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.1
new file mode 100644
index 000000000000..9741dbe8f110
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor 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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.1:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kde-gtk-config-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=4615265b593490c44a10248e0671c5f0
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.12.0 b/metadata/md5-cache/kde-plasma/kdecoration-5.12.0
deleted file mode 100644
index 993cde2da75d..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.9.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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kdecoration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=788f380fd9a38e6680fa287d99c3bc1c
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.12.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.12.1
new file mode 100644
index 000000000000..317618515f2e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.9.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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kdecoration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=788f380fd9a38e6680fa287d99c3bc1c
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.0 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.0
deleted file mode 100644
index 100628bc86ec..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kross-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kunitconversion-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1:5 ) share? ( >=kde-frameworks/purpose-1.2.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=dictionary share debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kross-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kunitconversion-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1:5 ) share? ( >=kde-frameworks/purpose-1.2.1:5 ) >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kdeplasma-addons-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=71975a99ccea0fbfc589e4cf6fed2303
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.1
new file mode 100644
index 000000000000..abf833fd0676
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kross-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kunitconversion-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1:5 ) share? ( >=kde-frameworks/purpose-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=dictionary share debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kross-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kunitconversion-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dictionary? ( >=dev-qt/qtwebengine-5.9.1:5 ) share? ( >=kde-frameworks/purpose-5.42.0:5 ) >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kdeplasma-addons-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5ef4e6be1753e5600f7c32acf5345afa
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.12.0 b/metadata/md5-cache/kde-plasma/kgamma-5.12.0
deleted file mode 100644
index fcd317126d72..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kgamma5-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f672d76d1d69f858a381c81b3c74e0a0
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.12.1 b/metadata/md5-cache/kde-plasma/kgamma-5.12.1
new file mode 100644
index 000000000000..d009966db52a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-proto/xf86vidmodeproto 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kgamma5-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f672d76d1d69f858a381c81b3c74e0a0
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.12.0 b/metadata/md5-cache/kde-plasma/khotkeys-5.12.0
deleted file mode 100644
index 80a519c4cf56..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5[X] >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXtst x11-libs/libxcb x11-libs/libXtst x11-proto/xproto 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5[X] >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/khotkeys-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=58882fc0b6ba2de6db261972bced8f17
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.12.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.12.1
new file mode 100644
index 000000000000..f0475de786ad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5[X] >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXtst x11-libs/libxcb x11-libs/libXtst x11-proto/xproto 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5[X] >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.1:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/khotkeys-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=58882fc0b6ba2de6db261972bced8f17
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.0 b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.0
deleted file mode 100644
index 75a7f66a2ebc..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.42.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A utility that provides information about a computer system
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.12.0:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kinfocenter-5.12.0.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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_=96571c9fb82294701052d16ead931c6a
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.12.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.1
new file mode 100644
index 000000000000..10e9ac5a876d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.42.0:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A utility that provides information about a computer system
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
+IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.12.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kinfocenter-5.12.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	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_=96571c9fb82294701052d16ead931c6a
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.0 b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.0
deleted file mode 100644
index a0131e5889d0..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma menu editor
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kmenuedit.git
-IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.0:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kmenuedit-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.12.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.1
new file mode 100644
index 000000000000..fd0b10657217
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma menu editor
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kmenuedit.git
+IUSE=+hotkeys debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.12.1:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kmenuedit-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.12.0 b/metadata/md5-cache/kde-plasma/kscreen-5.12.0
deleted file mode 100644
index ff64697d7269..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/libkscreen-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma screen management
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kscreen.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/libkscreen-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kscreen-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=94c8193016f342b3a45303dadb4a720f
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.12.1 b/metadata/md5-cache/kde-plasma/kscreen-5.12.1
new file mode 100644
index 000000000000..17399da0b275
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/libkscreen-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma screen management
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kscreen.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/libkscreen-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/kde-cli-tools-5.12.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kscreen-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=94c8193016f342b3a45303dadb4a720f
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.0 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.0
deleted file mode 100644
index 15778aa81892..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+pam seccomp test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.12.0:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kscreenlocker-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b313205c390646d420878fa599889e4
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.1
new file mode 100644
index 000000000000..4be346063508
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+pam seccomp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.12.1:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kscreenlocker-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b313205c390646d420878fa599889e4
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.0 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.0
deleted file mode 100644
index ffdbe161cf1e..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/ksshaskpass-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.1
new file mode 100644
index 000000000000..cbd7a355e925
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/ksshaskpass-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.12.0 b/metadata/md5-cache/kde-plasma/ksysguard-5.12.0
deleted file mode 100644
index e5ab6c71da0d..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.12.0:5[-minimal(-)] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 lm_sensors? ( sys-apps/lm_sensors ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.12.0:5[-minimal(-)] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/ksysguard-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.12.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.12.1
new file mode 100644
index 000000000000..b1a00cb91d3f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-plasma/libksysguard-5.12.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 lm_sensors? ( sys-apps/lm_sensors ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=lm_sensors debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-plasma/libksysguard-5.12.1:5[-minimal(-)] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/ksysguard-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.0 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.0
deleted file mode 100644
index e26c5e918046..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= virtual/pam 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kwallet-pam-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.1
new file mode 100644
index 000000000000..f890d7989764
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= virtual/pam 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KWallet PAM module to not enter password again
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kwallet-pam-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.0 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.0
deleted file mode 100644
index 9a973a254379..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kwayland-integration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.1
new file mode 100644
index 000000000000..dec1e685f163
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kwayland-integration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.12.0 b/metadata/md5-cache/kde-plasma/kwin-5.12.0
deleted file mode 100644
index 8d11153ef4a9..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5[X] >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/breeze-5.12.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=kde-plasma/kscreenlocker-5.12.0:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5[X] >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/breeze-5.12.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=kde-plasma/kscreenlocker-5.12.0:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=kde-plasma/kde-cli-tools-5.12.0:5 >=dev-qt/qtvirtualkeyboard-5.9.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kwin-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=4f6142c75e07cd7896cefe537040912e
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.12.1 b/metadata/md5-cache/kde-plasma/kwin-5.12.1
new file mode 100644
index 000000000000..df6b4c63f6f0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5[X] >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/breeze-5.12.1:5 >=kde-plasma/kdecoration-5.12.1:5 >=kde-plasma/kscreenlocker-5.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=caps gles2 multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kinit-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5[X] >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-plasma/breeze-5.12.1:5 >=kde-plasma/kdecoration-5.12.1:5 >=kde-plasma/kscreenlocker-5.12.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsensors-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=kde-plasma/kde-cli-tools-5.12.1:5 >=dev-qt/qtvirtualkeyboard-5.9.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kwin-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=4f6142c75e07cd7896cefe537040912e
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.12.0 b/metadata/md5-cache/kde-plasma/kwrited-5.12.0
deleted file mode 100644
index 7d67c7643b59..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpty-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpty-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/kwrited-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.12.1 b/metadata/md5-cache/kde-plasma/kwrited-5.12.1
new file mode 100644
index 000000000000..b213d0445944
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpty-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kpty-5.42.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/kwrited-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.12.0 b/metadata/md5-cache/kde-plasma/libkscreen-5.12.0
deleted file mode 100644
index 5f32c9994616..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb 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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma screen management library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.12.0/libkscreen-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.12.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.12.1
new file mode 100644
index 000000000000..93a166f2d1e7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb 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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma screen management library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.12.1/libkscreen-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.12.0 b/metadata/md5-cache/kde-plasma/libksysguard-5.12.0
deleted file mode 100644
index 7b8fb30cf8ee..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.42.0:5 !minimal? ( >=kde-frameworks/plasma-5.42.0:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Task management and system monitoring library
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+detailedmemory minimal X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/libksysguard-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5d79bdc3c7f4f62c1fee201df485ddc6
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.12.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.12.1
new file mode 100644
index 000000000000..17fbf4bc47ff
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.42.0:5 !minimal? ( >=kde-frameworks/plasma-5.42.0:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Task management and system monitoring library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+detailedmemory minimal X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/libksysguard-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5d79bdc3c7f4f62c1fee201df485ddc6
diff --git a/metadata/md5-cache/kde-plasma/milou-5.12.0 b/metadata/md5-cache/kde-plasma/milou-5.12.0
deleted file mode 100644
index f22b07998cee..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/milou.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/milou-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/milou-5.12.1 b/metadata/md5-cache/kde-plasma/milou-5.12.1
new file mode 100644
index 000000000000..19e052e68a58
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/milou.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/milou-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.12.0 b/metadata/md5-cache/kde-plasma/oxygen-5.12.0
deleted file mode 100644
index 64809c3701a1..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) >=kde-frameworks/kservice-5.42.0:5 qt4? ( dev-util/automoc:0 virtual/pkgconfig ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/oxygen.git
-IUSE=qt4 wayland debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) >=kde-plasma/kde-cli-tools-5.12.0:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/oxygen-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85185e5f57e6a6eccb18f13ffce9af4d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.12.1 b/metadata/md5-cache/kde-plasma/oxygen-5.12.1
new file mode 100644
index 000000000000..7a1ff07c588b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) >=kde-frameworks/kservice-5.42.0:5 qt4? ( dev-util/automoc:0 virtual/pkgconfig ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/oxygen.git
+IUSE=qt4 wayland debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-plasma/kdecoration-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.42.0:5 ) >=kde-plasma/kde-cli-tools-5.12.1:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/oxygen-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=85185e5f57e6a6eccb18f13ffce9af4d
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.0
deleted file mode 100644
index 7b46cfddade0..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.42.0:5 >=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kemoticons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kparts-5.42.0:5 >=kde-frameworks/kpeople-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/kwin-5.12.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma desktop
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.42.0:5 >=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kemoticons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kparts-5.42.0:5 >=kde-frameworks/kpeople-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/kwin-5.12.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.42.0:5 >=kde-plasma/breeze-5.12.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 >=kde-plasma/oxygen-5.12.0:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.0:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-desktop-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=a433ed430627fca4740864834376dc04
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.1
new file mode 100644
index 000000000000..473c6b0d2bff
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.42.0:5 >=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kemoticons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kparts-5.42.0:5 >=kde-frameworks/kpeople-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/kwin-5.12.1:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma desktop
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.42.0:5 >=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kemoticons-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kparts-5.42.0:5 >=kde-frameworks/kpeople-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-frameworks/sonnet-5.42.0:5 >=kde-plasma/kwin-5.12.1:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.9.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.42.0:5 >=kde-plasma/breeze-5.12.1:5 >=kde-plasma/kde-cli-tools-5.12.1:5 >=kde-plasma/oxygen-5.12.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.1:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-desktop-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=a433ed430627fca4740864834376dc04
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.0
deleted file mode 100644
index ae576c8f6d6b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/breeze-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libXcursor x11-libs/libxcb 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/breeze-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-integration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.1
new file mode 100644
index 000000000000..317bc3109926
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/breeze-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libXcursor x11-libs/libxcb 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-plasma/breeze-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-integration-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.0
deleted file mode 100644
index 2898c1aba908..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
-IUSE=bluetooth crypt +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.12.0:5 >=kde-plasma/drkonqi-5.12.0:5 >=kde-plasma/kactivitymanagerd-5.12.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 >=kde-plasma/kdecoration-5.12.0:5 >=kde-plasma/kdeplasma-addons-5.12.0:5 >=kde-plasma/kgamma-5.12.0:5 >=kde-plasma/khotkeys-5.12.0:5 >=kde-plasma/kinfocenter-5.12.0:5 >=kde-plasma/kmenuedit-5.12.0:5 >=kde-plasma/kscreen-5.12.0:5 >=kde-plasma/kscreenlocker-5.12.0:5 >=kde-plasma/ksshaskpass-5.12.0:5 >=kde-plasma/ksysguard-5.12.0:5 >=kde-plasma/kwayland-integration-5.12.0:5 >=kde-plasma/kwin-5.12.0:5 >=kde-plasma/kwrited-5.12.0:5 >=kde-plasma/libkscreen-5.12.0:5 >=kde-plasma/libksysguard-5.12.0:5 >=kde-plasma/milou-5.12.0:5 >=kde-plasma/oxygen-5.12.0:5 >=kde-plasma/plasma-desktop-5.12.0:5 >=kde-plasma/plasma-integration-5.12.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=kde-plasma/polkit-kde-agent-5.12.0:5 >=kde-plasma/powerdevil-5.12.0:5 >=kde-plasma/systemsettings-5.12.0:5 >=kde-plasma/user-manager-5.12.0:5 bluetooth? ( >=kde-plasma/bluedevil-5.12.0:5 ) crypt? ( >=kde-plasma/plasma-vault-5.12.0:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.12.0:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.12.0:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.12.0:5 >=kde-plasma/kde-gtk-config-5.12.0:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.12.0:5 ) pam? ( >=kde-plasma/kwallet-pam-5.12.0:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.12.0:5 >=kde-plasma/plymouth-kcm-5.12.0:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.0:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.12.0:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.12.0:5 )
-SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1499ef9e17bbd58d04f3f400c3875d20
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.1
new file mode 100644
index 000000000000..0229b2079b9d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.12.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
+IUSE=bluetooth crypt +display-manager grub gtk +handbook networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.12.1:5 >=kde-plasma/drkonqi-5.12.1:5 >=kde-plasma/kactivitymanagerd-5.12.1:5 >=kde-plasma/kde-cli-tools-5.12.1:5 >=kde-plasma/kdecoration-5.12.1:5 >=kde-plasma/kdeplasma-addons-5.12.1:5 >=kde-plasma/kgamma-5.12.1:5 >=kde-plasma/khotkeys-5.12.1:5 >=kde-plasma/kinfocenter-5.12.1:5 >=kde-plasma/kmenuedit-5.12.1:5 >=kde-plasma/kscreen-5.12.1:5 >=kde-plasma/kscreenlocker-5.12.1:5 >=kde-plasma/ksshaskpass-5.12.1:5 >=kde-plasma/ksysguard-5.12.1:5 >=kde-plasma/kwayland-integration-5.12.1:5 >=kde-plasma/kwin-5.12.1:5 >=kde-plasma/kwrited-5.12.1:5 >=kde-plasma/libkscreen-5.12.1:5 >=kde-plasma/libksysguard-5.12.1:5 >=kde-plasma/milou-5.12.1:5 >=kde-plasma/oxygen-5.12.1:5 >=kde-plasma/plasma-desktop-5.12.1:5 >=kde-plasma/plasma-integration-5.12.1:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=kde-plasma/polkit-kde-agent-5.12.1:5 >=kde-plasma/powerdevil-5.12.1:5 >=kde-plasma/systemsettings-5.12.1:5 >=kde-plasma/user-manager-5.12.1:5 bluetooth? ( >=kde-plasma/bluedevil-5.12.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.12.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.12.1:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.12.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.12.1:5 >=kde-plasma/kde-gtk-config-5.12.1:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.12.1:5 ) pam? ( >=kde-plasma/kwallet-pam-5.12.1:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.12.1:5 >=kde-plasma/plymouth-kcm-5.12.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.12.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.12.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.12.1:5 )
+SLOT=5
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	f969e0903765bc89fad95c1552831e5e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=1499ef9e17bbd58d04f3f400c3875d20
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.0
deleted file mode 100644
index 2022447615ec..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5[teamd=] >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.42.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=modemmanager openconnect teamd debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5[teamd=] >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.42.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.12.0:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-nm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=62d3576b4bfe31afb173c668d0e6a7df
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.1
new file mode 100644
index 000000000000..deea2ff26a8f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5[teamd=] >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.42.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=modemmanager openconnect teamd debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5[teamd=] >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.42.0:5 >=dev-qt/qtxml-5.9.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.9.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.12.1:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-nm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=62d3576b4bfe31afb173c668d0e6a7df
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.0
deleted file mode 100644
index 01809f8b7faf..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-pa-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f39cb635ae9089f4733931df18e86ecd
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.1
new file mode 100644
index 000000000000..5ce30bdf0597
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] 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.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-pa-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f39cb635ae9089f4733931df18e86ecd
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.0
deleted file mode 100644
index f1d385037399..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Useful applications for Plasma development
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.42.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-sdk-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.1
new file mode 100644
index 000000000000..d388868281e5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.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.42.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Useful applications for Plasma development
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.42.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-sdk-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.0
deleted file mode 100644
index 0cf2c5c0db80..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-plasma/libksysguard-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=6
-HOMEPAGE=https://www.kde.org/ http://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-plasma/libksysguard-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-vault-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=81e45a8f1df715de04f1c3f165bae8c5
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.1
new file mode 100644
index 000000000000..51325e688f1f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-plasma/libksysguard-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=6
+HOMEPAGE=https://www.kde.org/ http://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kcodecs-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-plasma/libksysguard-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=sys-fs/encfs-1.9.2 sys-fs/cryfs ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-vault-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=81e45a8f1df715de04f1c3f165bae8c5
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5
deleted file mode 100644
index b955a01ef5ff..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-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/kjs-5.40.0:5 >=kde-frameworks/kjsembed-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/kpackage-5.40.0:5 >=kde-frameworks/krunner-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/kwallet-5.40.0:5 >=kde-frameworks/kwayland-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/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=dev-qt/qtconcurrent-5.7.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.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=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-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/kjs-5.40.0:5 >=kde-frameworks/kjsembed-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/kpackage-5.40.0:5 >=kde-frameworks/krunner-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/kwallet-5.40.0:5 >=kde-frameworks/kwayland-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/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/ksysguard-5.11.5:5 >=kde-plasma/milou-5.11.5:5 >=kde-plasma/plasma-integration-5.11.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-workspace-5.11.5.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1fba2b16bddc1b0d09a9d72f90d891e
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5-r1
index b563972e8f81..f357134dc220 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-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/kjs-5.40.0:5 >=kde-frameworks/kjsembed-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/kpackage-5.40.0:5 >=kde-frameworks/krunner-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/kwallet-5.40.0:5 >=kde-frameworks/kwayland-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/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/ksysguard-5.11.5:5 >=kde-plasma/milou-5.11.5:5 >=kde-plasma/plasma-integration-5.11.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=gps? ( geolocation )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-workspace-5.11.5.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3736d8283618b114bb605326e1fd0437
+_md5_=47436d791fe9ccbf77b446b035a77789
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.0
deleted file mode 100644
index 0f0b6b6f8b9f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/kjs-5.42.0:5 >=kde-frameworks/kjsembed-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/kscreenlocker-5.12.0:5 >=kde-plasma/kwin-5.12.0:5 >=kde-plasma/libksysguard-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( || ( >=kde-frameworks/kholidays-5.42.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.42.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.42.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) >=dev-qt/qtconcurrent-5.9.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/kjs-5.42.0:5 >=kde-frameworks/kjsembed-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/kscreenlocker-5.12.0:5 >=kde-plasma/kwin-5.12.0:5 >=kde-plasma/libksysguard-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( || ( >=kde-frameworks/kholidays-5.42.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.42.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.42.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdesu-5.42.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.12.0:5 >=kde-plasma/ksysguard-5.12.0:5 >=kde-plasma/milou-5.12.0:5 >=kde-plasma/plasma-integration-5.12.0:5 >=dev-qt/qdbus-5.9.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtpaths-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-workspace-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2056226c635453dea6a9e4527b73ede5
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.1
new file mode 100644
index 000000000000..d58e9a1653b9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/kjs-5.42.0:5 >=kde-frameworks/kjsembed-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/kscreenlocker-5.12.1:5 >=kde-plasma/kwin-5.12.1:5 >=kde-plasma/libksysguard-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.42.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.42.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.42.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) >=dev-qt/qtconcurrent-5.9.1:5 x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kbookmarks-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/kguiaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemmodels-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kjobwidgets-5.42.0:5 >=kde-frameworks/kjs-5.42.0:5 >=kde-frameworks/kjsembed-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/krunner-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/ktexteditor-5.42.0:5 >=kde-frameworks/ktextwidgets-5.42.0:5 >=kde-frameworks/kwallet-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/plasma-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/kscreenlocker-5.12.1:5 >=kde-plasma/kwin-5.12.1:5 >=kde-plasma/libksysguard-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5[jpeg] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.42.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.42.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.42.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.42.0:5 ) >=kde-frameworks/kded-5.42.0:5 >=kde-frameworks/kdesu-5.42.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.12.1:5 >=kde-plasma/ksysguard-5.12.1:5 >=kde-plasma/milou-5.12.1:5 >=kde-plasma/plasma-integration-5.12.1:5 >=dev-qt/qdbus-5.9.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtpaths-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-workspace-5.12.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	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08fbffc978f5c2dfd6d52661abb55ca2
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.0
deleted file mode 100644
index efdc8c44bb2c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plasma-workspace-wallpapers-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=559e4cfa25aecf42bc8d9147eb1f8802
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.1
new file mode 100644
index 000000000000..2244705276ab
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.42.0:5 >=dev-qt/qtcore-5.9.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Additional wallpapers for the Plasma workspace
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plasma-workspace-wallpapers-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=559e4cfa25aecf42bc8d9147eb1f8802
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.0 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.0
deleted file mode 100644
index 17d331c4cc5f..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-boot/plymouth 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/plymouth-kcm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.1
new file mode 100644
index 000000000000..47c44515200a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-boot/plymouth 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/plymouth-kcm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.0 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.0
deleted file mode 100644
index 68cb3d1e3f93..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=kde-frameworks/polkit-qt-5.42.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=kde-frameworks/polkit-qt-5.42.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/polkit-kde-agent-1-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=bfa697d74b6fe8b1e700795e0b445a69
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.1
new file mode 100644
index 000000000000..73595c0513bc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=kde-frameworks/polkit-qt-5.42.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=6
+HOMEPAGE=https://www.kde.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 || ( >=kde-frameworks/polkit-qt-5.42.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/polkit-kde-agent-1-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=bfa697d74b6fe8b1e700795e0b445a69
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.0 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.0
deleted file mode 100644
index 8742b6d83df8..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5[policykit] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/libkscreen-5.12.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control consolekit +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5[policykit] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/libkscreen-5.12.0:5 >=kde-plasma/plasma-workspace-5.12.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5 ) >=kde-plasma/kde-cli-tools-5.12.0:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/powerdevil-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=aa78af440ae1719cbecc8161d6b334a2
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.12.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.12.1
new file mode 100644
index 000000000000..53d9b812a2fe
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5[policykit] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/libkscreen-5.12.1:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/powerdevil.git
+IUSE=brightness-control consolekit +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5[policykit] >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdelibs4support-5.42.0:5 >=kde-frameworks/kglobalaccel-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kidletime-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knotifications-5.42.0:5 >=kde-frameworks/knotifyconfig-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwayland-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=kde-frameworks/solid-5.42.0:5 >=kde-plasma/libkscreen-5.12.1:5 >=kde-plasma/plasma-workspace-5.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.42.0:5 >=kde-frameworks/networkmanager-qt-5.42.0:5 ) >=kde-plasma/kde-cli-tools-5.12.1:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/powerdevil-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=aa78af440ae1719cbecc8161d6b334a2
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.0 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.0
deleted file mode 100644
index f314ad0de7f3..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.0:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/sddm-kcm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.1
new file mode 100644
index 000000000000..fbf366675e02
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/knewstuff-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.12.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/sddm-kcm-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.12.0 b/metadata/md5-cache/kde-plasma/systemsettings-5.12.0
deleted file mode 100644
index 2eaad0825091..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=System settings utility
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-5.42.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.42.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/systemsettings-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f481e56f8f9c2ede17c226bdff8b19b4
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.12.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.12.1
new file mode 100644
index 000000000000..797d58cc4a55
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-5.42.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42.0:5 handbook? ( >=kde-frameworks/kdoctools-5.42.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=System settings utility
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=classic gtk debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.42.0:5 >=kde-frameworks/kactivities-stats-5.42.0:5 >=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kcompletion-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/kcrash-5.42.0:5 >=kde-frameworks/kdbusaddons-5.42.0:5 >=kde-frameworks/kdeclarative-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kitemviews-5.42.0:5 >=kde-frameworks/kpackage-5.42.0:5 >=kde-frameworks/kservice-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=kde-frameworks/kwindowsystem-5.42.0:5 >=kde-frameworks/kxmlgui-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 classic? ( >=kde-frameworks/khtml-5.42.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.42.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/systemsettings-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=f481e56f8f9c2ede17c226bdff8b19b4
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.12.0 b/metadata/md5-cache/kde-plasma/user-manager-5.12.0
deleted file mode 100644
index eefbc0b1358f..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/libpwquality-1.3.0 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.12.0/user-manager-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.12.1 b/metadata/md5-cache/kde-plasma/user-manager-5.12.1
new file mode 100644
index 000000000000..277ea521881e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/libpwquality-1.3.0 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.42.0:5 >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple system settings module to manage the users of your system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.42.0:5 >=kde-frameworks/kcmutils-5.42.0:5 >=kde-frameworks/kconfig-5.42.0:5 >=kde-frameworks/kconfigwidgets-5.42.0:5 >=kde-frameworks/kcoreaddons-5.42.0:5 >=kde-frameworks/ki18n-5.42.0:5 >=kde-frameworks/kiconthemes-5.42.0:5 >=kde-frameworks/kio-5.42.0:5 >=kde-frameworks/kwidgetsaddons-5.42.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.12.1/user-manager-5.12.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	f969e0903765bc89fad95c1552831e5e	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_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 4a593fdb98b8..f06ea88875f5 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5 b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
index f2accadf5b30..76ec7a7d3cc7 100644
--- a/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
+++ b/metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r5
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Meta ebuild for LXDE, the Lightweight X11 Desktop Environment
 EAPI=6
 HOMEPAGE=http://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc x86
 LICENSE=metapackage
 RDEPEND=>=lxde-base/menu-cache-0.3.3 >=lxde-base/lxappearance-0.5.5 >=lxde-base/lxde-icon-theme-0.5.0 >=lxde-base/lxde-common-0.5.5 >=lxde-base/lxmenu-data-0.1.4 >=lxde-base/lxinput-0.3.2 >=lxde-base/lxpanel-0.5.10 >=lxde-base/lxrandr-0.1.2 >=lxde-base/lxsession-0.5.2 || ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* ) >=lxde-base/lxtask-0.1.6 >=lxde-base/lxterminal-0.1.11 media-gfx/gpicview x11-misc/pcmanfm x11-wm/openbox >=x11-misc/obconf-2.0.3_p20111019
 SLOT=0
-_md5_=bdfe64ec2cf3ba0bea74cff922d8e664
+_md5_=d3e60f45c527fb6560844b26fcefdff1
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 38cf1889e696..1304451bf45e 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/afew-1.3.0 b/metadata/md5-cache/mail-filter/afew-1.3.0
new file mode 100644
index 000000000000..fa18c433afd7
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/afew-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_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(+)?]
+DESCRIPTION=Initial tagging script for Notmuch
+EAPI=6
+HOMEPAGE=https://github.com/afewmail/afew
+IUSE=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 ~x86
+LICENSE=ISC
+RDEPEND=dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dkimpy[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(+)?] net-mail/notmuch[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/afew/afew-1.3.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2fdbc3b00d84c3c2581054bdc5f5e473
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 9377be2dbc8c..47454d4e0848 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.18.1-r1 b/metadata/md5-cache/mate-base/mate-applets-1.18.1-r1
deleted file mode 100644
index cf840a7c35df..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.18.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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 !<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 >=mate-base/mate-common-1.18
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-applets-1.18.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	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a63201479137c5d661e3ebbfdcf40c2
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.18.2 b/metadata/md5-cache/mate-base/mate-applets-1.18.2
index e242ffa89336..5d952b2b4eeb 100644
--- a/metadata/md5-cache/mate-base/mate-applets-1.18.2
+++ b/metadata/md5-cache/mate-base/mate-applets-1.18.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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 !<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 >=mate-base/mate-common-1.18
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 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 !<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 >=mate-base/mate-common-1.18
 DESCRIPTION=Applets for the MATE Desktop and Panel
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
 IUSE=X ipv6 policykit +upower python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 <sys-power/cpupower-4.7 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-applets-1.18.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	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44803210120aecc19a26e4b7e171b495
+_md5_=14dea66dbf82d3a3e4115df67a197562
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 23b34d4f46a4..1b87a4ffe41d 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/courier-prime-1.203 b/metadata/md5-cache/media-fonts/courier-prime-1.203
index 8bddada83e80..c011b5a0bb66 100644
--- a/metadata/md5-cache/media-fonts/courier-prime-1.203
+++ b/metadata/md5-cache/media-fonts/courier-prime-1.203
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/courier-prime-1.203.tar.xz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/courier-prime-1.203.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c5ed4d9cf7073c55b4d942cce9a1c485
+_md5_=8810e5cdeaf0230c06015e08d4132a99
diff --git a/metadata/md5-cache/media-fonts/dina-2.89 b/metadata/md5-cache/media-fonts/dina-2.89
index 2e514bc98686..2fa45224468e 100644
--- a/metadata/md5-cache/media-fonts/dina-2.89
+++ b/metadata/md5-cache/media-fonts/dina-2.89
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=Dina
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/dina-pcf-2.89.tar.gz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/dina-pcf-2.89.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f394b688617a719dddbcbb21033a2b78
+_md5_=de6d678d6311f46ee5e2da25b6523851
diff --git a/metadata/md5-cache/media-fonts/exo-2 b/metadata/md5-cache/media-fonts/exo-2
index b5557f84265e..26c83c6c3fd7 100644
--- a/metadata/md5-cache/media-fonts/exo-2
+++ b/metadata/md5-cache/media-fonts/exo-2
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/exo-2.tar.xz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/exo-2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=22a54439ca2d0c516963c103e576ac59
+_md5_=4cdd8f9bab7eff08f9946348544455da
diff --git a/metadata/md5-cache/media-fonts/gidole-2.0.2 b/metadata/md5-cache/media-fonts/gidole-2.0.2
index ba6e46e9e6c3..beb97abbd69a 100644
--- a/metadata/md5-cache/media-fonts/gidole-2.0.2
+++ b/metadata/md5-cache/media-fonts/gidole-2.0.2
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=amd64 arm x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/gidole-2.0.2.zip
+SRC_URI=https://dev.gentoo.org/~jstein/dist/gidole-2.0.2.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=80f5ee4cfcf20be022b3092d0d1da884
+_md5_=8aec401f733e5d56d916b5c5c368bc92
diff --git a/metadata/md5-cache/media-fonts/inconsolata-20140821 b/metadata/md5-cache/media-fonts/inconsolata-20140821
index 9ab43b771ba8..1acc01b747f3 100644
--- a/metadata/md5-cache/media-fonts/inconsolata-20140821
+++ b/metadata/md5-cache/media-fonts/inconsolata-20140821
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A beautiful sans-serif monotype font designed for code listings
+DESCRIPTION=A sans-serif monotype font for code listings
 EAPI=5
 HOMEPAGE=https://fonts.google.com/specimen/Inconsolata
 IUSE=X
@@ -8,6 +8,6 @@ KEYWORDS=amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/inconsolata-20140821.tar.xz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/inconsolata-20140821.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cc44dc75d332ac0bf4719e1a0e53d2f3
+_md5_=bf6d59435025b5d8e042b2a6f758b3e6
diff --git a/metadata/md5-cache/media-fonts/nunito-1.0 b/metadata/md5-cache/media-fonts/nunito-1.0
deleted file mode 100644
index 4e8f2dc6a3b2..000000000000
--- a/metadata/md5-cache/media-fonts/nunito-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A well balanced Sans Serif with rounded terminals
-EAPI=4
-HOMEPAGE=https://www.google.com/webfonts/specimen/Nunito https://code.google.com/p/googlefontdirectory/source/browse/nunito
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/nunito-1.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7a13159d8a1e336bb887cc9abc844c51
diff --git a/metadata/md5-cache/media-fonts/nunito-1.0-r1 b/metadata/md5-cache/media-fonts/nunito-1.0-r1
new file mode 100644
index 000000000000..2f2ee142ca45
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/nunito-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=A Sans Serif font with rounded terminals
+EAPI=6
+HOMEPAGE=https://www.google.com/webfonts/specimen/Nunito https://github.com/vernnobile/NunitoFont
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jstein/dist/nunito-1.0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f5999cfaed84c9c9469b7024159076aa
diff --git a/metadata/md5-cache/media-fonts/open-sans-1 b/metadata/md5-cache/media-fonts/open-sans-1
index 7702610aa751..fb1d48383ea3 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1
+++ b/metadata/md5-cache/media-fonts/open-sans-1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A clean and modern sans-serif typeface designed for legibility across interfaces
+DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
 EAPI=5
 HOMEPAGE=http://www.opensans.com/
 IUSE=X
 KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/open-sans-1.zip
+SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=88c332aac78992513eb377c01eaa0531
+_md5_=99c68452e250a242aeb7574f4fd65abd
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
new file mode 100644
index 000000000000..00736b9d1201
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across interfaces
+EAPI=6
+HOMEPAGE=http://www.opensans.com/
+IUSE=X
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1f68496ebae73e33d6eeac86a78fed63
diff --git a/metadata/md5-cache/media-fonts/proggy-fonts-1 b/metadata/md5-cache/media-fonts/proggy-fonts-1
index f4f446810472..85c2d4cf86c6 100644
--- a/metadata/md5-cache/media-fonts/proggy-fonts-1
+++ b/metadata/md5-cache/media-fonts/proggy-fonts-1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=A set of monospaced bitmap programming fonts
 EAPI=0
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+HOMEPAGE=http://upperbounds.net/ https://proggyfonts.net/
 IUSE=X
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=mirror://gentoo/proggy-fonts-1.tar.bz2
+SRC_URI=https://dev.gentoo.org/~jstein/dist/proggy-fonts-1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d7c12153a3b23118c22bb2335a3d745
+_md5_=29ba740d50006d6970ae0cd83444db61
diff --git a/metadata/md5-cache/media-fonts/viga-1 b/metadata/md5-cache/media-fonts/viga-1
index 8628776b5fda..6f221ffbef12 100644
--- a/metadata/md5-cache/media-fonts/viga-1
+++ b/metadata/md5-cache/media-fonts/viga-1
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/viga-1.tar.xz
+SRC_URI=https://dev.gentoo.org/~jstein/dist/viga-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd35652b911f3b78c584f75ec20d4fc9
+_md5_=73fac878ccc92e891765042bdf573883
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7a2e176b5fd9..01fbaed7f3cb 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/feh-2.23.2 b/metadata/md5-cache/media-gfx/feh-2.23.2
new file mode 100644
index 000000000000..7cfc4d1c2de3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-2.23.2
@@ -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.2.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2d525eeb59c8c016ee2286e5fd951ee2
diff --git a/metadata/md5-cache/media-gfx/figurine-1.0.5-r1 b/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
index d1de48414821..bc8a6d76488d 100644
--- a/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
+++ b/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
@@ -3,8 +3,8 @@ DEPEND=>=media-gfx/transfig-3.2
 DESCRIPTION=A vector based graphics editor similar to xfig, but simpler
 EAPI=6
 HOMEPAGE=http://figurine.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/figurine/figurine-1.0.5.tar.gz
-_md5_=1c972298886222d1b260b85c2d02cfb5
+_md5_=5ccc0aafb4459a60519caac0b5f95c78
diff --git a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1 b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
index 0453c7e8153e..fb8a00eb6012 100644
--- a/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/libopenraw-0.1.0[gtk] >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/g
 DESCRIPTION=A lightweight and fast raw image thumbnailer for GNOME
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/RawThumbnailer
-KEYWORDS=~amd64 ia64 ~x86
+KEYWORDS=~amd64 ia64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libopenraw-0.1.0[gtk] >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/glib-2.26:2 !media-gfx/raw-thumbnailer
 SLOT=0
 SRC_URI=https://libopenraw.freedesktop.org/download/raw-thumbnailer-3.0.0.tar.bz2
 _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_=5cfee42f44acf4179ed505b2d2fb29a4
+_md5_=9ba6147a7ff1042c56167b06ba2f5019
diff --git a/metadata/md5-cache/media-gfx/icoutils-0.32.2 b/metadata/md5-cache/media-gfx/icoutils-0.32.2
new file mode 100644
index 000000000000..82a5e5b10403
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/icoutils-0.32.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=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=Tools to extract and convert images in icon and cursor files (.ico, .cur)
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/icoutils/
+IUSE=nls
+KEYWORDS=~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 media-libs/libpng:0 sys-libs/zlib nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://nongnu/icoutils/icoutils-0.32.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	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=034eb8de42f2db872ce8ef5a9905e4cf
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.0.0 b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
deleted file mode 100644
index 4a00f5067c4b..000000000000
--- a/metadata/md5-cache/media-gfx/kxstitch-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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 !media-gfx/kxstitch:4 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.0.0/src/kxstitch-2.0.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	f969e0903765bc89fad95c1552831e5e	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_=f1552ceba0038a1bc114f4e60631bf8c
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.1.0 b/metadata/md5-cache/media-gfx/kxstitch-2.1.0
deleted file mode 100644
index b04209f79cfb..000000000000
--- a/metadata/md5-cache/media-gfx/kxstitch-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.0/kxstitch-2.1.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	f969e0903765bc89fad95c1552831e5e	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/pictureflow-0.1.0 b/metadata/md5-cache/media-gfx/pictureflow-0.1.0
deleted file mode 100644
index 78060ea64cfc..000000000000
--- a/metadata/md5-cache/media-gfx/pictureflow-0.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=Qt widget to display images with animated transition effect
-EAPI=2
-HOMEPAGE=http://www.qt-apps.org/content/show.php/PictureFlow?content=75348
-IUSE=debug
-KEYWORDS=amd64 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://pictureflow.googlecode.com/files/pictureflow-0.1.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=42ab9871e7ef9b81f73115798a560211
diff --git a/metadata/md5-cache/media-gfx/potrace-1.13 b/metadata/md5-cache/media-gfx/potrace-1.13
deleted file mode 100644
index b9912dff2b15..000000000000
--- a/metadata/md5-cache/media-gfx/potrace-1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib >=app-portage/elt-patches-20170422
-DESCRIPTION=Transforming bitmaps into vector graphics
-EAPI=5
-HOMEPAGE=http://potrace.sourceforge.net/
-IUSE=metric static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=http://potrace.sourceforge.net/download/1.13/potrace-1.13.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_=3144ec483b4d4400e06f0906fbe9c695
diff --git a/metadata/md5-cache/media-gfx/quat-1.20-r1 b/metadata/md5-cache/media-gfx/quat-1.20-r1
index fd2c7694b524..d3377e142201 100644
--- a/metadata/md5-cache/media-gfx/quat-1.20-r1
+++ b/metadata/md5-cache/media-gfx/quat-1.20-r1
@@ -4,8 +4,8 @@ DESCRIPTION=A 3D quaternionic fractal generator
 EAPI=6
 HOMEPAGE=http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html
 IUSE=X debug
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.physcip.uni-stuttgart.de/phy11733/download/quat-1.20.tar.gz
-_md5_=a95511c2c5847fbbc20b1af944601ccc
+_md5_=960fcbfc30a16d2fac7c1b37b103a25f
diff --git a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1 b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
index 9b3586782853..11a896f78cb8 100644
--- a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
+++ b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-t
 DESCRIPTION=A lightweight and fast raw image thumbnailer
 EAPI=6
 HOMEPAGE=https://github.com/erlendd/raw-thumbnailer
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
 SLOT=0
 SRC_URI=https://raw-thumbnailer.googlecode.com/files/raw-thumbnailer-0.2.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f81feb364d5a1ac2be720684a3c2dd0e
+_md5_=98244efeeb702a518e3bf0dff01d8206
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.26.4 b/metadata/md5-cache/media-gfx/shotwell-0.26.4
index 1cfb1115dc1c..5906e201a11b 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.26.4
+++ b/metadata/md5-cache/media-gfx/shotwell-0.26.4
@@ -3,10 +3,10 @@ DEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >
 DESCRIPTION=Open source photo manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3[gtk] >=dev-db/sqlite-3.5.9:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 gnome-base/dconf >=media-libs/gexiv2-0.10.4 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.5:= >=media-libs/libraw-0.13.2:= media-plugins/gst-plugins-gdkpixbuf:1.0 >=net-libs/libsoup-2.42.0:2.4 net-libs/webkit-gtk:4 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.14.0:3[X] dev-libs/libgdata
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.26/shotwell-0.26.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_=7f97db972ecf3d8b385159dcb262ddad
+_md5_=8eebfabb293f5e42854fc60c86809121
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7d5386ef149d..73d8654bd689 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/blib-1.1.7-r2 b/metadata/md5-cache/media-libs/blib-1.1.7-r2
new file mode 100644
index 000000000000..592d471c4e35
--- /dev/null
+++ b/metadata/md5-cache/media-libs/blib-1.1.7-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2:2 aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 ) virtual/pkgconfig
+DESCRIPTION=blib is a library full of useful things to hack the Blinkenlights
+EAPI=6
+HOMEPAGE=http://www.blinkenlights.de
+IUSE=aalib gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:2 aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+SLOT=0
+SRC_URI=http://www.blinkenlights.de/dist/blib-1.1.7.tar.gz
+_md5_=e0a8fe174dd8f4fd7a11137c5b619453
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index 31e742449c4e..a5d8a9c53a8d 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.6
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a313cd8c01c0d8aaf204f982d23f3ed4
+_md5_=75c4e4cb0c5022e80a4f8aabba5c0204
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.91 b/metadata/md5-cache/media-libs/fontconfig-2.12.91
deleted file mode 100644
index 9a25ce12e2cc..000000000000
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) >=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=A library for configuring and customizing font access
-EAPI=6
-HOMEPAGE=http://fontconfig.org/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=MIT
-PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
-RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=1.0
-SRC_URI=http://fontconfig.org/release/fontconfig-2.12.91.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=019e278355934749823a9e31e4490fe8
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.92 b/metadata/md5-cache/media-libs/fontconfig-2.12.92
new file mode 100644
index 000000000000..f5aba9fea784
--- /dev/null
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.92
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) virtual/pkgconfig doc? ( =app-text/docbook-sgml-dtd-3.1* app-text/docbook-sgml-utils[jadetex] ) >=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=A library for configuring and customizing font access
+EAPI=6
+HOMEPAGE=http://fontconfig.org/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=MIT
+PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+SLOT=1.0
+SRC_URI=http://fontconfig.org/release/fontconfig-2.12.92.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2ae76d8fd7b7a55031b4b14967e5843d
diff --git a/metadata/md5-cache/media-libs/fontconfig-infinality-20120619 b/metadata/md5-cache/media-libs/fontconfig-infinality-20120619
index de22b0d70d5a..317bac4ba4b8 100644
--- a/metadata/md5-cache/media-libs/fontconfig-infinality-20120619
+++ b/metadata/md5-cache/media-libs/fontconfig-infinality-20120619
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst
-DESCRIPTION=Configuration to be used in conjunction with the freetype-infinality subpixel hinting
+DESCRIPTION=Configuration for freetype-infinality subpixel hinting
 EAPI=4
 HOMEPAGE=http://www.infinality.net/blog/infinality-freetype-patches/
 IUSE=+nyx
@@ -8,5 +8,5 @@ LICENSE=MIT
 PDEPEND=media-libs/freetype:2[infinality]
 RDEPEND=app-eselect/eselect-fontconfig app-eselect/eselect-infinality app-eselect/eselect-lcdfilter >=x11-libs/libXft-2.3.0 nyx? ( media-fonts/croscorefonts )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/fontconfig-infinality-20120619.tar.xz nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-1.tar.xz )
-_md5_=1ab88b59afad0a311bf623961b2231c0
+SRC_URI=https://dev.gentoo.org/~jstein/dist/fontconfig-infinality-20120619.tar.xz nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-1.tar.xz )
+_md5_=b1ee588603c4613e37a203c091a669ea
diff --git a/metadata/md5-cache/media-libs/fontconfig-infinality-20130404 b/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
index cb891bc941b1..20ca14a2c5f6 100644
--- a/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
+++ b/metadata/md5-cache/media-libs/fontconfig-infinality-20130404
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst
-DESCRIPTION=Configuration to be used in conjunction with the freetype-infinality subpixel hinting
+DESCRIPTION=Configuration for freetype-infinality subpixel hinting
 EAPI=5
 HOMEPAGE=http://www.infinality.net/blog/infinality-freetype-patches/
 IUSE=+nyx
@@ -8,6 +8,6 @@ LICENSE=MIT
 PDEPEND=media-libs/freetype:2[infinality] >=x11-libs/libXft-2.3.0 nyx? ( media-fonts/croscorefonts )
 RDEPEND=app-eselect/eselect-fontconfig app-eselect/eselect-infinality app-eselect/eselect-lcdfilter
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/fontconfig-infinality-20130404.tar.xz nyx? ( https://dev.gentoo.org/~yngwin/distfiles/fontconfig-nyx-2.tar.xz )
+SRC_URI=https://dev.gentoo.org/~jstein/dist/fontconfig-infinality-20130404.tar.xz nyx? ( https://dev.gentoo.org/~jstein/dist/fontconfig-nyx-2.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d4e06f466b02ffba15c30653fc84311b
+_md5_=4779ff1cf987f9fc059358369de788b2
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
new file mode 100644
index 000000000000..3ca8412cbe05
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install 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 ) >=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-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) dev-libs/gobject-introspection-common virtual/pkgconfig
+DESCRIPTION=GObject-based wrapper around the Exiv2 library
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
+IUSE=introspection python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a0f9bc2a70f48028f4a8f69d92c99e5f
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.6 b/metadata/md5-cache/media-libs/gexiv2-0.10.6
index 9dc67d32194c..1888ff38c969 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.6
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install 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 ) >=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-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) 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
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) dev-libs/gobject-introspection-common 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=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_target
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ea0ae617d2794601aadac036f4ff704
+_md5_=f4c025f0277ec710ee19a3d24746b9f8
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.8 b/metadata/md5-cache/media-libs/gexiv2-0.10.8
index 5c367ea7f18d..4f263682c486 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.8
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install 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 ) >=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-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) 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
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) test? ( dev-python/pygobject media-gfx/exiv2[xmp] ) dev-libs/gobject-introspection-common 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=GObject-based wrapper around the Exiv2 library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
-REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python ) vala? ( introspection )
+REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b844d2c96e5a276a1c9fac4df76018d4
+_md5_=17303c3c020b7f9497ebff9854025006
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4
new file mode 100644
index 000000000000..3cb936e51c6e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.12.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,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/wayland-protocols-1.4 ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Less plugins for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,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/wayland-protocols-1.4 ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=gles2? ( !opengl ) opengl? ( X ) wayland? ( egl ) egl? ( || ( opengl gles2 ) )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89dd2cd74d55b3f6f37fc3bb358fcc3d
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.12.4 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.12.4
new file mode 100644
index 000000000000..ebfa0a5ad715
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.12.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,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-1.31.1:= ) >=dev-libs/check-0.9.2 >=dev-util/gtk-doc-am-1.12 test? ( >=media-libs/gst-plugins-bad-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A GStreamer based RTSP server
+EAPI=6
+HOMEPAGE=https://people.freedesktop.org/~wtay/
+IUSE=examples +introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,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-1.31.1:= ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=03de1d2634b18c43e5f09deaef11314f
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.12.4 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.12.4
new file mode 100644
index 000000000000..a907e5d08a93
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.12.4
@@ -0,0 +1,15 @@
+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/glib-2.40.0:2 dev-libs/libxml2:2 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(-)] >=media-libs/gstreamer-1.12.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.12.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) >=dev-util/gtk-doc-am-1.3 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=SDK for making video editors and more
+EAPI=6
+HOMEPAGE=http://wiki.pitivi.org/wiki/GES
+IUSE=+introspection python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-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/glib-2.40.0:2 dev-libs/libxml2:2 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(-)] >=media-libs/gstreamer-1.12.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.12.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) media-libs/gnonlin:1.0
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.12.4.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=c56329d71a45012a5b567c92887b68e5
diff --git a/metadata/md5-cache/media-libs/leptonica-1.75.2 b/metadata/md5-cache/media-libs/leptonica-1.75.2
new file mode 100644
index 000000000000..82739f3a8a46
--- /dev/null
+++ b/metadata/md5-cache/media-libs/leptonica-1.75.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gif? ( >=media-libs/giflib-5.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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/openjpeg: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(-)?] ) png? ( media-libs/libpng: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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( media-libs/tiff:0[zlib] )
+DESCRIPTION=C library for image processing and analysis
+EAPI=6
+HOMEPAGE=http://www.leptonica.org/
+IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+LICENSE=Apache-2.0
+RDEPEND=gif? ( >=media-libs/giflib-5.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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/openjpeg: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(-)?] ) png? ( media-libs/libpng: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:=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg png tiff zlib )
+SLOT=0/5
+SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.75.2/leptonica-1.75.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=41f098f7fe03e9695ee716225c1cb02a
diff --git a/metadata/md5-cache/media-libs/libebur128-1.2.3 b/metadata/md5-cache/media-libs/libebur128-1.2.3
index 36878798aec4..0b158b6890da 100644
--- a/metadata/md5-cache/media-libs/libebur128-1.2.3
+++ b/metadata/md5-cache/media-libs/libebur128-1.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=A library implementing the EBU R128 loudness standard
 EAPI=6
 HOMEPAGE=https://github.com/jiixyj/libebur128
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=https://github.com/jiixyj/libebur128/archive/v1.2.3.tar.gz -> libebur128-1.2.3.tar.gz test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv05.zip )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	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	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4bf2ef785cb613123a1db25b98d7d6cd
+_md5_=e017cd02adecd3ae3de39dec82f882ae
diff --git a/metadata/md5-cache/media-libs/libopenraw-0.1.2 b/metadata/md5-cache/media-libs/libopenraw-0.1.2
index 4879f91e4123..343f2e7782f2 100644
--- a/metadata/md5-cache/media-libs/libopenraw-0.1.2
+++ b/metadata/md5-cache/media-libs/libopenraw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A decoding library for RAW image formats
 EAPI=6
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/
 IUSE=gtk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/libxml2 virtual/jpeg:0 gtk? ( dev-libs/glib:2 >=x11-libs/gdk-pixbuf-2.24.0:2 )
 SLOT=0/7
 SRC_URI=https://libopenraw.freedesktop.org/download/libopenraw-0.1.2.tar.bz2
 _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_=af766750a6b5e5ad4bd9d22aaace8e30
+_md5_=77d78fdb96ad5d225edb4e45aafdd0cb
diff --git a/metadata/md5-cache/media-libs/mlt-6.4.1-r6 b/metadata/md5-cache/media-libs/mlt-6.4.1-r6
index 46d7241dfe9d..6d9375cd922a 100644
--- a/metadata/md5-cache/media-libs/mlt-6.4.1-r6
+++ b/metadata/md5-cache/media-libs/mlt-6.4.1-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=6
 HOMEPAGE=https://www.mltframework.org/
 IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( media-video/libav:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) 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(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( media-libs/rtaudio kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl,video] >=media-libs/sdl-image-1.2.4 ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) !media-libs/mlt++
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/archive/v6.4.1.tar.gz -> mlt-6.4.1.tar.gz
 _eclasses_=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	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8ff7593dbbc07b7945f1902da0de9552
+_md5_=b4b9c0555e2cb11882d2935abee3cb6c
diff --git a/metadata/md5-cache/media-libs/phat-0.4.1-r1 b/metadata/md5-cache/media-libs/phat-0.4.1-r1
index 23f17c2926f0..f0dfc77b8aa9 100644
--- a/metadata/md5-cache/media-libs/phat-0.4.1-r1
+++ b/metadata/md5-cache/media-libs/phat-0.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PHAT is a collection of GTK+ widgets geared toward pro-audio apps
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/phat.berlios/
 IUSE=debug
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 gnome-base/libgnomecanvas
 SLOT=0
 SRC_URI=mirror://sourceforge/phat.berlios/phat-0.4.1.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_=a99fb308802f5433014b0352767c5b5b
+_md5_=c4efba92e771c81a933c89ab79e3d18a
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9-r1 b/metadata/md5-cache/media-libs/xine-lib-1.2.9-r1
new file mode 100644
index 000000000000..6410a708f973
--- /dev/null
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) nls? ( sys-devel/gettext ) app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Core libraries for Xine movie player
+EAPI=6
+HOMEPAGE=http://xine.sourceforge.net/
+IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc nls
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
+SLOT=1
+SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.9.tar.xz
+_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_=acb23d9d5cf7c094bcdf4b2dc931f849
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 2cca94877bc9..a2c7d1a1c685 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) 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 dev-vcs/mercurial
+DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) 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 dev-vcs/mercurial
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=6
 HOMEPAGE=http://xine.sourceforge.net/
-IUSE=a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc
+IUSE=a52 aac aalib +alsa altivec bluray +css dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc
 LICENSE=GPL-2
-RDEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+RDEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=373b2f4d4a9b5c22486f44b0cb83cc04
+_md5_=1f6856d8a20c00aca4ddb70d426bdbaa
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 4fee2547f03b..7f76b9768981 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4
new file mode 100644
index 000000000000..664ba076e26b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libass-0.10.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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=07b2479ecea684c984d659d38217162d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.12.4
new file mode 100644
index 000000000000..c0bbe2c1120e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gdbus-codegen >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AVDTP source/sink and A2DP sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=51b642c2b31a8fd206be8198b318d369
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.12.4
new file mode 100644
index 000000000000..6b68b9e27c5f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=bs2b elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bdca409278716fd7fea776411bdb5225
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.12.4
new file mode 100644
index 000000000000..4f87fc43d8d8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.1-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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG-DASH plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d98d3c6257afba1853fd566d62ba728c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.12.4
new file mode 100644
index 000000000000..e5146dccc030
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DTLS encoder/decoder with SRTP support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=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
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c51f50a92ed8d776e33fdaf846f32f1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.12.4
new file mode 100644
index 000000000000..1b980730eeca
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DTS audio decoder plugin for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e95be237eab285042fc95e38d273167
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4
new file mode 100644
index 000000000000..2e85eef1d7c3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/os-headers >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a6b893249d03ec1033114fe932ea1259
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4
new file mode 100644
index 000000000000..06b4680a0ac1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC audio encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=32c3ae60c16c9bce66a3ac2d2f1a0947
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4
new file mode 100644
index 000000000000..a581a96eca49
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC audio decoder plugin.
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3e98f4dbcbca27526000171e3fd9c6b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.12.4
new file mode 100644
index 000000000000..0ade411e8c9f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/nettle: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-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=HTTP live streaming plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/nettle: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d05412a938e3a29c49e030f7268129b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.12.4
new file mode 100644
index 000000000000..0814bb2e7295
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Kate overlay codec suppport plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc4b3cbe6199001260d428b814cb859c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.4
new file mode 100644
index 000000000000..9edb8df9edbe
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Ladspa elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a340246d9c8f17d20487c23cd41004c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5
deleted file mode 100644
index 7492bc0d82a3..000000000000
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.10.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.10.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-3.2.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=FFmpeg based gstreamer plugin
-EAPI=6
-HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
-IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.10.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.10.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-3.2.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=1.0
-SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.5.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=77c35b1028b6fe9d5830865efa7889a2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4
new file mode 100644
index 000000000000..5f3297ce4f1c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=FFmpeg based gstreamer plugin
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
+IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 app-arch/xz-utils >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-3.2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=53d1053ae21f9d89804051f6d97c9169
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.12.4
new file mode 100644
index 000000000000..b9422841f228
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.265 decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=152e1cc3cda361436bfa287bbc5ed08a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4
new file mode 100644
index 000000000000..78af0b08df94
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d22142e1a64b44fb24da2750cd096d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.12.4
new file mode 100644
index 000000000000..983c2cef8a91
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Lv2 elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9954a51b4a429ce79df84829ee24dab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4
new file mode 100644
index 000000000000..b7d1c9a7bd87
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MOD audio decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83e9a6d487f10ea3c2b326939f235e39
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.12.4
new file mode 100644
index 000000000000..2aa396b68693
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG-1/2 video encoding plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=221f5207cdeb21c5a39a0dddcccdace3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.12.4
new file mode 100644
index 000000000000..0e2febd2c7fb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4be0be746e3380d27771a16bbc9c1307
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4
new file mode 100644
index 000000000000..b0127a9d05a6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-libs/neon-0.30.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-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=HTTP client source plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/neon-0.30.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=925ca5644fe6a3ef29cfe8ffdd1604a9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.12.4
new file mode 100644
index 000000000000..f1abb805d631
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MusicIP audio fingerprinting plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=059120661418b415ed87e41676a5030a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.12.4
new file mode 100644
index 000000000000..065cb01ebbe6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,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/opencv-3.3.1 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=OpenCV elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,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/opencv-3.3.1 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4ad288b8aa8113dc149a248a08237a36
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.12.4
new file mode 100644
index 000000000000..d542c10984ef
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=718bb37e23975e4a26d59b24c186482b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4
new file mode 100644
index 000000000000..b20084b02786
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DVD playback support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31e44d5926eea9a54c73624d7118e7cc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.12.4
new file mode 100644
index 000000000000..fdcb96416b96
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=RTMP source/sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=319f8eb617505aadcca18705802c93fc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.12.4
new file mode 100644
index 000000000000..e8d235f146c9
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Dirac encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=823198135c46c622b84c48513ec1145b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.12.4
new file mode 100644
index 000000000000..b467ec2dcb55
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.1-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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Smooth Streaming plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af77e65b692cf0bbbe93d0858056c078
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.12.4
new file mode 100644
index 000000000000..be4fd488eae8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsoundtouch-1.7.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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsoundtouch-1.7.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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6bad2d9502ff835ebfeb32e009aa6098
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.12.4
new file mode 100644
index 000000000000..d39edb2b872f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=net-libs/libsrtp: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-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libsrtp: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db351c71e4f889430c6c84a1d0c44117
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.12.4
new file mode 100644
index 000000000000..547e4f44bb2a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libusb: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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libusb: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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=94fb84c8462730ff6a12919782eaf437
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.12.4
new file mode 100644
index 000000000000..a5455a2cdeb1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca613cee763931f95691426df889afd9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.12.4
new file mode 100644
index 000000000000..cd36d6a29783
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AMR-WB audio encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c7427ef1b7ec88286bf799567d6017ef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.12.4
new file mode 100644
index 000000000000..17524599fe6b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.265 encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,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.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=facfab39b25b8b18589c0509955453b3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.12.4
new file mode 100644
index 000000000000..f787df3e06c4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Bar codes detection in video streams for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.12.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gstreamer	623bbf37a581925fc4022a0874d7a6e8	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3bfe982a7afbaec431c22b063695074a
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.10 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.10
deleted file mode 100644
index 8ba2fd673fee..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/v2.0.10.tar.gz -> kodi-inputstream-adaptive-2.0.10.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	kodi-addon	0e7c54e54339006ad4f8a6cc2d67191c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dcc1550b08b72c4ab20f7f9e2cff30f
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
new file mode 100644
index 000000000000..64e3cc3e25f9
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz-9af21218a87572bd4ab8d8d660c11f6295144f97 -> kodi-inputstream-adaptive-2.0.19.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	kodi-addon	0e7c54e54339006ad4f8a6cc2d67191c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e51800f113309b2e267c0ab32bad8319
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0 b/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
deleted file mode 100644
index 20079519a0f5..000000000000
--- a/metadata/md5-cache/media-plugins/npapi-vlc-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/xz-utils >=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] virtual/pkgconfig >=net-misc/npapi-sdk-0.27
-DESCRIPTION=Mozilla plugin based on VLC
-EAPI=6
-HOMEPAGE=http://www.videolan.org/
-IUSE=gtk
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
-SLOT=0
-SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.0.0/npapi-vlc-2.0.0.tar.xz
-_md5_=277363f8ecdd1343ba03282c838480db
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-9999 b/metadata/md5-cache/media-plugins/npapi-vlc-9999
deleted file mode 100644
index 9d7cb6541686..000000000000
--- a/metadata/md5-cache/media-plugins/npapi-vlc-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] virtual/pkgconfig >=net-misc/npapi-sdk-0.27 >=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 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Mozilla plugin based on VLC
-EAPI=6
-HOMEPAGE=http://www.videolan.org/
-IUSE=gtk
-LICENSE=LGPL-2.1
-RDEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
-SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7552a9c751f32fc0e63daca046f3c8da
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index ce1cdd0a9a86..68342c0a3dbe 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/svxlink-17.12.1 b/metadata/md5-cache/media-radio/svxlink-17.12.1
index 45c8314d5b7a..671dcf28b68d 100644
--- a/metadata/md5-cache/media-radio/svxlink-17.12.1
+++ b/metadata/md5-cache/media-radio/svxlink-17.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
 DESCRIPTION=Multi Purpose Voice Services System, including Qtel for EchoLink
 EAPI=6
 HOMEPAGE=http://www.svxlink.org
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
 SLOT=0
 SRC_URI=https://github.com/sm0svx/svxlink/archive/17.12.1.tar.gz -> svxlink-17.12.1.tar.gz
 _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	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e360f688ea74609dd6ab11e480d0808
+_md5_=79008490cd25d658346d1b30848d09c9
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 124477bcd08d..14b805e1729d 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/csound-6.10.0 b/metadata/md5-cache/media-sound/csound-6.10.0
new file mode 100644
index 000000000000..5416c1836a11
--- /dev/null
+++ b/metadata/md5-cache/media-sound/csound-6.10.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
+DEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit 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(+)] ) doc? ( app-arch/unzip ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A sound design and signal processing system for composition and performance
+EAPI=6
+HOMEPAGE=https://csound.github.io/
+IUSE=+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples score static-libs stk tcl test +threads +utils vim-syntax websocket elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
+RDEPEND=>=media-libs/libsndfile-1.0.16 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-cpp/eigen:3 dev-libs/boost:= ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng:0= ) jack? ( media-sound/jack-audio-connection-kit ) java? ( virtual/jdk:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) 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(+)] ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5:0= >=dev-lang/tk-8.5:0= ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( python_targets_python2_7 cxx )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/csound/csound/archive/6.10.0.tar.gz -> csound-6.10.0.tar.gz doc? ( https://github.com/csound/csound/releases/download/6.10.0/Csound6.10.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.10.0/Csound6.10.0_manual_html.zip )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	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	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19c9be1dd313a300f04616a40b505a6d
diff --git a/metadata/md5-cache/media-sound/mp3_check-1.98-r1 b/metadata/md5-cache/media-sound/mp3_check-1.98-r1
index c748fde6464f..80a2c673a336 100644
--- a/metadata/md5-cache/media-sound/mp3_check-1.98-r1
+++ b/metadata/md5-cache/media-sound/mp3_check-1.98-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=MP3 consistency checker
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/mp3check/
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3check/mp3_check-1.98.tar.gz
-_md5_=3fda1605deac147afa57f94cfe69f9a2
+_md5_=adee7f15727f7c7d4f510ce3469bdff3
diff --git a/metadata/md5-cache/media-sound/mp3diags-1.2.03-r1 b/metadata/md5-cache/media-sound/mp3diags-1.2.03-r1
deleted file mode 100644
index 47d0eabbd609..000000000000
--- a/metadata/md5-cache/media-sound/mp3diags-1.2.03-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-libs/boost:=[threads] dev-qt/qtcore:4 dev-qt/qtgui:4 sys-libs/zlib >=sys-apps/sed-4
-DESCRIPTION=Qt-based MP3 diagnosis and repair tool
-EAPI=6
-HOMEPAGE=http://mp3diags.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3 GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-qt/qtcore:4 dev-qt/qtgui:4 sys-libs/zlib dev-qt/qtsvg:4
-SLOT=0
-SRC_URI=mirror://sourceforge/mp3diags/MP3Diags-1.2.03.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cb897530d31266e9884231b50fdc8895
diff --git a/metadata/md5-cache/media-sound/soundconverter-2.1.6 b/metadata/md5-cache/media-sound/soundconverter-2.1.6
deleted file mode 100644
index 649ce915d4d0..000000000000
--- a/metadata/md5-cache/media-sound/soundconverter-2.1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gst-python:0.10[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/pygobject: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.12[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/libgnome-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gnome-base/libglade[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(+)] aac? ( media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 ) flac? ( media-plugins/gst-plugins-flac:0.10 ) mp3? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-mad:0.10 media-plugins/gst-plugins-taglib:0.10 ) vorbis? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) opus? ( media-plugins/gst-plugins-opus:0.10 ) dev-util/intltool virtual/pkgconfig 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 simple audiofile converter application for the GNOME environment
-EAPI=5
-HOMEPAGE=http://soundconverter.org/
-IUSE=aac flac mp3 opus vorbis python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gst-python:0.10[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/pygobject: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.12[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/libgnome-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] gnome-base/libglade[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(+)] aac? ( media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 ) flac? ( media-plugins/gst-plugins-flac:0.10 ) mp3? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-mad:0.10 media-plugins/gst-plugins-taglib:0.10 ) vorbis? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) opus? ( media-plugins/gst-plugins-opus:0.10 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://launchpad.net/soundconverter/trunk/2.1.6/+download/soundconverter-2.1.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-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ec07a21df9569e728ee5e0423d7ab9b
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.0_beta1 b/metadata/md5-cache/media-sound/soundconverter-3.0.0_beta1
index 1f5b21c3bb27..590b6891e907 100644
--- a/metadata/md5-cache/media-sound/soundconverter-3.0.0_beta1
+++ b/metadata/md5-cache/media-sound/soundconverter-3.0.0_beta1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple audiofile converter application for the GNOME environment
 EAPI=6
 HOMEPAGE=http://soundconverter.org/
 IUSE=aac flac libnotify mp3 ogg opus vorbis 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 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=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(+)?] dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] gnome-base/gconf:2[introspection] x11-libs/pango[introspection] dev-python/gst-python:1.0[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(+)?] libnotify? ( x11-libs/libnotify[introspection] ) media-libs/gst-plugins-base:1.0[vorbis?,ogg?] media-plugins/gst-plugins-meta:1.0 flac? ( media-plugins/gst-plugins-flac:1.0 ) media-libs/gst-plugins-good:1.0 mp3? ( media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 ) aac? ( media-plugins/gst-plugins-faac:1.0 ) opus? ( media-plugins/gst-plugins-opus:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.0-beta1/+download/soundconverter-3.0.0-beta1.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_=34ba6c94717f0268fe370795a129fe6d
+_md5_=d2347194b839396d32acc18b8f5a1962
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 83dadcea2e91..321e5c6023a4 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1 b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
index d3bc1de8034d..490ce416969f 100644
--- a/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
+++ b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/linuxtv-dvb-headers
 DESCRIPTION=RTP multicast stream server and other tools for DVB cards
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/dvbtools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/dvbstream-snapshot-20080302.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=caf3f749bd0123014eea56b4e94887aa
+_md5_=d13d5a22be1f08cd6333a2ed2e613c72
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index e1c38ba46cb7..a78894ac4d23 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -8,6 +8,6 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( >=app-pda/libplist-2.0.0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[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/libcdio-0.94 dev-libs/libfmt gbm? ( media-libs/mesa[gbm] ) gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.4.1:=[encode,openssl,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.56.1 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.2:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
 REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm wayland X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.4.1-Leia-Alpha-1.tar.gz -> ffmpeg-kodi-3.4.1-Leia-Alpha-1.tar.gz )
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.4.1-Leia-Alpha-1.tar.gz -> ffmpeg-kodi-3.4.1-Leia-Alpha-1.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f6d6c0dab056eff0348b7bdd46914f5
+_md5_=033e58fd25b2958b35202bfbbf8716f2
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9552ad20f223..70244d1d2a79 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/blinkensim-2.7-r1 b/metadata/md5-cache/media-video/blinkensim-2.7-r1
new file mode 100644
index 000000000000..1a5248f82829
--- /dev/null
+++ b/metadata/md5-cache/media-video/blinkensim-2.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 ) virtual/pkgconfig
+DESCRIPTION=Graphical Blinkenlights simulator with networking support
+EAPI=6
+HOMEPAGE=http://www.blinkenlights.net/project/developer-tools
+IUSE=aalib gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/blib-1.1.4 media-video/blinkenthemes aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
+SLOT=0
+SRC_URI=http://www.blinkenlights.de/dist/blinkensim-2.7.tar.gz
+_md5_=ea516ba064eaf7fe7e176b597708aad0
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.4.1 b/metadata/md5-cache/media-video/ffmpeg-3.4.1
deleted file mode 100644
index 18b94fc261a5..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.4.1.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dce58349c2b4a57fe9c9a9839f9b1675
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.4.2 b/metadata/md5-cache/media-video/ffmpeg-3.4.2
new file mode 100644
index 000000000000..2f3164fa9896
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-3.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=6
+HOMEPAGE=http://ffmpeg.org/
+IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+SLOT=0/55.57.57
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.4.2.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	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5d0564395239ee9a2fa56b4d2168c79a
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 66bf59783b2d..dfb64ed85a15 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers ) >=dev-vcs/git-1.8.2.1
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,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/openjpeg-2: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(-)?] ) libass? ( >=media-libs/libass-0.10.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) truetype? ( >=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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,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-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6f9e5361a56a3b51f0952384331accf7
+_md5_=755d175c6d6c77cc64620c3e20dc286f
diff --git a/metadata/md5-cache/media-video/libva-utils-1.8.0 b/metadata/md5-cache/media-video/libva-utils-1.8.0
deleted file mode 100644
index eb89cdc8242b..000000000000
--- a/metadata/md5-cache/media-video/libva-utils-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
-DESCRIPTION=Collection of utilities and tests for VA-API
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm test wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
-REQUIRED_USE=|| ( drm wayland X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva-utils/archive/1.8.0.tar.gz -> libva-utils-1.8.0.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_=b1422eb407f14cb369f7237a33727d9a
diff --git a/metadata/md5-cache/media-video/libva-utils-1.8.1 b/metadata/md5-cache/media-video/libva-utils-1.8.1
deleted file mode 100644
index d47f4ad3b0af..000000000000
--- a/metadata/md5-cache/media-video/libva-utils-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
-DESCRIPTION=Collection of utilities and tests for VA-API
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm test wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
-REQUIRED_USE=|| ( drm wayland X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva-utils/archive/1.8.1.tar.gz -> libva-utils-1.8.1.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_=b1422eb407f14cb369f7237a33727d9a
diff --git a/metadata/md5-cache/media-video/libva-utils-1.8.2 b/metadata/md5-cache/media-video/libva-utils-1.8.2
deleted file mode 100644
index 7c13bb518269..000000000000
--- a/metadata/md5-cache/media-video/libva-utils-1.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
-DESCRIPTION=Collection of utilities and tests for VA-API
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm test wayland X
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
-REQUIRED_USE=|| ( drm wayland X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva-utils/archive/1.8.2.tar.gz -> libva-utils-1.8.2.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_=13de0a27d3349fb00809e6176413e1f7
diff --git a/metadata/md5-cache/media-video/libva-utils-1.8.3 b/metadata/md5-cache/media-video/libva-utils-1.8.3
deleted file mode 100644
index 973e8f9aacaf..000000000000
--- a/metadata/md5-cache/media-video/libva-utils-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
-DESCRIPTION=Collection of utilities and tests for VA-API
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm test wayland X
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
-REQUIRED_USE=|| ( drm wayland X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva-utils/archive/1.8.3.tar.gz -> libva-utils-1.8.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_=13de0a27d3349fb00809e6176413e1f7
diff --git a/metadata/md5-cache/media-video/libva-utils-2.0.0 b/metadata/md5-cache/media-video/libva-utils-2.0.0
deleted file mode 100644
index c0d11ec4e095..000000000000
--- a/metadata/md5-cache/media-video/libva-utils-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-2.0.0[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
-DESCRIPTION=Collection of utilities and tests for VA-API
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm test wayland X
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-2.0.0[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
-REQUIRED_USE=|| ( drm wayland X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva-utils/archive/2.0.0.tar.gz -> libva-utils-2.0.0.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_=544b8ef18daf400812776c05ca3ca5f7
diff --git a/metadata/md5-cache/media-video/libva-utils-2.1.0 b/metadata/md5-cache/media-video/libva-utils-2.1.0
new file mode 100644
index 000000000000..4a473bdf6999
--- /dev/null
+++ b/metadata/md5-cache/media-video/libva-utils-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.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
+DESCRIPTION=Collection of utilities and tests for VA-API
+EAPI=5
+HOMEPAGE=https://01.org/linuxmedia/vaapi
+IUSE=+drm test wayland X
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 ) wayland? ( >=dev-libs/wayland-1.0.6 )
+REQUIRED_USE=|| ( drm wayland X )
+SLOT=0
+SRC_URI=https://github.com/intel/libva-utils/archive/2.1.0.tar.gz -> libva-utils-2.1.0.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_=98e681a919de6f9df50ae100dc09927c
diff --git a/metadata/md5-cache/media-video/libva-utils-9999 b/metadata/md5-cache/media-video/libva-utils-9999
index 4838b2f1e3c5..1f7cbba4ab94 100644
--- a/metadata/md5-cache/media-video/libva-utils-9999
+++ b/metadata/md5-cache/media-video/libva-utils-9999
@@ -9,4 +9,4 @@ RDEPEND=>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?] drm? ( >=x11-libs/libdrm-2.4
 REQUIRED_USE=|| ( drm wayland X )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=363bc0cf8096242bb0d88b86d2b098ea
+_md5_=98e681a919de6f9df50ae100dc09927c
diff --git a/metadata/md5-cache/media-video/mplayer-1.3.0-r4 b/metadata/md5-cache/media-video/mplayer-1.3.0-r4
new file mode 100644
index 000000000000..6626e9ec29be
--- /dev/null
+++ b/metadata/md5-cache/media-video/mplayer-1.3.0-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) virtual/pkgconfig dga? ( x11-proto/xf86dgaproto ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm )
+DESCRIPTION=Media Player for Linux
+EAPI=6
+HOMEPAGE=http://www.mplayerhq.hu/
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_mga video_cards_tdfx
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
+REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
+RESTRICT=faac? ( bindist )
+SLOT=0
+SRC_URI=mirror://mplayer/releases/MPlayer-1.3.0.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.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
+_md5_=37d24ac898c48d342f84fb1de1d2e235
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index c84cc87919c4..e6532aa36eb6 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) virtual/pkgconfig dga? ( x11-proto/xf86dgaproto ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync dev-vcs/git
+DEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) virtual/pkgconfig dga? ( x11-proto/xf86dgaproto ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) amd64? ( dev-lang/yasm ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Media Player for Linux
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.mplayerhq.hu/
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_mga video_cards_tdfx
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran video_cards_mga video_cards_tdfx
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
+RDEPEND=sys-libs/ncurses:0= app-arch/bzip2 sys-libs/zlib >=media-video/ffmpeg-3.0:0=[vdpau?] a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1:= ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:= ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 RESTRICT=faac? ( bindist )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5c380c07ee11ee5f0a38ed7650a047e1
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e131d9c253e0bc8f2bf412de7c6e338c
diff --git a/metadata/md5-cache/media-video/mpv-0.26.0 b/metadata/md5-cache/media-video/mpv-0.26.0
deleted file mode 100644
index fc6b03019ca0..000000000000
--- a/metadata/md5-cache/media-video/mpv-0.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=Media player based on MPlayer and mplayer2
-EAPI=6
-HOMEPAGE=https://mpv.io/
-IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
-RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/mpv-player/mpv/archive/v0.26.0.tar.gz -> mpv-0.26.0.tar.gz https://waf.io/waf-1.9.8
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d0a0fc7810ae3b046d493b1cbfeac27
diff --git a/metadata/md5-cache/media-video/mpv-0.27.0-r1 b/metadata/md5-cache/media-video/mpv-0.27.0-r1
deleted file mode 100644
index 95e88f24c74e..000000000000
--- a/metadata/md5-cache/media-video/mpv-0.27.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=Media player based on MPlayer and mplayer2
-EAPI=6
-HOMEPAGE=https://mpv.io/
-IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
-RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mpv-player/mpv/archive/v0.27.0.tar.gz -> mpv-0.27.0.tar.gz https://waf.io/waf-1.9.8
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=17d1ffb59439f01dfe9f207cc8e31b60
diff --git a/metadata/md5-cache/media-video/mpv-0.27.1 b/metadata/md5-cache/media-video/mpv-0.27.1
new file mode 100644
index 000000000000..3e350fbf74a1
--- /dev/null
+++ b/metadata/md5-cache/media-video/mpv-0.27.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=Media player based on MPlayer and mplayer2
+EAPI=6
+HOMEPAGE=https://mpv.io/
+IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
+RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mpv-player/mpv/archive/v0.27.1.tar.gz -> mpv-0.27.1.tar.gz https://dev.gentoo.org/~kensington/distfiles/mpv-0.27.1-patches-r0.tar.xz https://waf.io/waf-1.9.8
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=454d67e73ae975a73a6fe63f1d0728a2
diff --git a/metadata/md5-cache/media-video/mpv-0.28.0 b/metadata/md5-cache/media-video/mpv-0.28.0
deleted file mode 100644
index ad0d6500640e..000000000000
--- a/metadata/md5-cache/media-video/mpv-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
-DESCRIPTION=Media player based on MPlayer and mplayer2
-EAPI=6
-HOMEPAGE=https://mpv.io/
-IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
-RDEPEND=!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mpv-player/mpv/archive/v0.28.0.tar.gz -> mpv-0.28.0.tar.gz https://waf.io/waf-1.9.8
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d407f7e5ee9583302b4ea62cddf7a9a0
diff --git a/metadata/md5-cache/media-video/mpv-0.28.1 b/metadata/md5-cache/media-video/mpv-0.28.1
new file mode 100644
index 000000000000..1f8bc60b3452
--- /dev/null
+++ b/metadata/md5-cache/media-video/mpv-0.28.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils virtual/pkgconfig doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) v4l? ( virtual/os-headers ) zsh-completion? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=Media player based on MPlayer and mplayer2
+EAPI=6
+HOMEPAGE=https://mpv.io/
+IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib zsh-completion python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )
+RDEPEND=!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0:= ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video] ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr opengl? ( x11-libs/libXdamage virtual/opengl ) xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mpv-player/mpv/archive/v0.28.1.tar.gz -> mpv-0.28.1.tar.gz https://waf.io/waf-1.9.8
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e3d18e5dd6571a7df06d8b565b6a336
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 0bbf9623ccf1..7117bb7db1b4 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -9,5 +9,5 @@ RDEPEND=!libav? ( ~media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] ) l
 REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav opengl ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) opengl? ( || ( aqua egl X raspberry-pi !cli ) ) raspberry-pi? ( opengl ) test? ( opengl ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) X? ( egl? ( opengl ) ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://waf.io/waf-1.9.8
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9e085a65e31f4ccb7d66c5f54cd1670
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ea65272865c7c7bff54022fac6f68ff
diff --git a/metadata/md5-cache/media-video/vlc-2.2.8-r1 b/metadata/md5-cache/media-video/vlc-2.2.8-r1
index 58a0546d23eb..f2f2455dd25e 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.8-r1
+++ b/metadata/md5-cache/media-video/vlc-2.2.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-8
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/2.2.8/vlc-2.2.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33b4a4ff531b39885fff009412156e3d
+_md5_=71c799dc6b4bd1ba107838e2426cc7e4
diff --git a/metadata/md5-cache/media-video/vlc-2.2.9999 b/metadata/md5-cache/media-video/vlc-2.2.9999
deleted file mode 100644
index 9dc70bb55660..000000000000
--- a/metadata/md5-cache/media-video/vlc-2.2.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=6
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.3:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
-REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt5? ( X ) sdl? ( X ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
-SLOT=0/5-8
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e178d5f719da5a7544ec459caf02ea92
diff --git a/metadata/md5-cache/media-video/vlc-3.0.0-r1 b/metadata/md5-cache/media-video/vlc-3.0.0-r1
new file mode 100644
index 000000000000..461911db0e69
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=6
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
+SLOT=0/5-9
+SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.0/vlc-3.0.0.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ae282f6db1cf92ca22aefbfcf97d876c
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index be0b4a49aa8e..509133e924cc 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
+IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
-SLOT=0/5-8
+SLOT=0/5-9
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=236b3de382dfb2846ebf4b5d6f5498e0
+_md5_=ae282f6db1cf92ca22aefbfcf97d876c
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index c4a2e9cb53b3..18545d39093b 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) app-arch/xz-utils:0 >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto: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 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
+IUSE=a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[X,drm] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
+RDEPEND=dev-libs/libgpg-error:0 net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( dev-libs/fribidi:0 ) bluray? ( >=media-libs/libbluray-0.6.2:0= ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=media-libs/libdc1394-2.1:2 >=sys-libs/libraw1394-2.0.1:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/flac-1.1.2:0 >=media-libs/libogg-1:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( >=sys-libs/libavc1394-0.5.3:0 >=sys-libs/libraw1394-2.0.1:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( media-libs/fontconfig:1.0 >=media-libs/libass-0.9.8:0= ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) skins? ( qt5 truetype X xml ) vaapi? ( avcodec X ) vdpau? ( X ) vlm? ( encode ) xv? ( xcb )
-SLOT=0/5-8
+SLOT=0/5-9
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ee9d0b8249dcb79637fd4d0894df0aa
+_md5_=550cedf2016f5aee68e768e4ca96ade4
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b231558fa600..dcf4a46469c0 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/linkchecker-9.3-r2 b/metadata/md5-cache/net-analyzer/linkchecker-9.3-r2
deleted file mode 100644
index 1c9d774ad309..000000000000
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( dev-qt/qthelp:4 dev-python/markdown2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Check websites for broken links
-EAPI=5
-HOMEPAGE=https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/
-IUSE=gnome sqlite X python_targets_python2_7
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) X? ( dev-python/PyQt4[X,help,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/L/LinkChecker/LinkChecker-9.3.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=c430045b5d81ae93b0086db69e3e07a4
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1 b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
index a9c4b710d95e..d267dc1dde5d 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Check websites for broken links
 EAPI=6
 HOMEPAGE=https://github.com/linkcheck/linkchecker
 IUSE=gnome sqlite python_targets_python2_7
-KEYWORDS=~amd64 x86 ~ppc-macos ~x64-solaris
+KEYWORDS=amd64 x86 ~ppc-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.3.1.tar.gz -> linkchecker-9.3.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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_=949df0b0c051f057cc3092f388b27e49
+_md5_=0fc9072818241262a4ad7eb39ba049b1
diff --git a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.14.0 b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.14.0
new file mode 100644
index 000000000000..2fa554a67491
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.14.0.tar.gz -> prometheus-alertmanager-0.14.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5dfb4ef54d062a8c51acda3fb99fcce5
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-0.3.4-r1 b/metadata/md5-cache/net-analyzer/speedtest-cli-0.3.4-r1
deleted file mode 100644
index 874db6dc3722..000000000000
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-0.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=Command line interface for testing internet bandwidth using speedtest.net
-EAPI=5
-HOMEPAGE=https://github.com/sivel/speedtest-cli
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~arm ~arm64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/sivel/speedtest-cli/archive/v0.3.4.tar.gz -> speedtest-cli-0.3.4.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_=aa14421620dbd675b53c8c5cfcda3f5f
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.1 b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.1
deleted file mode 100644
index 893c70a202b0..000000000000
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=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
-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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/sivel/speedtest-cli/archive/v1.0.1.tar.gz -> speedtest-cli-1.0.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_=13dd55bb6c6115b81f60180a5fe1c98a
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.2
deleted file mode 100644
index fde463a22f5f..000000000000
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=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
-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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/sivel/speedtest-cli/archive/v1.0.2.tar.gz -> speedtest-cli-1.0.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_=13dd55bb6c6115b81f60180a5fe1c98a
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7 b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
index 901b87091a66..7e6591560804 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Command line interface for testing internet bandwidth using speedtes
 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
+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
+_md5_=a7f665ec1276648118e758e148e5a157
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.0
new file mode 100644
index 000000000000..a21ad5b5380b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.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(-)] 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/v2.0.0.tar.gz -> speedtest-cli-2.0.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_=b8a132c8019dcab0c72d950fa14a91c2
diff --git a/metadata/md5-cache/net-analyzer/tcpreen-1.4.4 b/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
index 1585fdf56f10..cddaba3f8c63 100644
--- a/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
+++ b/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure
 DEPEND=nls? ( sys-devel/gettext )
 DESCRIPTION=TCP network re-engineering tool
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.remlab.net/tcpreen/
 IUSE=nls
 KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.remlab.net/files/tcpreen/stable/tcpreen-1.4.4.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15ed1078a9d257975e87f17564447ac4
+_md5_=2baf3bd9b285814590a72788d34f87b0
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1 b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
new file mode 100644
index 000000000000..3a659005060d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=>=sys-devel/autogen-5.18.4[libopts] dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav ) >=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=utilities for editing and replaying previously captured network traffic
+EAPI=6
+HOMEPAGE=http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay
+IUSE=debug pcapnav +tcpdump
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=BSD GPL-3
+RDEPEND=>=sys-devel/autogen-5.18.4[libopts] dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav )
+SLOT=0
+SRC_URI=https://github.com/appneta/tcpreplay/releases/download/v4.3.0-beta1/tcpreplay-4.3.0-beta1.tar.xz -> tcpreplay-4.3.0_beta1.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_=1d628aa377fa7ece51ee7a46ba1da2c1
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index d091fc272a6b..b837b69d3274 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/cagibi-0.2.0 b/metadata/md5-cache/net-dns/cagibi-0.2.0
deleted file mode 100644
index f1c75b9c328e..000000000000
--- a/metadata/md5-cache/net-dns/cagibi-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-util/automoc sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Cache/proxy system for the SSDP part of UPnP
-EAPI=6
-HOMEPAGE=https://frinring.wordpress.com/2010/08/09/cagibi-0-1-1-released-network-kio-slave-freezes-kded-in-4-5-0/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4
-SLOT=0
-SRC_URI=mirror://kde/stable/cagibi/cagibi-0.2.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	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0d91ab48d0fe6fcccd831270c819637
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.4-r1 b/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.4-r1
deleted file mode 100644
index 0535003b54f3..000000000000
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-1.9.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libsodium net-libs/ldns ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A tool for securing communications between a client and a DNS resolver
-EAPI=6
-HOMEPAGE=https://dnscrypt.org
-IUSE=hardened libressl +plugins ssl systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-RDEPEND=dev-libs/libsodium net-libs/ldns ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.9.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8e74ef590a1a55b1658a9512cd4386c1
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.0 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.0
new file mode 100644
index 000000000000..cdc715f5128a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8 virtual/pkgconfig
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=6
+HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
+IUSE=+filecaps
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.0.tar.gz -> dnscrypt-proxy-2.0.0.tar.gz
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e4055afa920830ccd51f0c23e086c8a9
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 3a254184c5f7..c0659461f671 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/firewalld-0.5.1-r1 b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r1
new file mode 100644
index 000000000000..4a9f6a68e92c
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=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(-)] !!net-firewall/gshield 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/decorator[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/python-slip-0.2.7[dbus,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(-)] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt4[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/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext >=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 virtual/pkgconfig
+DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
+EAPI=6
+HOMEPAGE=http://www.firewalld.org/
+IUSE=gui python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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(-)] !!net-firewall/gshield 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/decorator[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/python-slip-0.2.7[dbus,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(-)] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt4[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/firewalld/firewalld/archive/v0.5.1.tar.gz -> firewalld-0.5.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=94798e40bd4747dfdec4669318a41871
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2 b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
index 98623500c316..be25f5f5134c 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) virtual/linux-sources virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Netflow iptables module
 EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow
+HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
 IUSE=debug natevents snmp kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) kernel_linux? ( vi
 SLOT=0
 SRC_URI=mirror://sourceforge/ipt-netflow/ipt-netflow-2.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3fa9f6b3a568624d942eef9e544accfd
+_md5_=8670463047895ed1dd1d30467bb6a9c7
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r3 b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r3
index f31ae4b0b06d..dcaa3d031389 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r3
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) virtual/linux-sources virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Netflow iptables module
 EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/ipt-netflow
+HOMEPAGE=https://sourceforge.net/projects/ipt-netflow https://github.com/aabc/ipt-netflow
 IUSE=debug natevents snmp kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) kernel_linux? ( vi
 SLOT=0
 SRC_URI=mirror://sourceforge/ipt-netflow/ipt-netflow-2.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=506351847e2e2c7a74821fa8e4e2c519
+_md5_=246e707be6c9d99f2142090dcedde857
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.10.1 b/metadata/md5-cache/net-firewall/shorewall-5.1.10.1
deleted file mode 100644
index 4f224742c54a..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 <sys-apps/iproute2-4.13.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-core-5.1.10.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-5.1.10.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-5.1.10.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-lite-5.1.10.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-lite-5.1.10.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-init-5.1.10.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-docs-html-5.1.10.1.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=8c12917d56a8809dbf71a6b6289c48c8
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.10.1-r2 b/metadata/md5-cache/net-firewall/shorewall-5.1.10.1-r2
deleted file mode 100644
index 168a66612a31..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.10.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-core-5.1.10.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-5.1.10.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-5.1.10.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-lite-5.1.10.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-lite-5.1.10.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-init-5.1.10.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-docs-html-5.1.10.1.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=af3032021ec52da7b1ae31e1acff306c
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.10.2 b/metadata/md5-cache/net-firewall/shorewall-5.1.10.2
deleted file mode 100644
index 46fc35e33cf0..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-core-5.1.10.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-5.1.10.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-5.1.10.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-lite-5.1.10.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall6-lite-5.1.10.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-init-5.1.10.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.10/shorewall-docs-html-5.1.10.2.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=78d136dbac63d7a466ab6ecba44216d0
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.11.1 b/metadata/md5-cache/net-firewall/shorewall-5.1.11.1
deleted file mode 100644
index 908dd521f8c6..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall-core-5.1.11.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall-5.1.11.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall6-5.1.11.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall-lite-5.1.11.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall6-lite-5.1.11.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall-init-5.1.11.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.11/shorewall-docs-html-5.1.11.1.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=78d136dbac63d7a466ab6ecba44216d0
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.12 b/metadata/md5-cache/net-firewall/shorewall-5.1.12
deleted file mode 100644
index 07f0b5450838..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-core-5.1.12.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-5.1.12.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-5.1.12.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-lite-5.1.12.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-lite-5.1.12.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-init-5.1.12.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-docs-html-5.1.12.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=78d136dbac63d7a466ab6ecba44216d0
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.12.1 b/metadata/md5-cache/net-firewall/shorewall-5.1.12.1
new file mode 100644
index 000000000000..25b806e8ff44
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=6
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
+REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
+SLOT=0
+SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-core-5.1.12.1.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-5.1.12.1.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-5.1.12.1.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-lite-5.1.12.1.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall6-lite-5.1.12.1.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-init-5.1.12.1.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.12/shorewall-docs-html-5.1.12.1.tar.bz2 )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=78d136dbac63d7a466ab6ecba44216d0
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1 b/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1
deleted file mode 100644
index d2a200a2c750..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-4.4.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-core-5.1.9.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-5.1.9.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-5.1.9.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-lite-5.1.9.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall6-lite-5.1.9.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-init-5.1.9.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.9/shorewall-docs-html-5.1.9.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f32c6952c3dbe0c13476fcaf363e3abb
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index e40ee84475b0..0bb5faef6ea7 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/nfs-utils-2.3.1-r2 b/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r2
new file mode 100644
index 000000000000..bca6dc59c192
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.3.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) 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=NFS client and server daemons
+EAPI=6
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.1.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_=12492facbb0049e24871aa1c359fe2b3
diff --git a/metadata/md5-cache/net-fs/samba-4.6.11 b/metadata/md5-cache/net-fs/samba-4.6.11
deleted file mode 100644
index 1d12953eb83b..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.6.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.6.11.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=4f6d578f415cd30cb74323e3aad5b5bb
diff --git a/metadata/md5-cache/net-fs/samba-4.6.13 b/metadata/md5-cache/net-fs/samba-4.6.13
new file mode 100644
index 000000000000..5ebb21d92fb4
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.6.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.6.13.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=2005e309c9ac95b8c97eda14998bd56f
diff --git a/metadata/md5-cache/net-fs/samba-4.7.4 b/metadata/md5-cache/net-fs/samba-4.7.4
index a4d126918398..49ff8d997f8f 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.4
+++ b/metadata/md5-cache/net-fs/samba-4.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=9107bca972ce2af439d7378b0920af79
+_md5_=1ec0db60309d5f13afdfb1ae8b984874
diff --git a/metadata/md5-cache/net-fs/samba-4.7.5 b/metadata/md5-cache/net-fs/samba-4.7.5
index 8c786f53baec..7f42263fb527 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.5
+++ b/metadata/md5-cache/net-fs/samba-4.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=http://www.samba.org/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.7.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=6f6689b9b53ee81296f82def50dc62e3
+_md5_=9ee31c1ba2ad837be7925124f331ad1c
diff --git a/metadata/md5-cache/net-fs/samba-4.8.0_rc2 b/metadata/md5-cache/net-fs/samba-4.8.0_rc2
deleted file mode 100644
index 93620852a17c..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.8.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=http://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/rc/samba-4.8.0rc2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=f2cf470d0ecbef4162f2341828c5237f
diff --git a/metadata/md5-cache/net-fs/samba-4.8.0_rc3 b/metadata/md5-cache/net-fs/samba-4.8.0_rc3
new file mode 100644
index 000000000000..6ea93a3d55a0
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,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 || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[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(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.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(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/rc/samba-4.8.0rc3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=8a8a0aceeb62ae4988ddb606029801df
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 1cccab869d6a..4c0c9cf8317d 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/qshare-2.1.5-r1 b/metadata/md5-cache/net-ftp/qshare-2.1.5-r1
deleted file mode 100644
index 6d4a00162e25..000000000000
--- a/metadata/md5-cache/net-ftp/qshare-2.1.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=FTP server with a service discovery feature
-EAPI=5
-HOMEPAGE=http://www.zuzuf.net/qshare/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat]
-SLOT=0
-SRC_URI=http://www.zuzuf.net/qshare/files/qshare-2.1.5-src.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	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26160e3c48fef32ad8e30a83b442b9f5
diff --git a/metadata/md5-cache/net-ftp/scythia-0.9.3_p2 b/metadata/md5-cache/net-ftp/scythia-0.9.3_p2
deleted file mode 100644
index 027e4134620d..000000000000
--- a/metadata/md5-cache/net-ftp/scythia-0.9.3_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-qt/qtgui:4 >=sys-apps/sed-4
-DESCRIPTION=Just a small FTP client
-EAPI=5
-HOMEPAGE=http://scythia.free.fr/
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://scythia.free.fr/wp-content/scythia_0.9.3-2-src.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=029e69c68ba194caa18197687dbacefb
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c04437b99487..15f159bc9a9d 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/ii-1.8 b/metadata/md5-cache/net-irc/ii-1.8
new file mode 100644
index 000000000000..d1437ed3aa3a
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ii-1.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A minimalist FIFO and filesystem-based IRC client
+EAPI=6
+HOMEPAGE=https://tools.suckless.org/ii/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://dl.suckless.org/tools/ii-1.8.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=97847555cd8267a4c645c844493c9c0b
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
index ef07a900a770..1c12b5cbdd8b 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20171211100641
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced IRC Client
 EAPI=5
 HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
 IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=kvirc
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
 REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/ed2a156892c5ce9a1ab54c50031ba59a9a34485f.tar.gz -> kvirc-5.0_pre20171211100641.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71738208262a4360dde6c678cbb7ea77
+_md5_=b8666a671db1e807f4955aee1d75fd8a
diff --git a/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255 b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255
new file mode 100644
index 000000000000..cfbcac697e8d
--- /dev/null
+++ b/metadata/md5-cache/net-irc/kvirc-5.0_pre20180209140255
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Advanced IRC Client
+EAPI=5
+HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
+IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=kvirc
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) 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(+)] ) spell? ( app-text/enchant:0= ) ssl? ( dev-libs/openssl:0= ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
+REQUIRED_USE=audiofile? ( oss ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/kvirc/KVIrc/archive/bed7de9c146055237f62b6dfcf6d68f04b2049dd.tar.gz -> kvirc-5.0_pre20180209140255.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c26861c9c2706ac50657eb93608a346
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a10533f5fe8b..6f53d92231af 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/libmediawiki-5.37.0 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
index 27df3199ae24..680efb8eb201 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=dev-qt/qtnetwork-5.7.1:5 !net-li
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.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	f969e0903765bc89fad95c1552831e5e	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_=b46571acd420b065383497ba2a595be0
+_md5_=6ca4e03ab969140440de94aea853843d
diff --git a/metadata/md5-cache/net-libs/libosmocore-0.10.2 b/metadata/md5-cache/net-libs/libosmocore-0.10.2
new file mode 100644
index 000000000000..388e9974c4e2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libosmocore-0.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/talloc pcsc-lite? ( sys-apps/pcsc-lite ) 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=Utility functions for OsmocomBB, OpenBSC and related projects
+EAPI=6
+HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
+IUSE=pcsc-lite
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-3
+RDEPEND=sys-libs/talloc pcsc-lite? ( sys-apps/pcsc-lite )
+SLOT=0
+SRC_URI=http://cgit.osmocom.org/cgit/libosmocore/snapshot/libosmocore-0.10.2.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bd7b4911389965f31896146130dda882
diff --git a/metadata/md5-cache/net-libs/libosmocore-0.6.6 b/metadata/md5-cache/net-libs/libosmocore-0.6.6
deleted file mode 100644
index c3b1388459db..000000000000
--- a/metadata/md5-cache/net-libs/libosmocore-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=embedded? ( sys-libs/talloc ) 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=Utility functions for OsmocomBB, OpenBSC and related projects
-EAPI=5
-HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
-IUSE=embedded
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-3
-RDEPEND=embedded? ( sys-libs/talloc )
-SLOT=0
-SRC_URI=http://cgit.osmocom.org/cgit/libosmocore/snapshot/libosmocore-0.6.6.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=022dedf3f88943f2b1b2cb661e41090a
diff --git a/metadata/md5-cache/net-libs/libosmocore-9999 b/metadata/md5-cache/net-libs/libosmocore-9999
index 85b6ba6afa6d..999a215391ee 100644
--- a/metadata/md5-cache/net-libs/libosmocore-9999
+++ b/metadata/md5-cache/net-libs/libosmocore-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=embedded? ( sys-libs/talloc ) pcsc-lite? ( sys-apps/pcsc-lite ) 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 dev-vcs/git
+DEFINED_PHASES=configure prepare unpack
+DEPEND=sys-libs/talloc pcsc-lite? ( sys-apps/pcsc-lite ) 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Utility functions for OsmocomBB, OpenBSC and related projects
-EAPI=5
+EAPI=6
 HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
-IUSE=embedded pcsc-lite
+IUSE=pcsc-lite
 LICENSE=GPL-2 LGPL-3
-RDEPEND=embedded? ( sys-libs/talloc ) pcsc-lite? ( sys-apps/pcsc-lite )
+RDEPEND=sys-libs/talloc pcsc-lite? ( sys-apps/pcsc-lite )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9134ccf16b818730caf70e9aa3de8662
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bd7b4911389965f31896146130dda882
diff --git a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2 b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
index 0a1c0da1d0d9..15fc32ff1aa1 100644
--- a/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
+++ b/metadata/md5-cache/net-libs/qxmpp-0.9.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework
 EAPI=6
 HOMEPAGE=https://github.com/qxmpp-project/qxmpp/
 IUSE=debug doc opus +speex test theora vpx
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 x86 ~amd64-linux
 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
 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_=96faceb5f745f926c764d7a9e7414c00
+_md5_=69975c2731dde366e96dbecb945ba1ef
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 9884037b3c91..de09fe800a11 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-0.9.15-r1 b/metadata/md5-cache/net-mail/mu-0.9.15-r1
deleted file mode 100644
index f38b22181bc6..000000000000
--- a/metadata/md5-cache/net-mail/mu-0.9.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils >=app-portage/elt-patches-20170422
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=5
-HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
-IUSE=emacs gui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/archive/0.9.15.tar.gz -> mu-0.9.15.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=da9c03d3649a37b93d17075e1217b63a
diff --git a/metadata/md5-cache/net-mail/mu-0.9.16 b/metadata/md5-cache/net-mail/mu-0.9.16
deleted file mode 100644
index a20e552f28c2..000000000000
--- a/metadata/md5-cache/net-mail/mu-0.9.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils >=app-portage/elt-patches-20170422
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=5
-HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
-IUSE=emacs gui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/archive/v0.9.16.tar.gz -> mu-0.9.16.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b0079111de3464715841e54909528039
diff --git a/metadata/md5-cache/net-mail/mu-0.9.18-r1 b/metadata/md5-cache/net-mail/mu-0.9.18-r1
deleted file mode 100644
index a8a2e3bc6798..000000000000
--- a/metadata/md5-cache/net-mail/mu-0.9.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils >=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=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=6
-HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
-IUSE=emacs gui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/archive/0.9.18.tar.gz -> mu-0.9.18.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=10f80547829fc6e04ec9d64e188fb0c3
diff --git a/metadata/md5-cache/net-mail/mu-0.9.18-r2 b/metadata/md5-cache/net-mail/mu-0.9.18-r2
index f3eafc880cec..0de561e3ccf4 100644
--- a/metadata/md5-cache/net-mail/mu-0.9.18-r2
+++ b/metadata/md5-cache/net-mail/mu-0.9.18-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and ind
 EAPI=6
 HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
 IUSE=emacs
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/0.9.18.tar.gz -> mu-0.9.18.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8e512d0ae6f4182d9082b82b1a62bb96
+_md5_=fb354cc637d6d3ce2702686f2157d17b
diff --git a/metadata/md5-cache/net-mail/mu-0.9.9.6 b/metadata/md5-cache/net-mail/mu-0.9.9.6
deleted file mode 100644
index 1e9130142ebe..000000000000
--- a/metadata/md5-cache/net-mail/mu-0.9.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils >=app-portage/elt-patches-20170422
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=5
-HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
-IUSE=doc emacs gui
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gmime:2.6 dev-libs/xapian dev-libs/glib:2 gui? ( x11-libs/gtk+:3 net-libs/webkit-gtk:3 ) emacs? ( >=virtual/emacs-23 ) !net-mail/mailutils
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/archive/v0.9.9.6.tar.gz -> mu-0.9.9.6.tar.gz doc? ( https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mu0/mu4e-manual-0.9.9.5.pdf )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=65d23f62dcb8a05cabec6f7e11ce9cab
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3614cf280ca2..bf7e86a390b7 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/dhcpcd-6.11.5 b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
index 85d34e6b28cc..656499ce8663 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.5
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.5
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.5.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=913aa63fe7485ef13e91c3e8ce03c400
+_md5_=2504373c229f7bac70e0d640c7e38f58
diff --git a/metadata/md5-cache/net-misc/iperf-3.2 b/metadata/md5-cache/net-misc/iperf-3.2
deleted file mode 100644
index f5c4daa200de..000000000000
--- a/metadata/md5-cache/net-misc/iperf-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sctp? ( net-misc/lksctp-tools ) >=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=A TCP, UDP, and SCTP network bandwidth measurement tool
-EAPI=6
-HOMEPAGE=https://github.com/esnet/iperf/
-IUSE=sctp static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
-LICENSE=BSD
-RDEPEND=sctp? ( net-misc/lksctp-tools )
-SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.2.tar.gz -> iperf-3.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_=d5ac93cca54796d29104725cbd39e50e
diff --git a/metadata/md5-cache/net-misc/iperf-3.4 b/metadata/md5-cache/net-misc/iperf-3.4
new file mode 100644
index 000000000000..4af189b4bc7c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sctp? ( net-misc/lksctp-tools ) >=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=A TCP, UDP, and SCTP network bandwidth measurement tool
+EAPI=6
+HOMEPAGE=https://github.com/esnet/iperf/
+IUSE=sctp static-libs
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+LICENSE=BSD
+RDEPEND=sctp? ( net-misc/lksctp-tools )
+SLOT=3
+SRC_URI=https://github.com/esnet/iperf/archive/3.4.tar.gz -> iperf-3.4.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_=c1f418b919efb1f6e01c51d71d7f7d94
diff --git a/metadata/md5-cache/net-misc/kea-1.3.0 b/metadata/md5-cache/net-misc/kea-1.3.0
index 04eed8a3c979..1c18c303ec59 100644
--- a/metadata/md5-cache/net-misc/kea-1.3.0
+++ b/metadata/md5-cache/net-misc/kea-1.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
 EAPI=6
 HOMEPAGE=http://www.isc.org/kea/
 IUSE=openssl samples
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.3.0.tar.gz ftp://ftp.isc.org/isc/kea/1.3.0/kea-1.3.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=02deef64ff14c7c122cce68072421182
+_md5_=2af3ed77f47554b6a5552d1e1fa67fd4
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
new file mode 100644
index 000000000000..02e99a0cdedb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install preinst prepare unpack
+DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= ) >=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 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
+EAPI=6
+HOMEPAGE=http://www.isc.org/kea/
+IUSE=openssl samples
+LICENSE=ISC BSD SSLeay GPL-2
+RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=4f3dca22e0173dbcf3e274f0138cef24
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.1 b/metadata/md5-cache/net-misc/memcached-1.5.1
deleted file mode 100644
index 96b79c4c64b1..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=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=High-performance, distributed memory object caching system
-EAPI=6
-HOMEPAGE=http://memcached.org/
-IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.5.1.tar.gz https://www.memcached.org/files/old/memcached-1.5.1.tar.gz
-_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	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=741d0deaafc9b0176d3ad650a7855158
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.3-r1 b/metadata/md5-cache/net-misc/memcached-1.5.3-r1
deleted file mode 100644
index fbbf1d47cc52..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=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=High-performance, distributed memory object caching system
-EAPI=6
-HOMEPAGE=http://memcached.org/
-IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.5.3.tar.gz https://www.memcached.org/files/old/memcached-1.5.3.tar.gz
-_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	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.4 b/metadata/md5-cache/net-misc/memcached-1.5.4
deleted file mode 100644
index 123b53214f71..000000000000
--- a/metadata/md5-cache/net-misc/memcached-1.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=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=High-performance, distributed memory object caching system
-EAPI=6
-HOMEPAGE=http://memcached.org/
-IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
-SLOT=0
-SRC_URI=https://www.memcached.org/files/memcached-1.5.4.tar.gz https://www.memcached.org/files/old/memcached-1.5.4.tar.gz
-_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	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.5 b/metadata/md5-cache/net-misc/memcached-1.5.5
new file mode 100644
index 000000000000..95be2540162a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=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=High-performance, distributed memory object caching system
+EAPI=6
+HOMEPAGE=http://memcached.org/
+IUSE=debug sasl seccomp selinux slabs-reassign test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.5.5.tar.gz https://www.memcached.org/files/old/memcached-1.5.5.tar.gz
+_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	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d13a89ab4cd13563e5d3c00ddbd2a7e8
diff --git a/metadata/md5-cache/net-misc/netfleet-0.2.1-r2 b/metadata/md5-cache/net-misc/netfleet-0.2.1-r2
deleted file mode 100644
index f7c8a854b368..000000000000
--- a/metadata/md5-cache/net-misc/netfleet-0.2.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:4[ssl] dev-qt/qtgui:4
-DESCRIPTION=Qt4 cross-platform multi-threaded download utility
-EAPI=6
-HOMEPAGE=http://qt-apps.org/content/show.php/?content=103312
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4[ssl] dev-qt/qtgui:4
-SLOT=0
-SRC_URI=https://netfleet.googlecode.com/files/netfleet_0.2.1.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2ab6dbe9924f15435b3b206d2fa5431e
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.6_p1-r4
new file mode 100644
index 000000000000..e3bc84f5583c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend test
+DEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf >=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=Port of OpenBSD's free SSH release
+EAPI=6
+HOMEPAGE=http://www.openssh.org/
+IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD GPL-2
+RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1-hpnssh14v12-r1.tar.xz ) ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( https://dev.gentoo.org/~chutzpah/openssh-7.6p1+x509-11.2.diff.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=561e0004d5f65098a7ff3b075caa2938
diff --git a/metadata/md5-cache/net-misc/pps-tools-1.0.2 b/metadata/md5-cache/net-misc/pps-tools-1.0.2
new file mode 100644
index 000000000000..4cc1b02a2392
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pps-tools-1.0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=User-space tools for LinuxPPS
+EAPI=6
+HOMEPAGE=https://github.com/redlab-i/pps-tools
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/redlab-i/pps-tools/archive/v1.0.2.tar.gz -> pps-tools-1.0.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=45c0618f5fd25db1f831ad6b5c007bba
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34 b/metadata/md5-cache/net-misc/spice-gtk-0.34
deleted file mode 100644
index 2e8df2c67372..000000000000
--- a/metadata/md5-cache/net-misc/spice-gtk-0.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.12 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 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 !<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=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
-EAPI=6
-HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
-IUSE=dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
-REQUIRED_USE=?? ( pulseaudio gstaudio )
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e16565faef1f638513734f02b9f6a7df
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.34-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.34-r1
new file mode 100644
index 000000000000..421043bec9ff
--- /dev/null
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.34-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.13 dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 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 !<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=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
+EAPI=6
+HOMEPAGE=https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/
+IUSE=dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio[glib] ) gstvideo? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gstaudio? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus gtk3? ( x11-libs/gtk+:3[introspection?] ) >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
+REQUIRED_USE=?? ( pulseaudio gstaudio )
+SLOT=0
+SRC_URI=https://www.spice-space.org/download/gtk/spice-gtk-0.34.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21d9694917ccdfeb09d2a7beeb1651c6
diff --git a/metadata/md5-cache/net-misc/sslh-1.19c b/metadata/md5-cache/net-misc/sslh-1.19c
new file mode 100644
index 000000000000..651cdbc6df85
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.19c
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5 dev-lang/perl pcre? ( dev-libs/libpcre:= ) virtual/pkgconfig
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=6
+HOMEPAGE=http://www.rutschle.net/tech/sslh.shtml
+IUSE=caps pcre systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.rutschle.net/tech/sslh/sslh-v1.19c.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=be6adbac606e52baac560cbfadf3f35d
diff --git a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1 b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
index 9317486a86b7..46276aa037a8 100644
--- a/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
+++ b/metadata/md5-cache/net-misc/ssvnc-1.0.29-r1
@@ -4,10 +4,10 @@ DESCRIPTION=VNC viewer that adds encryption security to VNC connections
 EAPI=6
 HOMEPAGE=http://www.karlrunge.com/x11vnc/ssvnc.html
 IUSE=java
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg:0 dev-libs/openssl:0= dev-lang/tk:0 net-misc/stunnel java? ( virtual/jre:* ) x11-terms/xterm x11-libs/libICE x11-libs/libSM x11-libs/libXaw x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://sourceforge/ssvnc/ssvnc-1.0.29.src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=53fd436e2525f4e7b09ab4631bcef47e
+_md5_=4ac5bfd2b61e6ee57b5fca1d3f37ca3d
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.01.27 b/metadata/md5-cache/net-misc/youtube-dl-2018.01.27
deleted file mode 100644
index 307d211d739f..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.01.27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst 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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=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://youtube-dl.org/downloads/2018.01.27/youtube-dl-2018.01.27.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c95d17b3ee9606122fbffdd9f9be4467
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.02.11 b/metadata/md5-cache/net-misc/youtube-dl-2018.02.11
new file mode 100644
index 000000000000..942c1ac228bc
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.02.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst 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(-)] test? ( dev-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=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://youtube-dl.org/downloads/2018.02.11/youtube-dl-2018.02.11.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c95d17b3ee9606122fbffdd9f9be4467
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index dac0dbbbba4a..3c3fe760004d 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/gss-proxy-0.5.1 b/metadata/md5-cache/net-nds/gss-proxy-0.5.1
deleted file mode 100644
index 45e45496eac6..000000000000
--- a/metadata/md5-cache/net-nds/gss-proxy-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.4 dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/gss-proxy/
-IUSE=debug selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/gss-proxy/gssproxy-0.5.1.tar.gz
-_md5_=f39de908300e70ca2319b2fdea11858c
diff --git a/metadata/md5-cache/net-nds/gss-proxy-0.6.2 b/metadata/md5-cache/net-nds/gss-proxy-0.6.2
deleted file mode 100644
index 8af079562ab1..000000000000
--- a/metadata/md5-cache/net-nds/gss-proxy-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.4 dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
-EAPI=5
-HOMEPAGE=https://pagure.io/gssproxy
-IUSE=debug selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=http://releases.pagure.org/gssproxy/gssproxy-0.6.2.tar.gz
-_md5_=b8b0293eb14bf48f6c2ccc4a0591c2d1
diff --git a/metadata/md5-cache/net-nds/gss-proxy-0.7.0 b/metadata/md5-cache/net-nds/gss-proxy-0.7.0
deleted file mode 100644
index d8b9d90a439a..000000000000
--- a/metadata/md5-cache/net-nds/gss-proxy-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.4 dev-libs/libxslt virtual/pkgconfig
-DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
-EAPI=6
-HOMEPAGE=https://pagure.io/gssproxy
-IUSE=debug selinux systemd hardened
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.5.0 virtual/krb5 selinux? ( sys-libs/libselinux )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://releases.pagure.org/gssproxy/gssproxy-0.7.0.tar.gz
-_md5_=b4cc740730c3008f07a9a3905f969fb6
diff --git a/metadata/md5-cache/net-nds/gss-proxy-0.8.0 b/metadata/md5-cache/net-nds/gss-proxy-0.8.0
new file mode 100644
index 000000000000..e91580a1db6f
--- /dev/null
+++ b/metadata/md5-cache/net-nds/gss-proxy-0.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.6.1 virtual/krb5 selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.4 dev-libs/libxslt virtual/pkgconfig
+DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
+EAPI=6
+HOMEPAGE=https://pagure.io/gssproxy
+IUSE=debug selinux systemd hardened
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD-1
+RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.6.1 virtual/krb5 selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-gssproxy )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.pagure.org/gssproxy/gssproxy-0.8.0.tar.gz
+_md5_=fc94509080af1d3c36f9a4ae4a7a7a9b
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index bde5924decc2..8b2db5f22d71 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/suck-4.3.2 b/metadata/md5-cache/net-nntp/suck-4.3.2
deleted file mode 100644
index d298bd0c85d5..000000000000
--- a/metadata/md5-cache/net-nntp/suck-4.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/db perl? ( dev-lang/perl ) ssl? ( dev-libs/openssl )
-DESCRIPTION=Grab news from a remote NNTP server and feed them to another
-EAPI=0
-HOMEPAGE=http://home.comcast.net/~bobyetman/
-IUSE=ssl perl
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=public-domain
-RDEPEND=sys-libs/db perl? ( dev-lang/perl ) ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://home.comcast.net/~bobyetman/suck-4.3.2.tar.gz
-_md5_=b46bc0d28146bf4d0c9a2cdcf2ff5c16
diff --git a/metadata/md5-cache/net-nntp/suck-4.3.3 b/metadata/md5-cache/net-nntp/suck-4.3.3
new file mode 100644
index 000000000000..d49115b3c1b6
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/suck-4.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= ) sys-libs/db perl? ( dev-lang/perl ) >=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=Grab news from a remote NNTP server and feed them to another
+EAPI=6
+HOMEPAGE=https://lazarus-pkgs.github.io/lazarus-pkgs/suck.html
+IUSE=perl ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= ) net-nntp/inn
+SLOT=0
+SRC_URI=https://github.com/lazarus-pkgs/suck/archive/4.3.3.tar.gz -> suck-4.3.3.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9fb4728b26c809fc4f33c62a4566bb89
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index b7402a3bba49..8f937948a27f 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/cpuminer-opt-3.8.1.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.1.1
new file mode 100644
index 000000000000..8519d06a4da2
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl: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 virtual/pkgconfig
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=6
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.8.1.1.tar.gz -> cpuminer-opt-3.8.1.1.tar.gz
+_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_=ffb002741956a23c2873e063e6d2616b
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
deleted file mode 100644
index dd0118b9f41b..000000000000
--- a/metadata/md5-cache/net-p2p/pybitmessage-0.6.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=P2P communications protocol
-EAPI=6
-HOMEPAGE=https://bitmessage.org/
-IUSE=libressl ncurses opencl sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( media-sound/gst123 media-sound/alsa-utils media-sound/mpg123 ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/Bitmessage/PyBitmessage/archive/v0.6.2.tar.gz -> pybitmessage-0.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	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_=3ae22dec27632607d5e6e182583edceb
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2 b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2
new file mode 100644
index 000000000000..d2288c17cbc9
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
+DESCRIPTION=P2P communications protocol
+EAPI=6
+HOMEPAGE=https://bitmessage.org/
+IUSE=libressl ncurses opencl sound python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ncurses? ( dev-python/pythondialog[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opencl? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopencl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( || ( media-sound/gst123 media-sound/alsa-utils media-sound/mpg123 ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6,sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/Bitmessage/PyBitmessage/archive/0.6.3.2.tar.gz -> pybitmessage-0.6.3.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	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_=83f7950e8889bd0bddf7addc98fa4d31
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index cd29200d849c..fb07f98632b9 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.6.9999-r2 b/metadata/md5-cache/net-proxy/haproxy-1.6.9999-r2
deleted file mode 100644
index 64e3b3b12a78..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.6.9999-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) ?? ( slz zlib )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4b52cf07e570a70543d6e9289ecbdda9
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.7.10 b/metadata/md5-cache/net-proxy/haproxy-1.7.10
index ae92218e3e70..ea4b09ccc5a4 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.7.10
+++ b/metadata/md5-cache/net-proxy/haproxy-1.7.10
@@ -4,11 +4,11 @@ DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=6
 HOMEPAGE=http://haproxy.1wt.eu
 IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
 REQUIRED_USE=pcre-jit? ( pcre ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0
 SRC_URI=http://haproxy.1wt.eu/download/1.7/src/haproxy-1.7.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=512f025ee4a7e6657f838b44c540dfc7
+_md5_=455cc3046d3d069fcb5c1c5de3a2adf3
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.7.9999-r2 b/metadata/md5-cache/net-proxy/haproxy-1.7.9999-r2
deleted file mode 100644
index 1ecb00942a11..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.7.9999-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2d67b52ab4287dd7c111efaacb63673e
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.4 b/metadata/md5-cache/net-proxy/haproxy-1.8.4
new file mode 100644
index 000000000000..ed9b182b4f3d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b84c8d95972675fd4b84c28a701ffa45
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.9999 b/metadata/md5-cache/net-proxy/haproxy-1.8.9999
deleted file mode 100644
index eb69b75f7efe..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://haproxy.1wt.eu
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7f49efc81fc3c205b06c61805efdaf43
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.9999 b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
new file mode 100644
index 000000000000..e18478a080d4
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=b84c8d95972675fd4b84c28a701ffa45
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 61ed07a3fbbd..d02b6d24ffe2 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.30 b/metadata/md5-cache/net-vpn/i2p-0.9.30
deleted file mode 100644
index 6059919dfbdf..000000000000
--- a/metadata/md5-cache/net-vpn/i2p-0.9.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:0 nls? ( >=sys-devel/gettext-0.19 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=6
-HOMEPAGE=https://geti2p.net
-IUSE=nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 || ( dev-java/icedtea:7[-sunec] dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:7 dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.30/i2psource_0.9.30.tar.bz2
-_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	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=a5f1f69ec64d4294ae061fdfdfae91d0
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.30-r1 b/metadata/md5-cache/net-vpn/i2p-0.9.30-r1
deleted file mode 100644
index 8496c7ea7731..000000000000
--- a/metadata/md5-cache/net-vpn/i2p-0.9.30-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:0 nls? ( >=sys-devel/gettext-0.19 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
-DESCRIPTION=A privacy-centric, anonymous network.
-EAPI=6
-HOMEPAGE=https://geti2p.net
-IUSE=+ecdsa nls elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:7[-sunec] dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:7 dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.30/i2psource_0.9.30.tar.bz2
-_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	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f788121323b6d76da61c0c4b96d8f702
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.33 b/metadata/md5-cache/net-vpn/i2p-0.9.33
new file mode 100644
index 000000000000..faf6e13dc935
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/i2p-0.9.33
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:0 nls? ( >=sys-devel/gettext-0.19 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DESCRIPTION=A privacy-centric, anonymous network
+EAPI=6
+HOMEPAGE=https://geti2p.net
+IUSE=+ecdsa nls elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
+RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 ecdsa? ( || ( dev-java/icedtea:8[-sunec] dev-java/icedtea-bin:8 dev-java/oracle-jre-bin dev-java/oracle-jdk-bin ) ) !ecdsa? ( >=virtual/jre-1.7 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.33/i2psource_0.9.33.tar.bz2
+_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	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fc09c13a3e5511077518e5512a172d78
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index b39efa00a886..d5a0a5a58cf6 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/yatebts-4.0.0-r3 b/metadata/md5-cache/net-wireless/yatebts-4.0.0-r3
deleted file mode 100644
index 985b0bfd5683..000000000000
--- a/metadata/md5-cache/net-wireless/yatebts-4.0.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig =net-voip/yate-5.4.0-r1:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1 >=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=The Yate GSM base station
-EAPI=5
-HOMEPAGE=http://www.yatebts.com/
-IUSE=rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND==net-voip/yate-5.4.0-r1:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
-SLOT=0
-SRC_URI=http://yate.null.ro/tarballs/yatebts4/yate-bts-4.0.0-1.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_=264649a3919c7aa1f413683130a179a4
diff --git a/metadata/md5-cache/net-wireless/yatebts-5.0.0 b/metadata/md5-cache/net-wireless/yatebts-5.0.0
deleted file mode 100644
index c4ae10d2c3ae..000000000000
--- a/metadata/md5-cache/net-wireless/yatebts-5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig =net-voip/yate-5.5.0-r1:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1 >=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=The Yate GSM base station
-EAPI=5
-HOMEPAGE=http://www.yatebts.com/
-IUSE=rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND==net-voip/yate-5.5.0-r1:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
-SLOT=0
-SRC_URI=http://yate.null.ro/tarballs/yatebts5/yate-bts-5.0.0-1.tar.gz
-_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_=ed7bc6e565425be8a51e7a995c7cfb8b
diff --git a/metadata/md5-cache/net-wireless/yatebts-6.0.0 b/metadata/md5-cache/net-wireless/yatebts-6.0.0
new file mode 100644
index 000000000000..64b757b7b30f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/yatebts-6.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/pkgconfig =net-voip/yate-6.0.0:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1 >=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=The Yate GSM base station
+EAPI=5
+HOMEPAGE=http://www.yatebts.com/
+IUSE=rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND==net-voip/yate-6.0.0:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
+SLOT=0
+SRC_URI=http://yate.null.ro/tarballs/yatebts6/yate-bts-6.0.0-1.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_=b20ad951fa630d80582cbaf76f69b3e1
diff --git a/metadata/md5-cache/net-wireless/yatebts-9999 b/metadata/md5-cache/net-wireless/yatebts-9999
index 2a176c6db98a..90c6f77b5d94 100644
--- a/metadata/md5-cache/net-wireless/yatebts-9999
+++ b/metadata/md5-cache/net-wireless/yatebts-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND==net-voip/yate-9999:=[gsm] bladerf? ( net-wireless/bladerf:= ) uhd? ( net-wireless/uhd ) virtual/libusb:1
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e8e3dbde23257a7b3af961c15df3baf
+_md5_=b20ad951fa630d80582cbaf76f69b3e1
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 44db57a4a7ee..2b278f48ba89 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4
new file mode 100644
index 000000000000..4e9677885755
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interface for using ROS with the gazebo simulator
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.1 b/metadata/md5-cache/ros-meta/pr2_common-1.12.1
new file mode 100644
index 000000000000..4a9b104bb27e
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pr2_common
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7ec273cf015e6dbc2d28e6611c045070
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 3824447f4adc..b0eb71b71cdf 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/xdsgui-0_p130530 b/metadata/md5-cache/sci-chemistry/xdsgui-0_p130530
deleted file mode 100644
index f42be51f2da2..000000000000
--- a/metadata/md5-cache/sci-chemistry/xdsgui-0_p130530
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GUI for XDS that is supposed to help both novice and experienced users
-EAPI=5
-HOMEPAGE=http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/XdsGUI
-KEYWORDS=-* ~amd64 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-util/xxdiff sci-chemistry/xds-bin sci-chemistry/xdsstat-bin sci-visualization/xds-viewer
-SLOT=0
-SRC_URI=amd64? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsGUI.rhel6.64 -> xdsgui-0_p130530.64 ) x86? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsGUI.rhel6.32 -> xdsgui-0_p130530.32 )
-_md5_=93caeeb1723f27912b2303654e6c11ea
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index fbeae8038071..6fab99c7d1bb 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/gebabbel-0.4 b/metadata/md5-cache/sci-geosciences/gebabbel-0.4
deleted file mode 100644
index 8babda17da31..000000000000
--- a/metadata/md5-cache/sci-geosciences/gebabbel-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility]
-DESCRIPTION=Qt-Frontend to load and convert gps tracks with gpsbabel
-EAPI=6
-HOMEPAGE=http://gebabbel.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] sci-geosciences/gpsbabel
-SLOT=0
-SRC_URI=mirror://sourceforge/gebabbel/Gebabbel-0.4-Src.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7b88beb60baa8d8699cd17ec023776fb
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.1 b/metadata/md5-cache/sci-geosciences/gpxsee-5.1
new file mode 100644
index 000000000000..e16de21746f4
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
+EAPI=6
+HOMEPAGE=http://www.gpxsee.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5
+SLOT=0
+SRC_URI=mirror://sourceforge/gpxsee/GPXSee-5.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec1a76dea0d7056b72dcb2c0dca71de5
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 396dc1ee875e..0b6bcb2917cb 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/liborigin-20110829 b/metadata/md5-cache/sci-libs/liborigin-20110829
deleted file mode 100644
index cfcdc585576d..000000000000
--- a/metadata/md5-cache/sci-libs/liborigin-20110829
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/boost dev-qt/qtgui:4 app-arch/unzip dev-cpp/tree doc? ( app-doc/doxygen )
-DESCRIPTION=Library for reading OriginLab OPJ project files
-EAPI=5
-HOMEPAGE=http://soft.proindependent.com/liborigin2/
-IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost dev-qt/qtgui:4
-SLOT=2
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/liborigin2-20110829.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c3d6c171a7318dad290a1560f1743340
diff --git a/metadata/md5-cache/sci-libs/liborigin-20110829-r1 b/metadata/md5-cache/sci-libs/liborigin-20110829-r1
new file mode 100644
index 000000000000..5f4db2be61a5
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/liborigin-20110829-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/boost dev-qt/qtcore:5 dev-qt/qtgui:5 app-arch/unzip dev-cpp/tree doc? ( app-doc/doxygen )
+DESCRIPTION=Library for reading OriginLab OPJ project files
+EAPI=6
+HOMEPAGE=http://soft.proindependent.com/liborigin2/
+IUSE=doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost dev-qt/qtcore:5 dev-qt/qtgui:5
+SLOT=2
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/liborigin2-20110829.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=adb2d15b726752af53eca019cbe306b0
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 0af91f782e28..49015a2137eb 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.8 b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
new file mode 100644
index 000000000000..44bf7c78fa3c
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=virtual/pkgconfig
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=6
+HOMEPAGE=http://mersenne.org/
+KEYWORDS=-* ~amd64
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
+SLOT=0
+SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b8.linux64.tar.gz )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=79001d23c4e9d2cb98db579702e9d5fe
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index f3afe428b992..7964e1a04127 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/bullet-2.86 b/metadata/md5-cache/sci-physics/bullet-2.86
index 8f5bf37f01b9..2116bdeb6b47 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.86
+++ b/metadata/md5-cache/sci-physics/bullet-2.86
@@ -4,11 +4,11 @@ DESCRIPTION=Continuous Collision Detection and Physics Library
 EAPI=6
 HOMEPAGE=http://www.bulletphysics.com/
 IUSE=+bullet3 doc double-precision examples extras test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut
 RESTRICT=test
 SLOT=0/2.86
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/2.86.tar.gz -> bullet-2.86.tar.gz
 _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_=ace448d25f6a6fef5161f60999bb6ea8
+_md5_=a71fc9dc27cec8e24913fd3deb0697ec
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 91e60d1702ee..c89edae232ff 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/xds-viewer-0.6-r1 b/metadata/md5-cache/sci-visualization/xds-viewer-0.6-r1
deleted file mode 100644
index 1e1a78f844d2..000000000000
--- a/metadata/md5-cache/sci-visualization/xds-viewer-0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 media-libs/libpng:0= dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=X-ray diffraction/control image viewer in the context of data processing by XDS
-EAPI=6
-HOMEPAGE=http://xds-viewer.sourceforge.net/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-libs/libpng:0= dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/xds-viewer/xds-viewer-0.6.tar.gz
-_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_=146e92109f9f231d70fce2466dfb766e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ac99dca2f7f5..894dc9020c7b 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/fwupd-1.0.3 b/metadata/md5-cache/sys-apps/fwupd-1.0.3
deleted file mode 100644
index 8e229c289c46..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( 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(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[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(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=6
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc gpg +man systemd test uefi uefi_labels 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 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( 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(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[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(+)?] x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
-REQUIRED_USE=dell? ( uefi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.3.tar.gz -> fwupd-1.0.3.tar.gz
-_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44bd5638cd0c2e09e03019e6e0c0261a
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.5 b/metadata/md5-cache/sys-apps/fwupd-1.0.5
new file mode 100644
index 000000000000..89c94e1bd2bd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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(+)?] app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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(+)?] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans ) app-arch/gcab app-arch/libarchive virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=6
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc gpg +man systemd test uefi uefi_labels 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 ~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 ) 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(+)?] app-crypt/gpgme dev-db/sqlite >=dev-libs/appstream-glib-0.6.13[introspection] >=dev-libs/glib-2.45.8:2 dev-libs/libgpg-error dev-libs/libgudev >=dev-libs/libgusb-0.2.9[introspection] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[cairo,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(+)?] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) uefi_labels? ( x11-libs/pango x11-libs/cairo media-libs/freetype media-libs/fontconfig media-fonts/dejavu media-fonts/source-han-sans )
+REQUIRED_USE=dell? ( uefi )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.5.tar.gz -> fwupd-1.0.5.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd6f6684cd766d9274491855819c3336
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.5 b/metadata/md5-cache/sys-apps/nvme-cli-1.5
new file mode 100644
index 000000000000..13035de69e6b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nvme-cli-1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=sys-libs/libcap:= udev? ( virtual/libudev:= )
+DESCRIPTION=NVM-Express user space tooling for Linux
+EAPI=6
+HOMEPAGE=https://github.com/linux-nvme/nvme-cli
+IUSE=udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/libcap:= udev? ( virtual/libudev:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.5.tar.gz -> nvme-cli-1.5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e3d1952890f1ad9bc931622dedf8a06c
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
index fdc79c42a302..6d836a903490 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=4
 HOMEPAGE=http://cr.yp.to/ucspi-tcp.html
 IUSE=ipv6 qmail-spp selinux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( http://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a51d45a522610e3c30d60a8e1c5c411f
+_md5_=52db543867de435cfd4bde651127bccb
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.7 b/metadata/md5-cache/sys-apps/usbredir-0.7
deleted file mode 100644
index 4b25eb7ce38d..000000000000
--- a/metadata/md5-cache/sys-apps/usbredir-0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libusb-1.0.19 virtual/pkgconfig
-DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
-EAPI=5
-HOMEPAGE=https://www.spice-space.org/page/UsbRedir
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/libusb-1.0.19
-SLOT=0
-SRC_URI=https://www.spice-space.org/download/usbredir/usbredir-0.7.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
-_md5_=3a88a65a6be379a82eb4e1fec3ceb7e3
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20180211 b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20180211
new file mode 100644
index 000000000000..a3e76ff0e191
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usbredir-0.7.1_p20180211
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/libusb:1 virtual/pkgconfig
+DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
+EAPI=6
+HOMEPAGE=https://www.spice-space.org/page/UsbRedir
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://www.spice-space.org/download/usbredir/usbredir-0.7.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/usbredir-0.7.1_p20180211-patches.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4fe84ffb3db2dafc87f57d9607ae38b9
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.32_rc1 b/metadata/md5-cache/sys-apps/util-linux-2.32_rc1
new file mode 100644
index 000000000000..ea605035e044
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.32_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) 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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) 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 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-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(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1 !<sys-apps/s390-tools-1.36.1-r1
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.32/util-linux-2.32-rc1.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	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	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=acab5767cdb375e1fca561d598ce68e4
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 0aeef060f9b4..1c49812ea4a0 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-1.05 b/metadata/md5-cache/sys-auth/google-authenticator-1.05
new file mode 100644
index 000000000000..ba223ea19b68
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/google-authenticator-1.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=virtual/pam >=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=PAM Module for two step verification via mobile platform
+EAPI=6
+HOMEPAGE=https://github.com/google/google-authenticator-libpam
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/pam
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/google/google-authenticator-libpam/archive/1.05.tar.gz -> google-authenticator-1.05.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7fd1d8836b8892c50c6dcb3827fff406
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.13 b/metadata/md5-cache/sys-auth/nss-mdns-0.13
new file mode 100644
index 000000000000..0cd2c9f797a5
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=Name Service Switch module for Multicast DNS
+EAPI=6
+HOMEPAGE=https://github.com/lathiat/nss-mdns
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.13/nss-mdns-0.13.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d7fb895df04118b086afd3add29b580f
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-9999 b/metadata/md5-cache/sys-auth/nss-mdns-9999
index c50beac1caad..f2365cd71d0c 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-9999
+++ b/metadata/md5-cache/sys-auth/nss-mdns-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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 >=dev-vcs/git-1.8.2.1
+DEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/check-0.11 ) >=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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Name Service Switch module for Multicast DNS
 EAPI=6
 HOMEPAGE=https://github.com/lathiat/nss-mdns
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=825cdabcb5568026a345d514e187248e
+_md5_=99e6a7a9a50d59cb2179a4eff8d73c8c
diff --git a/metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1 b/metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
index 32396e3136d0..5e0271dba9e4 100644
--- a/metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
+++ b/metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.110 app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig
 DESCRIPTION=Rules for polkit to add compatibility with pklocalauthority
 EAPI=5
-HOMEPAGE=http://fedorahosted.org/polkit-pkla-compat/
+HOMEPAGE=https://pagure.io/polkit-pkla-compat
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.110
 SLOT=0
-SRC_URI=http://fedorahosted.org/releases/p/o/polkit-pkla-compat/polkit-pkla-compat-0.1.tar.xz
-_md5_=f5bf522c727703eb6ca3292d547147ba
+SRC_URI=https://releases.pagure.org/polkit-pkla-compat/polkit-pkla-compat-0.1.tar.xz
+_md5_=000be140496f688f5ecf4c66e6216fdf
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index b9b21a2692c9..07f23742b51e 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/silo-1.4.14_p20170829 b/metadata/md5-cache/sys-boot/silo-1.4.14_p20170829
new file mode 100644
index 000000000000..8d162467629e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/silo-1.4.14_p20170829
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
+DEPEND=sys-fs/e2fsprogs sys-apps/sparc-utils
+DESCRIPTION=SPARC/UltraSPARC Improved Loader, a boot loader for sparc
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary
+KEYWORDS=-* ~sparc
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/silo-2506051d55dd5cb9fe10b4e978e22fa00363044b.tar.gz -> silo-1.4.14_p20170829.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=170c10c8f6b9b98ffd5ce79b57782369
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-237 b/metadata/md5-cache/sys-boot/systemd-boot-237
new file mode 100644
index 000000000000..298bad09927a
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/systemd-boot-237
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=sys-apps/util-linux-2.30 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/intltool-0.50 dev-util/gperf >=sys-boot/gnu-efi-3.0.2 sys-libs/libcap virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=UEFI boot manager from systemd (formerly gummiboot)
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v237.tar.gz -> systemd-237.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=048a34ad3162179c5aaa83c86d919095
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index e01d7f321ad3..aeb7d025470b 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/heat-2017.2.9999 b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
index 0f532201ad61..ff91216909e6 100644
--- a/metadata/md5-cache/sys-cluster/heat-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 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/croniter-0.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/cryptography-1.6.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-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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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(-)] >=dev-python/keystonemiddleware-4.12.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/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-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/netaddr-0.7.13[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/netaddr-0.7.16[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/openstacksdk-0.9.17[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-cache-1.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-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-concurrency-3.8.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-db-4.24.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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.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-1.23.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-reports-0.6.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-serialization-2.19.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-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.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/pastedeploy-1.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/pycrypto-2.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/aodhclient-0.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/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/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.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-glanceclient-2.8.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-heatclient-1.6.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/python-keystoneclient-3.8.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-magnumclient-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/python-manilaclient-1.12.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-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.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/python-neutronclient-6.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/python-novaclient-9.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-openstackclient-3.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/python-openstackclient-3.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/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.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-troveclient-2.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-zaqarclient-1.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-zunclient-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/pytz-2013.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/pyyaml-3.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/requests-2.14.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.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/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/webob-1.7.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/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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(-)]
+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/croniter-0.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/cryptography-1.6.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-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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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(-)] >=dev-python/keystonemiddleware-4.12.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/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-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/netaddr-0.7.13[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/netaddr-0.7.16[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/openstacksdk-0.9.17[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-cache-1.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-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-concurrency-3.8.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-db-4.24.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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.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-1.23.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-reports-0.6.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-serialization-2.19.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-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.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/pastedeploy-1.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/pycrypto-2.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/aodhclient-0.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/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/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.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-glanceclient-2.8.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-heatclient-1.6.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/python-keystoneclient-3.8.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-magnumclient-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/python-manilaclient-1.12.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-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.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/python-neutronclient-6.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/python-novaclient-9.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-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.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-troveclient-2.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-zaqarclient-1.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-zunclient-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/pytz-2013.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/pyyaml-3.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/requests-2.14.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.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/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/webob-1.7.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/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-2017.2.9999
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4549b8559fd25e98dd35943e4cf530d6
+_md5_=102805980c81443609021c291d3b7a78
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.3 b/metadata/md5-cache/sys-cluster/heat-9.0.3
new file mode 100644
index 000000000000..61faf8316833
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup 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 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
+EAPI=6
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite 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/croniter-0.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/cryptography-1.6.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-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/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/eventlet-0.20.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/eventlet-0.21.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(-)] >=dev-python/keystonemiddleware-4.12.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/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/lxml-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/netaddr-0.7.13[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/netaddr-0.7.16[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/openstacksdk-0.9.17[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-cache-1.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-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-concurrency-3.8.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-db-4.24.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.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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-messaging-5.24.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/oslo-messaging-5.25.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-middleware-3.27.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-1.23.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-reports-0.6.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-serialization-2.19.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-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-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/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/oslo-versionedobjects-1.17.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/pastedeploy-1.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/pycrypto-2.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/aodhclient-0.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/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/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-cinderclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-designateclient-1.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-glanceclient-2.8.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-heatclient-1.6.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/python-keystoneclient-3.8.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-magnumclient-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/python-manilaclient-1.12.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-mistralclient-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-monascaclient-1.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/python-neutronclient-6.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/python-novaclient-9.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-openstackclient-3.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-saharaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-senlinclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-swiftclient-3.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-troveclient-2.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-zaqarclient-1.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-zunclient-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/pytz-2013.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/pyyaml-3.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/requests-2.14.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/tenacity-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,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/sqlalchemy-1.1.5[sqlite,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/sqlalchemy-1.1.6[sqlite,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/sqlalchemy-1.1.7[sqlite,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/sqlalchemy-1.1.8[sqlite,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(-)] ) mysql? ( >=dev-python/pymysql-0.7.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/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-1.0.10[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/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.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/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/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/webob-1.7.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/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.3 https://tarballs.openstack.org/heat/heat-9.0.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=102805980c81443609021c291d3b7a78
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.6
deleted file mode 100644
index 954e01e7d9e4..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=cc553c3a336e906df5bbf2d01cc52f78
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.1
deleted file mode 100644
index ca7b9f8cdb43..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.3
new file mode 100644
index 000000000000..116a7e89af18
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=95632e2567f463df79549abd7de26243
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.6
deleted file mode 100644
index c45eb7475ca6..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0ebb3cd56316d804d6bf6afc6ad131b3
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.1 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.1
deleted file mode 100644
index 4a64fb03b651..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.3
new file mode 100644
index 000000000000..0ecae44b80d8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=183de1f6b1b10cbfe7ab70ce8d6545c8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.8.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.8.6
deleted file mode 100644
index bff2a9e210ef..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=c592b8aae01f7e92faf8745785c3ff96
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.1 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.1
deleted file mode 100644
index b014ec35e779..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.9.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.3
new file mode 100644
index 000000000000..50f2e0831660
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=219d34de6bde115d0ca48eae17c8e5b6
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6
deleted file mode 100644
index 26831f705d4b..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=010afc94b1b18e3734e4de2943afecff
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.1 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.1
deleted file mode 100644
index 44097c130b00..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.3
new file mode 100644
index 000000000000..1137478e3d08
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d2125ab119a2ee26ae9d7f733ebea577
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.8.6 b/metadata/md5-cache/sys-cluster/kubectl-1.8.6
deleted file mode 100644
index 0686df6d6d30..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ab8c2a85955c6b05cbe589b5cd726840
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.1 b/metadata/md5-cache/sys-cluster/kubectl-1.9.1
deleted file mode 100644
index de7054d9eef8..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.9.3 b/metadata/md5-cache/sys-cluster/kubectl-1.9.3
new file mode 100644
index 000000000000..a6b038cf7b94
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6a654132e79a1fd0328537aae8e33b2e
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.8.6 b/metadata/md5-cache/sys-cluster/kubelet-1.8.6
deleted file mode 100644
index 932fd7dee0c7..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.8.6.tar.gz -> kubernetes-1.8.6.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=e741c8ae7322e0a046a4039d2e219c34
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.1 b/metadata/md5-cache/sys-cluster/kubelet-1.9.1
deleted file mode 100644
index 294620aaeff2..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.1.tar.gz -> kubernetes-1.9.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.9.3 b/metadata/md5-cache/sys-cluster/kubelet-1.9.3
new file mode 100644
index 000000000000..fa2d02dbf28e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.9.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.9.3.tar.gz -> kubernetes-1.9.3.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=f7d406f92663bea2f1367aa0d248834d
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index de446373cf97..9047d0a1b83f 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1 b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
index 54b01427d350..b6cdd21bbc84 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-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 ~x64-macos ~x86-macos
+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 ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8:= dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5bab3957f7b7d6278538cbb56bade362
+_md5_=f48c73640f9e5a0a115d12eeef1cb182
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.30 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.30
index e874957ea776..58de15e6cb31 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.30
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.30
@@ -10,4 +10,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.30
 SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.30-patches-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7580977d535968e543b85d84555c8d2f
+_md5_=9f88557274bd098c209cdd604a7340fa
diff --git a/metadata/md5-cache/sys-devel/dev86-0.16.19 b/metadata/md5-cache/sys-devel/dev86-0.16.19
deleted file mode 100644
index ead478744161..000000000000
--- a/metadata/md5-cache/sys-devel/dev86-0.16.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bin86 dev-util/gperf
-DESCRIPTION=Bruce's C compiler - Simple C compiler to generate 8086 code
-EAPI=4
-HOMEPAGE=http://www.debath.co.uk/ https://github.com/lkundrak/dev86
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/bin86
-SLOT=0
-SRC_URI=http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=21bba5dae8cac15912deeb8fe084b8a5
diff --git a/metadata/md5-cache/sys-devel/dev86-0.16.21-r2 b/metadata/md5-cache/sys-devel/dev86-0.16.21-r2
index 7a5b2d9a272b..9ffa49d60789 100644
--- a/metadata/md5-cache/sys-devel/dev86-0.16.21-r2
+++ b/metadata/md5-cache/sys-devel/dev86-0.16.21-r2
@@ -3,10 +3,10 @@ DEPEND=sys-devel/bin86 dev-util/gperf
 DESCRIPTION=Bruce's C compiler - Simple C compiler to generate 8086 code
 EAPI=6
 HOMEPAGE=http://www.debath.co.uk/ https://github.com/lkundrak/dev86
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/bin86
 SLOT=0
 SRC_URI=http://v3.sk/~lkundrak/dev86/Dev86src-0.16.21.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a132e7036fda4b51d3201bd7002cfd5e
+_md5_=2a49847d4f8067cbe37afb67e3965bea
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6 b/metadata/md5-cache/sys-devel/patch-2.7.6
deleted file mode 100644
index aaee866676c7..000000000000
--- a/metadata/md5-cache/sys-devel/patch-2.7.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=xattr? ( sys-apps/attr ) test? ( sys-apps/ed )
-DESCRIPTION=Utility to apply diffs to files
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/patch/patch.html
-IUSE=static test xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6c30383b5885cd03ed0b0720d74a6a1b
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r1 b/metadata/md5-cache/sys-devel/patch-2.7.6-r1
new file mode 100644
index 000000000000..6ce0b109c952
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=xattr? ( sys-apps/attr ) test? ( sys-apps/ed )
+DESCRIPTION=Utility to apply diffs to files
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/patch/patch.html
+IUSE=static test xattr
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=xattr? ( sys-apps/attr )
+SLOT=0
+SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=96d88988d77ffe3fc5f7f06a7d1eb68a
diff --git a/metadata/md5-cache/sys-devel/sparse-0.4.3 b/metadata/md5-cache/sys-devel/sparse-0.4.3
deleted file mode 100644
index 5cea686e5a14..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=2
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk xml test
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=OSL-1.1
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) xml? ( dev-libs/libxml2 )
-SLOT=0
-SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.4.3.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
-_md5_=a798d5dff3fe571c1916985014436c3e
diff --git a/metadata/md5-cache/sys-devel/sparse-0.4.4 b/metadata/md5-cache/sys-devel/sparse-0.4.4
deleted file mode 100644
index 9f940afb83dc..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=4
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=OSL-1.1
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) xml? ( dev-libs/libxml2 )
-SLOT=0
-SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.4.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5c42681c6411e908308a1b68744f59a4
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.0 b/metadata/md5-cache/sys-devel/sparse-0.5.0
deleted file mode 100644
index d22f2edd4dec..000000000000
--- a/metadata/md5-cache/sys-devel/sparse-0.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
-DESCRIPTION=C semantic parser
-EAPI=4
-HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
-IUSE=gtk llvm test xml
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=OSL-1.1
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
-SLOT=0
-SRC_URI=mirror://kernel/software/devel/sparse/dist/sparse-0.5.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=377347d3fb590696bdd9e0d36103d1c2
diff --git a/metadata/md5-cache/sys-devel/sparse-0.5.1 b/metadata/md5-cache/sys-devel/sparse-0.5.1
new file mode 100644
index 000000000000..2cdc4e425d40
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/sparse-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile prepare
+DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )
+DESCRIPTION=C semantic parser
+EAPI=6
+HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
+IUSE=gtk llvm test xml
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/devel/sparse/sparse.git/snapshot/sparse-0.5.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b9c96dfc19b945d3c557664cb08b685a
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 3c9a5194edfd..4c6d30423301 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig ) dev-vcs/git
+DEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 ) gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C semantic parser
-EAPI=4
+EAPI=6
 HOMEPAGE=https://sparse.wiki.kernel.org/index.php/Main_Page
 IUSE=gtk llvm test xml
-LICENSE=OSL-1.1
+LICENSE=MIT
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=377347d3fb590696bdd9e0d36103d1c2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b9c96dfc19b945d3c557664cb08b685a
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 4676c67facd1..f45c3658f44a 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
new file mode 100644
index 000000000000..792d882fd2c1
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=!binary? ( amd64? ( >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) )
+DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
+EAPI=6
+HOMEPAGE=https://github.com/tianocore/edk2
+IUSE=+binary
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=BSD-2 MIT
+REQUIRED_USE=!amd64? ( binary )
+SLOT=0
+SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9442a92325179fed831bfe521b425585
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505
deleted file mode 100644
index 3db6782ed9d1..000000000000
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=6
-HOMEPAGE=https://github.com/tianocore/edk2
-IUSE=+binary
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505.tar.xz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2637f4d12f02f5d65a62ab323bacc893
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
index 5dbba219d363..9446670beb63 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_pre20170505-r1
@@ -4,10 +4,10 @@ DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=6
 HOMEPAGE=https://github.com/tianocore/edk2
 IUSE=+binary
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_pre20170505.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ee1475d0597a618d605b96da9c935c2a
+_md5_=efa6a9467bbabf95085c5bcf8652b118
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
new file mode 100644
index 000000000000..83921ba5ef75
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20180211
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=!binary? ( amd64? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) x86? ( app-arch/xz-utils dev-lang/perl sys-libs/zlib iso? ( sys-boot/syslinux virtual/cdrtools ) ) )
+DESCRIPTION=Open source network boot (PXE) firmware
+EAPI=6
+HOMEPAGE=http://ipxe.org/
+IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=!amd64? ( !x86? ( binary ) )
+SLOT=0
+SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/546dd51de8459d4d09958891f426fa2c73ff090d.tar.bz2 -> ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7cc33431b5d522a470cc2e171208c664
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.10.1 b/metadata/md5-cache/sys-firmware/seabios-1.10.1
deleted file mode 100644
index 2204aa1ba45c..000000000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=5
-HOMEPAGE=https://www.seabios.org/
-IUSE=+binary debug +seavgabios
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3 GPL-3
-REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
-SLOT=0
-SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.1.tar.gz ) binary? ( mirror://gentoo/bios.bin-1.10.1.xz seavgabios? ( mirror://gentoo/seavgabios-bin-1.10.1.tar.xz ) )
-_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_=faf02c07d67d7a1c614a539f57e4852a
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.11.0 b/metadata/md5-cache/sys-firmware/seabios-1.11.0
new file mode 100644
index 000000000000..06fc20e4dd47
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/seabios-1.11.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install pretend setup unpack
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=6
+HOMEPAGE=https://www.seabios.org/
+IUSE=+binary debug +seavgabios
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
+SLOT=0
+SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
+_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_=a0cf7a6fc06b550bf09c5058bfde572e
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
new file mode 100644
index 000000000000..d3bf6931a54e
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=serial graphics adapter bios option rom for x86
+EAPI=6
+HOMEPAGE=https://code.google.com/p/sgabios/
+IUSE=+binary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=Apache-2.0
+REQUIRED_USE=!amd64? ( !x86? ( binary ) )
+SLOT=0
+SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz !binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz ) binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e2ed3d6eaf0b105045a80af8bb4e3ee5
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 652555ce502e..d41615430529 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/exfat-utils-1.2.8 b/metadata/md5-cache/sys-fs/exfat-utils-1.2.8
index 60335b362203..192ea14f4a0c 100644
--- a/metadata/md5-cache/sys-fs/exfat-utils-1.2.8
+++ b/metadata/md5-cache/sys-fs/exfat-utils-1.2.8
@@ -2,8 +2,8 @@ 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
+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_=3f324d42494c0ccbcbeb154ef4c7cfb9
+_md5_=4765e5caeeddb5ad4191f3662e33b664
diff --git a/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8 b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8
index 76c6e0ca7de7..32559bc5b7e0 100644
--- a/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8
+++ b/metadata/md5-cache/sys-fs/fuse-exfat-1.2.8
@@ -3,9 +3,9 @@ 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
+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_=0370e9ab9b1ff42f6f40a521e01711ab
+_md5_=beb3309085888bc76abb65c1cec9c26a
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.12 b/metadata/md5-cache/sys-fs/ncdu-1.12
index 2d67a5955836..db55c5222009 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.12
+++ b/metadata/md5-cache/sys-fs/ncdu-1.12
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
 DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
 DESCRIPTION=NCurses Disk Usage
 EAPI=6
-HOMEPAGE=http://dev.yorhel.nl/ncdu/
+HOMEPAGE=https://dev.yorhel.nl/ncdu/
 KEYWORDS=alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses:0=[unicode]
 SLOT=0
-SRC_URI=http://dev.yorhel.nl/download/ncdu-1.12.tar.gz
-_md5_=7251a1f32672c5e90baa1f9119dedb6d
+SRC_URI=https://dev.yorhel.nl/download/ncdu-1.12.tar.gz
+_md5_=98f38d5c64e0f271a2cf583ff0e37c50
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-0.3.0 b/metadata/md5-cache/sys-fs/simple-mtpfs-0.3.0
index ea2b140471ac..34dcb7e83067 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-0.3.0
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-0.3.0
@@ -3,10 +3,10 @@ DEPEND=media-libs/libmtp sys-fs/fuse:0 virtual/pkgconfig >=app-portage/elt-patch
 DESCRIPTION=Simple MTP fuse filesystem driver
 EAPI=6
 HOMEPAGE=https://github.com/phatina/simple-mtpfs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp sys-fs/fuse:0
 SLOT=0
 SRC_URI=https://github.com/phatina/simple-mtpfs/archive/simple-mtpfs-0.3.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=46dcd1be227f61d6283faf731f80ae15
+_md5_=edc30508a171a24913b2a32872801f9d
diff --git a/metadata/md5-cache/sys-fs/udev-237 b/metadata/md5-cache/sys-fs/udev-237
new file mode 100644
index 000000000000..9dfd7535f3f1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-237
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf >=dev-util/intltool-0.50 >=dev-util/meson-0.40.0 dev-util/ninja >=sys-apps/coreutils-8.16 virtual/os-headers virtual/pkgconfig >=sys-kernel/linux-headers-3.9 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux abi_x86_32 abi_x86_64 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=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v237.tar.gz -> systemd-237.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ad1b2dc7f60e60bca3acf666551be4d1
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 685f213b294e..a4cc691acc10 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=214801059097714af2f22f5a0fae2ab6
+_md5_=ad1b2dc7f60e60bca3acf666551be4d1
diff --git a/metadata/md5-cache/sys-fs/udisks-2.7.6 b/metadata/md5-cache/sys-fs/udisks-2.7.6
new file mode 100644
index 000000000000..dda84ba43c3d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.7.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.14[cryptsetup,lvm?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 >=sys-kernel/linux-headers-3.1 virtual/pkgconfig nls? ( dev-util/intltool ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+IUSE=acl debug elogind +introspection lvm nls selinux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.14[cryptsetup,lvm?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.30 >=sys-block/parted-3 virtual/eject selinux? ( sec-policy/selinux-devicekit )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.7.6/udisks-2.7.6.tar.bz2
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e23faf8731d4fd7a121b8c1457c1f819
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.9999 b/metadata/md5-cache/sys-fs/zfs-0.7.9999
new file mode 100644
index 000000000000..2891a18b0a29
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/pkgconfig >=dev-vcs/git-1.8.2.1 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=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 virtual/pkgconfig
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel-builtin +rootfs test-suite static-libs kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
+RESTRICT=test
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=71d48c7a4601fdbba5a3837d7d2f9a9a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999
new file mode 100644
index 000000000000..1f670e21505c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND==sys-kernel/spl-0.7.9999* dev-lang/perl virtual/awk >=dev-vcs/git-1.8.2.1 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=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=Linux ZFS kernel module for sys-fs/zfs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug +rootfs kernel_linux
+LICENSE=CDDL debug? ( GPL-2+ )
+RDEPEND==sys-kernel/spl-0.7.9999* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=0004e84d3bc3d77833b9983b2d4a7468
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1c54ce1c1a82..6323da70c09e 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/ck-sources-4.9.81 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.81
new file mode 100644
index 000000000000..8908f9bf2793
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.81
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-84.base.tar.xz mirror://gentoo/genpatches-4.9-84.extras.tar.xz mirror://gentoo/genpatches-4.9-84.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=89f7728e967d55f98d3671dc31e90997
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.19
new file mode 100644
index 000000000000..5969f4873b41
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.19
@@ -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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.19
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-24.base.tar.xz mirror://gentoo/genpatches-4.14-24.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-24.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=89c8e4bafae997c3a9144a0987609550
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.3
new file mode 100644
index 000000000000..fe59cb506ce5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.15.3
@@ -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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz mirror://gentoo/genpatches-4.15-4.base.tar.xz mirror://gentoo/genpatches-4.15-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.15-4.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=63cdecf3626b818ffdff0fa31cb88e8b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.81 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.81
new file mode 100644
index 000000000000..5c12ba40a479
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.81
@@ -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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.81
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-84.base.tar.xz mirror://gentoo/genpatches-4.9-84.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-84.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f5d99c404907a675e0c6fd234c14772a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc1
deleted file mode 100644
index 9396ecf72f99..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc1
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc1/v4.14 -> patch-4.15-rc1.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc2
deleted file mode 100644
index 4763420e8d7d..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc2
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc2/v4.14 -> patch-4.15-rc2.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc3
deleted file mode 100644
index 862a76f9bf36..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc3
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc3/v4.14 -> patch-4.15-rc3.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4
deleted file mode 100644
index acae7d6b4cde..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc4
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc4/v4.14 -> patch-4.15-rc4.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc5
deleted file mode 100644
index 4df07b393736..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc5
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc5/v4.14 -> patch-4.15-rc5.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d61b1c207ae9c2b0f6de60fc1485bad
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc6
deleted file mode 100644
index 3bdccca7c460..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc6
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc6/v4.14 -> patch-4.15-rc6.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc7 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc7
deleted file mode 100644
index 73bab273edec..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc7
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc7/v4.14 -> patch-4.15-rc7.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8
deleted file mode 100644
index a41b464f1120..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc8
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc8/v4.14 -> patch-4.15-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9
deleted file mode 100644
index f64974e9c42e..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15_rc9
-SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc9/v4.14 -> patch-4.15-rc9.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.16_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc1
new file mode 100644
index 000000000000..6f6e5ebd03ab
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.16_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16_rc1
+SRC_URI=https://git.kernel.org/torvalds/p/v4.16-rc1/v4.15 -> patch-4.16-rc1.patch mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f574e23ca6bde475eeea1dd06b588440
diff --git a/metadata/md5-cache/sys-kernel/kccmp-0.3 b/metadata/md5-cache/sys-kernel/kccmp-0.3
deleted file mode 100644
index 7ba6531fbf7b..000000000000
--- a/metadata/md5-cache/sys-kernel/kccmp-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=A simple tool for comparing two linux kernel .config files
-EAPI=4
-HOMEPAGE=http://stoopidsimple.com/kccmp/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=http://stoopidsimple.com/files/kccmp-0.3.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=eeb822c05b8c5c84aeea63e88a77ea15
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.18_p15 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.18_p15
new file mode 100644
index 000000000000..b099069c1443
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.18_p15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.18_p15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-4.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.18-rt15.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.18-rt15.patch.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=175fbf54f3a05c771dc5d3487a9f75e3
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.115_p130 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.115_p130
new file mode 100644
index 000000000000..b974eac5d46e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.115_p130
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.4 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.115_p130
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.115.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-4.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.115-rt130.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.115-rt130.patch.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=cb3c840816e44246c1a6459de8cde1d9
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9999 b/metadata/md5-cache/sys-kernel/spl-0.7.9999
new file mode 100644
index 000000000000..629cf7fdb222
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-lang/perl virtual/awk >=dev-vcs/git-1.8.2.1 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=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=The Solaris Porting Layer provides many of the Solaris kernel APIs
+EAPI=5
+HOMEPAGE=http://zfsonlinux.org/
+IUSE=custom-cflags debug kernel_linux
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=bfe371c0c898b74c031fc5d590cc1973
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.53 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.53
deleted file mode 100644
index e4d0ff107c02..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.53
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.16.53
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.53.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54
new file mode 100644
index 000000000000..0b4041e50cc7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.54
@@ -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 for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.16.54
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.54.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.98 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.98
deleted file mode 100644
index 96610118a26f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.2.98
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.98.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99
new file mode 100644
index 000000000000..481632313bec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.99
@@ -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 for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.2.99
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.99.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.18
deleted file mode 100644
index f7bce1e6312c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.18
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.19
new file mode 100644
index 000000000000..a877183bb746
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.19
@@ -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 for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.19
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.2
deleted file mode 100644
index d6230facefde..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.15.2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.2.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.3
new file mode 100644
index 000000000000..436f4ca5e10a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.15.3
@@ -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 for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.15.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.15.3.xz mirror://kernel/linux/kernel/v4.x/linux-4.15.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.80 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.80
deleted file mode 100644
index 9c3e245d3412..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.80
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.80
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.80.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.81 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.81
new file mode 100644
index 000000000000..ef01434861ca
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.81
@@ -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 for the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~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 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.81
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.81.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c17426767d4d7574c7b84c5adfcb4305
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2102014f0bc5..19ac3ab68587 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/glibc-2.26-r6 b/metadata/md5-cache/sys-libs/glibc-2.26-r6
index 23a3ec6f32f4..1a15ee951ad7 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r6
@@ -4,6 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=802d519966da7604d587fec53acd486d
+_md5_=d90e825888195581db407d1b9e7024a7
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1 b/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1
new file mode 100644
index 000000000000..6f347addc934
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:2 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) test? ( dev-qt/qttest:5 ) webkit? ( dev-qt/qtwebkit:5 ) sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=A multi-platform helper library for other libraries
+EAPI=6
+HOMEPAGE=https://www.aquamaniac.de/aqbanking/
+IUSE=debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:2 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) test? ( dev-qt/qttest:5 ) webkit? ( dev-qt/qtwebkit:5 )
+REQUIRED_USE=designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=gwenhywfar-4.19.0.tar.gz -> gwenhywfar-4.19.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ab26077ca20cdfe1844121db9d15e6da
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.12.0 b/metadata/md5-cache/sys-libs/libapparmor-2.12.0
index 673592a060c7..c17b91a05c94 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.12.0
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=Library to support AppArmor userspace utilities
 EAPI=5
 HOMEPAGE=http://apparmor.net/
 IUSE=doc +perl +python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= ) 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(-)] )
 REQUIRED_USE=|| ( 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=https://launchpad.net/apparmor/2.12/2.12.0/+download/apparmor-2.12.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d07becad2b94fa117ff41335b396bd0
+_md5_=c91bb3d3e84e19f493f51d849b38a369
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.16 b/metadata/md5-cache/sys-libs/libblockdev-2.16
new file mode 100644
index 000000000000..2f6288e8d46f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) kbd? ( >=sys-apps/kmod-19 ) 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(+)?] >=dev-libs/gobject-introspection-1.3.0 doc? ( dev-util/gtk-doc ) >=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=A library for manipulating block devices
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/libblockdev
+IUSE=bcache +cryptsetup dmraid doc lvm kbd test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) kbd? ( >=sys-apps/kmod-19 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.16-1.tar.gz -> libblockdev-2.16-1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=449dc27d9ebd893f9d57f06252ef150e
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 9d74166a1e84..36e7c749ab96 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/criu-2.12.1-r1 b/metadata/md5-cache/sys-process/criu-2.12.1-r1
deleted file mode 100644
index e6aab23102d7..000000000000
--- a/metadata/md5-cache/sys-process/criu-2.12.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python setproctitle python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-2.12.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=85686523c0503176971bb8e01e81a5f2
diff --git a/metadata/md5-cache/sys-process/criu-3.4-r1 b/metadata/md5-cache/sys-process/criu-3.4-r1
deleted file mode 100644
index e17af845b67d..000000000000
--- a/metadata/md5-cache/sys-process/criu-3.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python setproctitle python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-3.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=eb3bc9b7da585f41599515e154cf5e45
diff --git a/metadata/md5-cache/sys-process/criu-3.7 b/metadata/md5-cache/sys-process/criu-3.7
new file mode 100644
index 000000000000..49455acb70ea
--- /dev/null
+++ b/metadata/md5-cache/sys-process/criu-3.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
+DESCRIPTION=utility to checkpoint/restore a process tree
+EAPI=6
+HOMEPAGE=http://criu.org/
+IUSE=python selinux setproctitle static-libs python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=GPL-2
+RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) python? ( || ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/protobuf[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.openvz.org/criu/criu-3.7.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=25dd9eb9e07cd48f3855689d0518ddbf
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.1-r1 b/metadata/md5-cache/sys-process/cronie-1.5.1-r1
new file mode 100644
index 000000000000..8a02e5660dfc
--- /dev/null
+++ b/metadata/md5-cache/sys-process/cronie-1.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron ) >=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.0.5 virtual/pkgconfig
+DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
+EAPI=6
+HOMEPAGE=https://github.com/cronie-crond/cronie
+IUSE=+anacron +inotify pam selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=ISC BSD BSD-2 GPL-2
+RDEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
+SLOT=0
+SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cron	f1612f73abbd36aca8b193e1e2cac6d5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f67c60bee48b1c4b032691c31bf6f89e
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b10e8670deee..aefb74e7abf3 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2 b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2
deleted file mode 100644
index 956409b23ff3..000000000000
--- a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual to choose between different icon themes
-EAPI=6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/gnome-icon-theme x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme kde-frameworks/oxygen-icons x11-themes/mate-icon-theme x11-themes/elementary-xfce-icon-theme )
-SLOT=0
-_md5_=28d4b99aa3bc54369aef7b454f96e664
diff --git a/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3 b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
new file mode 100644
index 000000000000..86317c0f9d16
--- /dev/null
+++ b/metadata/md5-cache/virtual/freedesktop-icon-theme-0-r3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual to choose between different icon themes
+EAPI=6
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme lxde-base/lxde-icon-theme x11-themes/tango-icon-theme kde-frameworks/oxygen-icons x11-themes/mate-icon-theme x11-themes/elementary-xfce-icon-theme )
+SLOT=0
+_md5_=1ba01147d5adb37cbefaee165b0d51ce
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index c70e53e6b092..dd998ed5d048 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/grafana-bin-4.6.2 b/metadata/md5-cache/www-apps/grafana-bin-4.6.2
deleted file mode 100644
index b384bef50a96..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-4.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=5
-HOMEPAGE=http://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.6.2.linux-x64.tar.gz -> grafana-bin-4.6.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=11236376477609af59e5a1a5ae48b942
diff --git a/metadata/md5-cache/www-apps/grafana-bin-5.0.0_beta1 b/metadata/md5-cache/www-apps/grafana-bin-5.0.0_beta1
new file mode 100644
index 000000000000..599c9abb2959
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.0.0_beta1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=5
+HOMEPAGE=http://grafana.org
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta1.linux-x64.tar.gz -> grafana-bin-5.0.0_beta1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=50d49dc68b4ac0b8eba41036a6e90f40
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.3 b/metadata/md5-cache/www-apps/otrs-6.0.3
new file mode 100644
index 000000000000..798c5794291a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/otrs-6.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst prepare setup
+DEPEND=media-libs/libpng:0 virtual/pkgconfig
+DESCRIPTION=OTRS is an Open source Ticket Request System
+EAPI=6
+HOMEPAGE=https://www.otrs.com/
+IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Socket-SSL dev-perl/JSON-XS dev-perl/LWP-UserAgent-Determined dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient >dev-perl/Net-DNS-0.60 dev-perl/Template-Toolkit dev-perl/Text-CSV_XS dev-perl/TimeDate dev-perl/DateTime dev-perl/XML-LibXML-Simple dev-perl/XML-Parser dev-perl/YAML-LibYAML apache2? ( mod_perl? ( www-servers/apache:2 =www-apache/libapreq2-2* www-apache/mod_perl ) !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) ) fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi ) !fastcgi? ( !apache2? ( virtual/httpd-cgi ) ) gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) pdf? ( >=dev-perl/PDF-API2-0.73 virtual/perl-Compress-Raw-Zlib ) soap? ( dev-perl/SOAP-Lite !=dev-perl/SOAP-Lite-0.711 !=dev-perl/SOAP-Lite-0.712 )
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=0
+SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.3.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6762beb9709a90ed8a1419fd08d07ed7
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.4 b/metadata/md5-cache/www-apps/otrs-6.0.4
new file mode 100644
index 000000000000..78ecc018f7ee
--- /dev/null
+++ b/metadata/md5-cache/www-apps/otrs-6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst prepare setup
+DEPEND=media-libs/libpng:0 virtual/pkgconfig
+DESCRIPTION=OTRS is an Open source Ticket Request System
+EAPI=6
+HOMEPAGE=https://www.otrs.com/
+IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Socket-SSL dev-perl/JSON-XS dev-perl/LWP-UserAgent-Determined dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient >dev-perl/Net-DNS-0.60 dev-perl/Template-Toolkit dev-perl/Text-CSV_XS dev-perl/TimeDate dev-perl/DateTime dev-perl/XML-LibXML-Simple dev-perl/XML-Parser dev-perl/YAML-LibYAML apache2? ( mod_perl? ( www-servers/apache:2 =www-apache/libapreq2-2* www-apache/mod_perl ) !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) ) fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi ) !fastcgi? ( !apache2? ( virtual/httpd-cgi ) ) gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) pdf? ( >=dev-perl/PDF-API2-0.73 virtual/perl-Compress-Raw-Zlib ) soap? ( dev-perl/SOAP-Lite !=dev-perl/SOAP-Lite-0.711 !=dev-perl/SOAP-Lite-0.712 )
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=0
+SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.4.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6762beb9709a90ed8a1419fd08d07ed7
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.5 b/metadata/md5-cache/www-apps/otrs-6.0.5
new file mode 100644
index 000000000000..ee84da455fe6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/otrs-6.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config install postinst prepare setup
+DEPEND=media-libs/libpng:0 virtual/pkgconfig
+DESCRIPTION=OTRS is an Open source Ticket Request System
+EAPI=6
+HOMEPAGE=https://www.otrs.com/
+IUSE=apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Socket-SSL dev-perl/JSON-XS dev-perl/LWP-UserAgent-Determined dev-perl/Mail-POP3Client dev-perl/Mail-IMAPClient >dev-perl/Net-DNS-0.60 dev-perl/Template-Toolkit dev-perl/Text-CSV_XS dev-perl/TimeDate dev-perl/DateTime dev-perl/XML-LibXML-Simple dev-perl/XML-Parser dev-perl/YAML-LibYAML apache2? ( mod_perl? ( www-servers/apache:2 =www-apache/libapreq2-2* www-apache/mod_perl ) !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) ) fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi ) !fastcgi? ( !apache2? ( virtual/httpd-cgi ) ) gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) pdf? ( >=dev-perl/PDF-API2-0.73 virtual/perl-Compress-Raw-Zlib ) soap? ( dev-perl/SOAP-Lite !=dev-perl/SOAP-Lite-0.711 !=dev-perl/SOAP-Lite-0.712 )
+REQUIRED_USE=|| ( mysql postgres )
+SLOT=0
+SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.5.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6762beb9709a90ed8a1419fd08d07ed7
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.1 b/metadata/md5-cache/www-apps/postfixadmin-3.1
index 2dc62c62651e..1634b7d3ed44 100644
--- a/metadata/md5-cache/www-apps/postfixadmin-3.1
+++ b/metadata/md5-cache/www-apps/postfixadmin-3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Web Based Management tool for Postfix style virtual domains and user
 EAPI=6
 HOMEPAGE=http://postfixadmin.sourceforge.net
 IUSE=+mysql postgres +vacation vhosts
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( dev-perl/DBI virtual/perl-MIME-Base64 dev-perl/MIME-EncWords dev-perl/Email-Valid dev-perl/Mail-Sender dev-perl/Log-Dispatch dev-perl/Log-Log4perl dev-perl/MIME-Charset mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) ) virtual/httpd-php mysql? ( || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=3.1
 SRC_URI=mirror://sourceforge/project/postfixadmin/postfixadmin/postfixadmin-3.1/postfixadmin-3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=e4ef99cde9d37ea6ff46a282e1cb0f40
+_md5_=f2b5db2f40e6fcbd6bbf3adece44915e
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index dd2762c89e4c..ecc0947fad24 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/chromium-63.0.3239.132 b/metadata/md5-cache/www-client/chromium-63.0.3239.132
deleted file mode 100644
index fc950cf54621..000000000000
--- a/metadata/md5-cache/www-client/chromium-63.0.3239.132
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.132.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4f43eb1a9dd2571c1763049b7bca0b7
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.167 b/metadata/md5-cache/www-client/chromium-64.0.3282.167
new file mode 100644
index 000000000000..64ed9d4ce9ce
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.167
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.167.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe29ba099f411d03fcd816a4967adce7
diff --git a/metadata/md5-cache/www-client/google-chrome-64.0.3282.140 b/metadata/md5-cache/www-client/google-chrome-64.0.3282.140
deleted file mode 100644
index 7c5a020decae..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-64.0.3282.140
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-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.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-64.0.3282.167 b/metadata/md5-cache/www-client/google-chrome-64.0.3282.167
new file mode 100644
index 000000000000..16cdde238d86
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-64.0.3282.167
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+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.167-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_=a6355ad1cb841d12c53bf5dd5a19ebe9
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.140 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.140
deleted file mode 100644
index 74c32409e51e..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.140
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-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.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-client/google-chrome-beta-65.0.3325.51 b/metadata/md5-cache/www-client/google-chrome-beta-65.0.3325.51
new file mode 100644
index 000000000000..ade1f141e70e
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-65.0.3325.51
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+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_65.0.3325.51-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_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3325.31 b/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3325.31
deleted file mode 100644
index 3132339ea49d..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-65.0.3325.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-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 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-unstable/google-chrome-unstable_65.0.3325.31-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_=e8be15f36495a908aec4766ff2b29883
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3343.3 b/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3343.3
new file mode 100644
index 000000000000..e63ff548b221
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-66.0.3343.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+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 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-unstable/google-chrome-unstable_66.0.3343.3-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_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/links-2.14-r1 b/metadata/md5-cache/www-client/links-2.14-r1
new file mode 100644
index 000000000000..c590c00f3701
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.14-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( 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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=6
+HOMEPAGE=http://links.twibright.com/
+IUSE=bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib
+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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.14.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.10-2.debian.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6ac9adccae22d3aae06bae923630604b
diff --git a/metadata/md5-cache/www-client/opera-developer-52.0.2852.0 b/metadata/md5-cache/www-client/opera-developer-52.0.2852.0
deleted file mode 100644
index d6ba0374e5ae..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-52.0.2852.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A fast and secure web browser
-EAPI=5
-HOMEPAGE=http://www.opera.com/
-IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/52.0.2852.0/linux/opera-developer_52.0.2852.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/52.0.2852.0/linux/opera-developer_52.0.2852.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/52.0.2852.0/linux/opera-developer_52.0.2852.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/52.0.2852.0/linux/opera-developer_52.0.2852.0_amd64.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/opera-developer-52.0.2864.0 b/metadata/md5-cache/www-client/opera-developer-52.0.2864.0
new file mode 100644
index 000000000000..b59ae23acf5b
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-52.0.2864.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/52.0.2864.0/linux/opera-developer_52.0.2864.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/52.0.2864.0/linux/opera-developer_52.0.2864.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/52.0.2864.0/linux/opera-developer_52.0.2864.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/52.0.2864.0/linux/opera-developer_52.0.2864.0_amd64.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa0a012555bec1bb5e09a23f4458261d
diff --git a/metadata/md5-cache/www-client/phantomjs-1.9.8 b/metadata/md5-cache/www-client/phantomjs-1.9.8
deleted file mode 100644
index 836f04c3a67d..000000000000
--- a/metadata/md5-cache/www-client/phantomjs-1.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/icu:= dev-libs/openssl media-libs/fontconfig media-libs/freetype media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A headless WebKit scriptable with a JavaScript API
-EAPI=5
-HOMEPAGE=http://phantomjs.org/
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/icu:= dev-libs/openssl media-libs/fontconfig media-libs/freetype media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10
-SLOT=0
-SRC_URI=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-source.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f639ff19b49e7ce820629764ca7df0bb
diff --git a/metadata/md5-cache/www-client/phantomjs-2.0.0-r1 b/metadata/md5-cache/www-client/phantomjs-2.0.0-r1
deleted file mode 100644
index 0d1c363deba9..000000000000
--- a/metadata/md5-cache/www-client/phantomjs-2.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-libs/icu:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0 || ( dev-lang/ruby:2.2 ) virtual/rubygems net-misc/openssh[-bindist] app-arch/unzip virtual/pkgconfig
-DESCRIPTION=A headless WebKit scriptable with a JavaScript API
-EAPI=5
-HOMEPAGE=http://phantomjs.org/
-IUSE=examples libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/icu:= !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) media-libs/fontconfig media-libs/freetype media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libpng:0= virtual/jpeg:0
-SLOT=0
-SRC_URI=https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-source.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bc333bfac41452d014ed20f3f815b9a3
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1090.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1090.3_p1
deleted file mode 100644
index 7e4bec685d2a..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1090.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A new browser for our friends
-EAPI=5
-HOMEPAGE=http://vivaldi.com/
-IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=Vivaldi
-RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1090.3-1_amd64.deb -> vivaldi-snapshot-1.15.1090.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1090.3-1_armhf.deb -> vivaldi-snapshot-1.15.1090.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1090.3-1_i386.deb -> vivaldi-snapshot-1.15.1090.3_p1-i386.deb )
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f91f2281c18547900af1bb921ce60ad7
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1099.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1099.3_p1
new file mode 100644
index 000000000000..6238dfc1ad2a
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.15.1099.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A new browser for our friends
+EAPI=5
+HOMEPAGE=http://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=>=dev-libs/openssl-1.0.1:0 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver 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/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1099.3-1_amd64.deb -> vivaldi-snapshot-1.15.1099.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1099.3-1_armhf.deb -> vivaldi-snapshot-1.15.1099.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.15.1099.3-1_i386.deb -> vivaldi-snapshot-1.15.1099.3_p1-i386.deb )
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f91f2281c18547900af1bb921ce60ad7
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 1f078305c62c..5078416e664d 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.140 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140
deleted file mode 100644
index 3a31d542a44b..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-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.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.140_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140_beta
deleted file mode 100644
index fef17fd67fbf..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.140_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-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.140-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.167 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.167
new file mode 100644
index 000000000000..6dbc6b1895ba
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.167
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+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.167-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=1d7d85b29380275bca17735b05c995a4
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.31_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.31_alpha
deleted file mode 100644
index 040e2091ff0f..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.31_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-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:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_65.0.3325.31-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.51_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.51_beta
new file mode 100644
index 000000000000..68be1d31ff2a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-65.0.3325.51_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+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_65.0.3325.51-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3343.3_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3343.3_alpha
new file mode 100644
index 000000000000..3325dd569bcf
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3343.3_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+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:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_66.0.3343.3-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 5f98becdb100..9d4b7bf018f0 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-8.0.47 b/metadata/md5-cache/www-servers/tomcat-8.0.47
deleted file mode 100644
index 97ac4a78b372..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.0.47
+++ /dev/null
@@ -1,14 +0,0 @@
-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.47/src/apache-tomcat-8.0.47-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_=23183d7d717b77c0f1eb0dae231c98da
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.48 b/metadata/md5-cache/www-servers/tomcat-8.0.48
index bc75bfbbfb03..f953fe654344 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.48
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.48
@@ -4,11 +4,11 @@ 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
+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.48/src/apache-tomcat-8.0.48-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_=f8bec380beca2105ee4686e8d930fe33
+_md5_=e38dd5e52bef94d7d515e8f05e76fc28
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.23 b/metadata/md5-cache/www-servers/tomcat-8.5.23
deleted file mode 100644
index f3bcc1cd4014..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.23
+++ /dev/null
@@ -1,14 +0,0 @@
-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.23/src/apache-tomcat-8.5.23-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_=fcf9bcb27e5a15ab7b744bea7bee8902
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.24 b/metadata/md5-cache/www-servers/tomcat-8.5.24
index 4aba74743162..6f055dead9a7 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.24
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.24
@@ -4,11 +4,11 @@ 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
+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.24/src/apache-tomcat-8.5.24-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_=d7d4c946c7dd3c7e5d0cbef93c28b977
+_md5_=da5defa7402f8f8dd5f1c68710ea0698
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.28 b/metadata/md5-cache/www-servers/tomcat-8.5.28
new file mode 100644
index 000000000000..7cea4fbb06c4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.28
@@ -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.28/src/apache-tomcat-8.5.28-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/www-servers/tomcat-9.0.5 b/metadata/md5-cache/www-servers/tomcat-9.0.5
new file mode 100644
index 000000000000..e21362a03401
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.5
@@ -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-9.0.5:4.0 app-admin/pwgen >=virtual/jdk-1.8 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-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/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-9.0.5:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-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_=da8c412fdef1fec5212ea3cbf9c7076d
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.15 b/metadata/md5-cache/www-servers/uwsgi-2.0.15
deleted file mode 100644
index 4aeab4079b2d..000000000000
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
-DESCRIPTION=uWSGI server for Python web applications
-EAPI=5
-HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-2* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 ) )
-SLOT=0
-SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.15.tar.gz -> uwsgi-2.0.15.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9ab884d01710d236f7433d15c8f7230f
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.15-r2 b/metadata/md5-cache/www-servers/uwsgi-2.0.15-r2
index b5326c388986..fc691a14e68e 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.15-r2
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.15-r2
@@ -4,11 +4,11 @@ DESCRIPTION=uWSGI server for Python web applications
 EAPI=5
 HOMEPAGE=http://projects.unbit.it/uwsgi/
 IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.15.tar.gz -> uwsgi-2.0.15.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ef975888bd807cf12a1913f34e78ff86
+_md5_=e1a6a214d1c5647b7e46c14a5949bbaa
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.16 b/metadata/md5-cache/www-servers/uwsgi-2.0.16
new file mode 100644
index 000000000000..b257c2e1243e
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) virtual/pkgconfig apache2? ( =www-servers/apache-2* ) >=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-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=5
+HOMEPAGE=http://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php pypy python python_asyncio python_gevent ruby apache2 php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( virtual/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( dev-lang/go:=[gccgo] ) lua? ( dev-lang/lua:= ) mono? ( =dev-lang/mono-4* ) perl? ( dev-lang/perl:= ) php? ( php_targets_php5-6? ( dev-lang/php:5.6[embed] ) php_targets_php7-0? ( dev-lang/php:7.0[embed] ) php_targets_php7-1? ( dev-lang/php:7.1[embed] ) php_targets_php7-2? ( dev-lang/php:7.2[embed] ) ) pypy? ( virtual/pypy ) python? ( python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_gevent? ( >=dev-python/gevent-1.2.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2* ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent ) python_gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
+SLOT=0
+SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.16.tar.gz -> uwsgi-2.0.16.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	php-ext-source-r2	f89db15e993f2a909a1baea2031e409d	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=03f34c7b5473b65db5a9f887e8e00436
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 52f9c47da057..23c1c6d63284 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 1389200eb4c4..8def2cccddea 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_=43ea77d00471473f410ca8ff3630ae10
+_md5_=e245a9cbed47575dd99cc830a946c5ea
diff --git a/metadata/md5-cache/x11-libs/libva-1.8.0 b/metadata/md5-cache/x11-libs/libva-1.8.0
deleted file mode 100644
index 2064fabcb5d6..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm egl opengl vdpau wayland X utils video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva/archive/1.8.0.tar.gz -> libva-1.8.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d8d3754d7d8da0d4a42f4c06780db68
diff --git a/metadata/md5-cache/x11-libs/libva-1.8.1 b/metadata/md5-cache/x11-libs/libva-1.8.1
deleted file mode 100644
index dc484f0ab128..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm egl opengl vdpau wayland X utils video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva/archive/1.8.1.tar.gz -> libva-1.8.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3d8d3754d7d8da0d4a42f4c06780db68
diff --git a/metadata/md5-cache/x11-libs/libva-1.8.2 b/metadata/md5-cache/x11-libs/libva-1.8.2
deleted file mode 100644
index c79a600498a3..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://01.org/linuxmedia/vaapi
-IUSE=+drm egl opengl vdpau wayland X utils video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://github.com/01org/libva/archive/1.8.2.tar.gz -> libva-1.8.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=183acf8db1e53ed69d409752f08bbe86
diff --git a/metadata/md5-cache/x11-libs/libva-2.1.0 b/metadata/md5-cache/x11-libs/libva-2.1.0
new file mode 100644
index 000000000000..30dc2135f341
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=Video Acceleration (VA) API for Linux
+EAPI=5
+HOMEPAGE=https://01.org/linuxmedia/vaapi
+IUSE=+drm opengl vdpau wayland X utils video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
+RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
+SLOT=0/2
+SRC_URI=https://github.com/intel/libva/archive/2.1.0.tar.gz -> libva-2.1.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=4482247bc123a31b199754154e75466f
diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999
index e7a02ec717a5..e8f23833ab5d 100644
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0/9999
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5a97c9a1db2c7affe83da577668cdca8
+_md5_=4482247bc123a31b199754154e75466f
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.0
deleted file mode 100644
index d8954e167126..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=https://github.com/01org/intel-vaapi-driver
-IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/01org/intel-vaapi-driver/archive/1.8.0.tar.gz -> libva-intel-driver-1.8.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15732bca9928ca83f014534afaf4e723
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.1
deleted file mode 100644
index cc7087429497..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=https://github.com/01org/intel-vaapi-driver
-IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/01org/intel-vaapi-driver/archive/1.8.1.tar.gz -> libva-intel-driver-1.8.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15732bca9928ca83f014534afaf4e723
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.2 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.2
deleted file mode 100644
index 6143ffa9ff8c..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=https://github.com/01org/intel-vaapi-driver
-IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.8.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/01org/intel-vaapi-driver/archive/1.8.2.tar.gz -> libva-intel-driver-1.8.2.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=15732bca9928ca83f014534afaf4e723
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-2.0.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-2.0.0
deleted file mode 100644
index 4b4f66462640..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-2.0.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=https://github.com/01org/intel-vaapi-driver
-IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-2.0.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/01org/intel-vaapi-driver/archive/2.0.0.tar.gz -> libva-intel-driver-2.0.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=550a09ee424bdd9dbc95127b94e00510
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-2.1.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-2.1.0
new file mode 100644
index 000000000000..9874e7cddfcf
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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=HW video decode support for Intel integrated graphics
+EAPI=5
+HOMEPAGE=https://github.com/intel/intel-vaapi-driver
+IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/intel/intel-vaapi-driver/archive/2.1.0.tar.gz -> libva-intel-driver-2.1.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e3acfbfa05a03398e542dd6e6a8a3d24
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
index 74166081ee9d..d8bca6111590 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=5
-HOMEPAGE=https://github.com/01org/intel-vaapi-driver
+HOMEPAGE=https://github.com/intel/intel-vaapi-driver
 IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=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(-)?] >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9a2473d03cb2681abee5a28ff2432cca
+_md5_=e3acfbfa05a03398e542dd6e6a8a3d24
diff --git a/metadata/md5-cache/x11-libs/qwtplot3d-0.2.7-r2 b/metadata/md5-cache/x11-libs/qwtplot3d-0.2.7-r2
deleted file mode 100644
index 383811f0cf73..000000000000
--- a/metadata/md5-cache/x11-libs/qwtplot3d-0.2.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtopengl:4 x11-libs/gl2ps doc? ( app-doc/doxygen )
-DESCRIPTION=Qt4/OpenGL-based 3D widget library for C++
-EAPI=4
-HOMEPAGE=http://qwtplot3d.sourceforge.net/
-IUSE=doc examples
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=ZLIB
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtopengl:4 x11-libs/gl2ps
-SLOT=0
-SRC_URI=mirror://sourceforge/qwtplot3d/qwtplot3d-0.2.7.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a83fe4a7d9b763be13b4d2ab5853e7b1
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 59a5a51eb175..77156ecbdb6f 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6 b/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6
deleted file mode 100644
index 514c79620cce..000000000000
--- a/metadata/md5-cache/x11-misc/appmenu-qt-0.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=dev-libs/libdbusmenu-qt-0.9.0[qt4] sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Application menu module for Qt
-EAPI=6
-HOMEPAGE=https://launchpad.net/appmenu-qt
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=dev-libs/libdbusmenu-qt-0.9.0[qt4]
-SLOT=0
-SRC_URI=https://launchpad.net/appmenu-qt/trunk/0.2.6/+download/appmenu-qt-0.2.6.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	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4bbdb069e6ddea6f8b8879cba6b50993
diff --git a/metadata/md5-cache/x11-misc/launchy-2.5-r1 b/metadata/md5-cache/x11-misc/launchy-2.5-r1
deleted file mode 100644
index b580316c2029..000000000000
--- a/metadata/md5-cache/x11-misc/launchy-2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-qt/qtgui:4 x11-libs/libX11 dev-libs/boost x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=utility that merges application menus, your desktop and even your file manager
-EAPI=6
-HOMEPAGE=http://www.launchy.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.launchy.net/downloads/src/launchy-2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=78304cbc0a58190c101af824d8755741
diff --git a/metadata/md5-cache/x11-misc/ptbatterysystemtray-1.0.0_rc2 b/metadata/md5-cache/x11-misc/ptbatterysystemtray-1.0.0_rc2
deleted file mode 100644
index 76ae129f1255..000000000000
--- a/metadata/md5-cache/x11-misc/ptbatterysystemtray-1.0.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4
-DESCRIPTION=A simple battery monitor in the system tray
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://gentoo/ptbatterysystemtray-1.0.0_rc2.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cce0cd621eaa8819da799f847ee4e4dd
diff --git a/metadata/md5-cache/x11-misc/synergy-2.0.0 b/metadata/md5-cache/x11-misc/synergy-2.0.0
new file mode 100644
index 000000000000..bd2891c0b379
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/synergy-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl ) x11-proto/kbproto x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple computers
+EAPI=6
+HOMEPAGE=http://synergy-project.org/ https://github.com/symless/synergy
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl )
+SLOT=0
+SRC_URI=https://github.com/symless/synergy-core/archive/v2.0.0-stable.tar.gz -> synergy-2.0.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a0200b41873f18e36621fc42fc74ccb5
diff --git a/metadata/md5-cache/x11-misc/touchfreeze-0.2.5-r1 b/metadata/md5-cache/x11-misc/touchfreeze-0.2.5-r1
deleted file mode 100644
index f6e46ce2ebe4..000000000000
--- a/metadata/md5-cache/x11-misc/touchfreeze-0.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=x11-libs/libX11 dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=X11 touch pad driver configuration utility
-EAPI=4
-HOMEPAGE=http://kde-apps.org/content/show.php/TouchFreeze?content=61442
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 dev-qt/qtcore:4 dev-qt/qtgui:4 x11-drivers/xf86-input-synaptics
-SLOT=0
-SRC_URI=http://www.fit.vutbr.cz/~kombrink/personal/touchfreeze/touchfreeze-0.2.5.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6cb23e38d791c9cee47963cc070fdc75
diff --git a/metadata/md5-cache/x11-misc/wmiface-2.1 b/metadata/md5-cache/x11-misc/wmiface-2.1
deleted file mode 100644
index a9a2e70a06ba..000000000000
--- a/metadata/md5-cache/x11-misc/wmiface-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Command line tool allowing user scripting of the running window manager
-EAPI=5
-HOMEPAGE=http://kde-apps.org/content/show.php/WMIface?content=40425
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 x11-libs/libX11
-SLOT=0
-SRC_URI=https://home.kde.org/~seli/wmiface/wmiface-2.1.tar.gz
-_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_=7e0f4ea6580c2cb485a5eacd3b85d605
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 715da96504e8..76e6e1444450 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0_beta1 b/metadata/md5-cache/x11-plugins/enigmail-2.0_beta1
new file mode 100644
index 000000000000..7fde0e901363
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0_beta1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=6
+HOMEPAGE=http://www.enigmail.net/
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+SLOT=0
+SRC_URI=http://www.enigmail.net/download/beta/enigmail-2.0-beta1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f5513e8258e634026f1a988f350dfc31
diff --git a/metadata/md5-cache/x11-plugins/enigmail-9999 b/metadata/md5-cache/x11-plugins/enigmail-9999
index c0637a48b4da..a44c64961ae2 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-9999
+++ b/metadata/md5-cache/x11-plugins/enigmail-9999
@@ -7,4 +7,4 @@ LICENSE=MPL-2.0 GPL-3
 RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* )
 SLOT=0
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd49f1d50badb7dc64d5827b0fdef529
+_md5_=545208a35488c9892166ac790b9fd17f
diff --git a/metadata/md5-cache/x11-proto/Manifest.gz b/metadata/md5-cache/x11-proto/Manifest.gz
index f3172af47abe..0ab9fc3c2435 100644
--- a/metadata/md5-cache/x11-proto/Manifest.gz
+++ b/metadata/md5-cache/x11-proto/Manifest.gz
diff --git a/metadata/md5-cache/x11-proto/xorgproto-2018.2 b/metadata/md5-cache/x11-proto/xorgproto-2018.2
new file mode 100644
index 000000000000..8a9eddbf583e
--- /dev/null
+++ b/metadata/md5-cache/x11-proto/xorgproto-2018.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/printproto !x11-proto/xf86rushproto >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=X.Org combined protocol headers
+EAPI=6
+HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.2.tar.gz
+_eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=da3ff13ecc23c40192cb86da4cb45b75
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 6d47af4e3863..ca65996a7403 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/iceicons-0.10.0 b/metadata/md5-cache/x11-themes/iceicons-0.10.0
deleted file mode 100644
index e4453ada3eb3..000000000000
--- a/metadata/md5-cache/x11-themes/iceicons-0.10.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-wm/icewm-1.2.6
-DESCRIPTION=IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM
-EAPI=0
-HOMEPAGE=http://sandbox.cz/~covex/icewm/iceicons/
-KEYWORDS=amd64 ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-wm/icewm-1.2.6
-SLOT=0
-SRC_URI=http://sandbox.cz/~covex/icewm/iceicons/iceicons-default-0.10.0.tar.gz
-_md5_=3cbaa12ba83e2496dbafa445ab5f2694
diff --git a/metadata/md5-cache/x11-themes/iceicons-0.10.0-r1 b/metadata/md5-cache/x11-themes/iceicons-0.10.0-r1
new file mode 100644
index 000000000000..0fb11c68c8bf
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/iceicons-0.10.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-wm/icewm-1.2.6
+DESCRIPTION=IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM
+EAPI=6
+HOMEPAGE=http://sandbox.cz/~covex/icewm/iceicons/
+KEYWORDS=amd64 ~ppc sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=x11-wm/icewm-1.2.6
+SLOT=0
+SRC_URI=http://sandbox.cz/~covex/icewm/iceicons/iceicons-default-0.10.0.tar.gz
+_md5_=cb2fe92ed126e4f6eea551f4e8a6cdfa
diff --git a/metadata/md5-cache/x11-themes/lush-0.1.0-r2 b/metadata/md5-cache/x11-themes/lush-0.1.0-r2
deleted file mode 100644
index 8cb3202ca76d..000000000000
--- a/metadata/md5-cache/x11-themes/lush-0.1.0-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Lush KDE icon theme
-EAPI=0
-HOMEPAGE=http://www.kde-look.org/content/show.php?content=5483
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~x86-fbsd
-LICENSE=GPL-1
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=mirror://gentoo/lush-0.1.0dave.tar.gz
-_md5_=3b9eaf00856cd853f59d6ee90e1325ed
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 29f54a6d6993..5332b85f7639 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/i3-4.14.1 b/metadata/md5-cache/x11-wm/i3-4.14.1
index c948233a6aa2..0d93180c1000 100644
--- a/metadata/md5-cache/x11-wm/i3-4.14.1
+++ b/metadata/md5-cache/x11-wm/i3-4.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=6
 HOMEPAGE=https://i3wm.org/
 IUSE=doc debug test test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 REQUIRED_USE=test? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.14.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	out-of-source	599059fedc27d10d7e958a5966b6104c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=1b37e4b192fffeb0b63fca5120201602
+_md5_=d2d21659a434d19e791376890fc3642c
diff --git a/metadata/md5-cache/x11-wm/icewm-1.3.12-r1 b/metadata/md5-cache/x11-wm/icewm-1.3.12-r1
deleted file mode 100644
index b0fe46f8b361..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-1.3.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama ) >=sys-apps/sed-4 x11-proto/xextproto x11-proto/xproto doc? ( app-text/linuxdoc-tools ) nls? ( >=sys-devel/gettext-0.19.6 ) truetype? ( >=media-libs/freetype-2.0.9 ) 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
-DESCRIPTION=Ice Window Manager with Themes
-EAPI=6
-HOMEPAGE=http://www.icewm.org/ https://github.com/bbidulock/icewm
-IUSE=bidi debug doc minimal nls truetype uclibc xinerama
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bbidulock/icewm/archive/1.3.12.tar.gz -> icewm-1.3.12.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_=b7529122c0020cfb76fe74a78e1977be
diff --git a/metadata/md5-cache/x11-wm/icewm-1.3.8 b/metadata/md5-cache/x11-wm/icewm-1.3.8
deleted file mode 100644
index 0a4821654be4..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-1.3.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=x11-libs/gdk-pixbuf:2[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft x11-libs/libSM x11-libs/libICE xinerama? ( x11-libs/libXinerama ) bidi? ( dev-libs/fribidi ) gnome? ( 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/pyxdg gnome-base/gnome-desktop:2 gnome-base/gnome-menus gnome-base/libgnomeui ) nls? ( sys-devel/gettext ) truetype? ( >=media-libs/freetype-2.0.9 ) media-libs/giflib x11-proto/xproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 >=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=Ice Window Manager with Themes
-EAPI=5
-HOMEPAGE=http://www.icewm.org/
-IUSE=bidi debug gnome minimal nls truetype uclibc xinerama python_targets_python2_7
-KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gdk-pixbuf:2[X] x11-libs/libX11 x11-libs/libXrandr x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft x11-libs/libSM x11-libs/libICE xinerama? ( x11-libs/libXinerama ) bidi? ( dev-libs/fribidi ) gnome? ( 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/pyxdg gnome-base/gnome-desktop:2 gnome-base/gnome-menus gnome-base/libgnomeui ) nls? ( sys-devel/gettext ) truetype? ( >=media-libs/freetype-2.0.9 ) media-libs/giflib
-REQUIRED_USE=gnome? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/icewm/icewm-1.3.8.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	b4eee44966573b7fb6761e507910b306	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d16cfbeb3903935d3ede09c4b1631790
diff --git a/metadata/md5-cache/x11-wm/icewm-1.4.0 b/metadata/md5-cache/x11-wm/icewm-1.4.0
deleted file mode 100644
index 9ef6b549caa9..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama ) >=sys-apps/sed-4 x11-proto/xextproto x11-proto/xproto doc? ( app-text/linuxdoc-tools ) nls? ( >=sys-devel/gettext-0.19.6 ) truetype? ( >=media-libs/freetype-2.0.9 ) 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
-DESCRIPTION=Ice Window Manager with Themes
-EAPI=6
-HOMEPAGE=http://www.icewm.org/ https://github.com/bbidulock/icewm
-IUSE=bidi debug doc minimal nls truetype uclibc xinerama
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bbidulock/icewm/archive/1.4.0.tar.gz -> icewm-1.4.0.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_=d1aa89809da911d27d43f5cc432410d1
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 109b468e6a4e..dce1f442cb28 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-0.12.0 b/metadata/md5-cache/xfce-base/exo-0.12.0
new file mode 100644
index 000000000000..b32ff12c3f8e
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/exo-0.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.42:= dev-perl/URI >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
+SLOT=0
+SRC_URI=mirror://xfce/src/xfce/exo/0.12/exo-0.12.0.tar.bz2
+_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_=d49d87a3253fe1287bba27fdd4b75d1d
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index c16ab0d7c83b..6e6686358d54 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
index 335ad9fc6369..ace4a0d9398f 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:= dev-util/intltool dev-util/xfce4-dev-tools 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 >=sys-apps/sed-4
 DESCRIPTION=Archive plug-in for the Thunar filemanager
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:=
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2
-_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_=e730bbfc9249f83973b7c2000693ce94
+_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_=c29f836639a343dd7a13ea8ccdd8cbc2
diff --git a/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0 b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
new file mode 100644
index 000000000000..193a507dde09
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.11:= >=xfce-base/thunar-1.7:= dev-util/intltool virtual/pkgconfig
+DESCRIPTION=Adds special features for media files to the Thunar File Manager
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/taglib-1.6 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-0.11:= >=xfce-base/thunar-1.7:=
+SLOT=0
+SRC_URI=mirror://xfce/src/thunar-plugins/thunar-media-tags-plugin/0.3/thunar-media-tags-plugin-0.3.0.tar.bz2
+_md5_=f8bffaa7e3d402666bd23a015483a67a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
new file mode 100644
index 000000000000..5907395aad1c
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:3= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-3.20:3= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= ) virtual/pkgconfig
+DESCRIPTION=Daemon to control volume up/down and mute keys for pulseaudio
+EAPI=6
+HOMEPAGE=https://git.xfce.org/apps/xfce4-volumed-pulse/
+IUSE=libnotify
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:3= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-3.20:3= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= )
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-0.2.3.tar.bz2
+_md5_=40619d1e1c85c139b001d3a315fe95ad
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f1aba6418dca..686bc9bd8d8e 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-11T15:08:28Z
+TIMESTAMP 2018-02-15T16:08:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqAXGxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlqFsH5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD9tw/6Ao03mfgjwcItRa0MmUvgtyQbHwmXmCK+xt0fK97SuxSgVhTc+KH6ILsa
-4ofGMQJFH9t9BypKTg4EqC2FOcYFL9FCrZYYMGw/+1e5aD5fVdeYmnVV/07WZmBe
-nH7IJVPnP3gnHfikGtYEdnKGLfCRvfFYnSwlfWURS9sgLvOw0Fr71OLnXN1nZmgR
-tvMjoy0c3kW3eWi1po/VbNkx8LlIGyo13De1OHqLRRPD88spCnvMlMNHnRrUsweK
-+zFYAnRnCuVmnAH089MOrlpEcfoQF9s1BiL4Vd4jbRF7NdfeMNl/CpmPQgOVlaoA
-pI6R2YOqKr/WTIhkPacDaslYWDarPesQJMQ0yoSC0rZH+O5/6C6XRVKrcwhSKVgM
-NRjly6nCBNee1GIvsFoA0WvWHu8BQ6lybJpdVDtECF/TCqjJXyk6g476B9uREh+e
-w9DOPWkVCGXuqD7i2WGaXC+SAYBlY8J6XPJNWtAFdcvZTaY4iFkkI+Jxm/3s7Ec1
-2dcTAm3SuUmThpml8VxEg8sucMDaRnyl2cw/h2PVpim5+dvDo8xNc5Nz3uajNCnE
-afDkyDT0J/6ktOk/aeUMnXZBVsDpLzvn9Hnzm+t9y+GZsNof7jb1PgJg8y4n2FvO
-e7j+bdzAgXkdZu0x/SWcWKbinxBrAn7wtpyvblw33pK4X4GGh4U=
-=zQGW
+klBEqhAAnFpIJYwJqX5hCYWWUiOwaxuEE1N7uh0JrB11yIxK6w9po3XGNb65yJHI
+k/j3g+sUlziLxaJ9wKfafbSVeomq6JQnQeJ9lFLMMdX3XQwdX0QE34eiRWILHsJp
+hsjY1eoCFv66qRU04lJepnyYrRSx2iuPgpoQCbcGKtajRnmLe2pMXbuEDepSZzKs
+3sfZur055kVeUTLVLa1IEpg+qacCarY5qE077++wxonNIiYDX3IYXmOKSD1tWIC9
+pwBndZsd7j2j/jXDW4EYEbn7IVwxOpO+60HarKFsrbNdydXPbywrpvkQab1Tfn3J
+sZWn5UqryXfmmfyf41Boo3OIJ9reRt6/6AvvjTtxoXFhE3jCStSG3CmIAm42F70X
+3lcYZFduY/4UEPOWldzud0/ZMNa0MqJ+RuCcbuxdIPP1fTQHWeQqNX2V4QADvfJu
+nYnumBPv3tHtYHFueF4p8q3SHPiyhjN6RROs0NXg6K8C1TAsnQBEr8qobFylJO7Y
+vECdX5sHLiZM6OUbyMRICD9kAA3TxrhmJpKFnQjXd87dnK/y4pXuZ02nxtR9V0I0
+9p0SVe4SYu4K2z/U44k3DkGGTO2eXg9iH+TiznkA6KSyFusQqM1FmsG1GfzopS9k
+FRdYJxX7auzWDCDQZcM+hTmLnm5yXaiTRt7sKsLKUl+1jl9y5Lw=
+=MtBq
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 51a6a23932fe..236ad6aada15 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Feb 2018 15:08:25 +0000
+Thu, 15 Feb 2018 16:08:27 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index d4e3b5ae5da8..0d6288c2bd16 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1110,6 +1110,11 @@
       <name>Guilherme Amadio</name>
       <role>Member</role>
     </member>
+    <member>
+      <email>jstein@gentoo.org</email>
+      <name>Jonas Stein</name>
+      <role>Member</role>
+    </member>
   </project>
   <project>
     <email>forum-mods@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index f9dd8df2fbba..8d296b94516a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Feb 11 15:08:24 UTC 2018
+Thu Feb 15 16:08:26 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1213f9c2a9ed..f191e7f26026 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Feb 2018 15:15:01 +0000
+Thu, 15 Feb 2018 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1b9c9d312d73..7676e3008c01 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-42dbc919bd2bd7886acd5aae81df86c3f8bb3b91 1518361228 2018-02-11T15:00:28+00:00
+dc4cc89d46a8784f82ad1e77166846d4deaa5ab8 1518710011 2018-02-15T15:53:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4d4eb0b03815..a8e9504c3063 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1518361501 Sun 11 Feb 2018 03:05:01 PM UTC
+1518710701 Thu 15 Feb 2018 04:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b9f05110e62a..a0c90c150e52 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Feb 2018 15:08:24 +0000
+Thu, 15 Feb 2018 16:08:26 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c1122040181a..4bb9ef843457 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 04f9b5b17626..9dce37184a1d 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,12 +1,8 @@
 AUX linkchecker-9.2-unbundle.patch 840 BLAKE2B ad18d9722b8fe84c3728d5c62e741eeec5c82856384950610519aa641c15b80483bd04c8c32ff1bd275d28dcd2e73a657a7d4d324cb7889f550849cfa9e3932e SHA512 899db2f7567d7f101ca995d2b8b26dfaedb854a856902cb3fd2bda50f872e9bd345d10acf7b4687635541a8c5cc69050146c317c7f2875d8841f98d5d8b9d7d4
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
-AUX linkchecker-9.3-desktop.patch 1783 BLAKE2B 8735cdb6e486ad292cbbf397c59e57a33bd7fee4058250766deaf0c7039b76020e10aa7972a7e780726671c0346015a20ed502ac8a6a4172043d17d2e35fa313 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0
-AUX linkchecker-9.3-requests-check.patch 1538 BLAKE2B a24a8471d5b42c07afaf17611860b10c001cfb2a2282219f70389bbdb18111901feefc2c73683f4661aa80311565d0bb4c0b2239140c944b617beb86df164988 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96
 AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952
 AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3
-DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59
 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305
-EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5
-EBUILD linkchecker-9.3.1-r1.ebuild 1636 BLAKE2B ce818ae4c9e6b1fa3fdb03217e6bcc713065716b4972dcadbf1d0944907a1151c5340503be5f1ba345b4f8a5c315dcca488ebc83b78b7ffbf56d3a64aa733b9c SHA512 6f479a201387599ac7a638bbba14e4ea0b9de37fff1a00048182ed8ef137f45667cff6145018eeda22ecce545279049e9cc440c93bda536e6ad4f11966d5b82f
+EBUILD linkchecker-9.3.1-r1.ebuild 1635 BLAKE2B ffe1b02ded5cacb0a1906696634220f69a61d3a426a1cd1d592f88c11a0ac1bcfd2cbd44a6ad61bbd0f4b896bcde56be6ec277181cdde85da84bc18bbd306e36 SHA512 b91819cb02a957f9a3ae3e891e66a27305834983b92384430c24cdf82e2e1b744b17df16b60ffd80d70923de5f6fa1f83a02e27f747044a2b7753c0bcc9478b0
 EBUILD linkchecker-9999.ebuild 1195 BLAKE2B 91e070bf852276911bfa7550a40d287183854a5e503a7adacb1977b3cbdb7c668e17b9cc89fabe7b38c7f1fbfb2500b2e90dc3fc33bfaa5406b030ef5ffdf616 SHA512 8c07f7ad36675aa44905579f2ba56cc80b2b81693272bab03e87dde56f1893f66199307cc9d7498838f17ed55078a06315b2fb16788b613b411be9bda02b9cb1
 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
deleted file mode 100644
index 40fa18a45983..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-desktop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001
-From: Christopher Meng <cickumqt@gmail.com>
-Date: Fri, 10 Jan 2014 19:57:47 +0800
-Subject: [PATCH] Fix non-standard deskop file
-
-desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true"
-/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
----
- doc/linkchecker-gui.desktop | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop
-index 7e06b6e..09bd997 100644
---- a/doc/linkchecker-gui.desktop
-+++ b/doc/linkchecker-gui.desktop
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--Name=LinkChecker GUI
-+Name=LinkChecker GUI
- GenericName=URL validator
- GenericName[de]=URL Validator
- Version=1.0
- Type=Application
- Exec=linkchecker-gui
- Terminal=false
--Categories=Network;WebDevelopment;
--Icon=logo48x48
-+Categories=Network;WebDevelopment;
-+Icon=linkchecker
--- 
-1.8.5.1
-
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch b/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
deleted file mode 100644
index 905b7f718414..000000000000
--- a/net-analyzer/linkchecker/files/linkchecker-9.3-requests-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2ce810c3fb00b895a841a7be6b2e78c64e7b042 Mon Sep 17 00:00:00 2001
-From: Bastian Kleineidam <bastian.kleineidam@web.de>
-Date: Tue, 28 Jun 2016 21:55:10 +0200
-Subject: [PATCH] Fix python requests version check
-
----
- linkcheck/__init__.py | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
-index 22a0cf5..1cec214 100644
---- a/linkcheck/__init__.py
-+++ b/linkcheck/__init__.py
-@@ -24,10 +24,17 @@
- # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467
- if not (hasattr(sys, 'version_info') or
-         sys.version_info < (2, 7, 2, 'final', 0)):
--    raise SystemExit("This program requires Python 2.7.2 or later.")
-+    import platform
-+    version = platform.python_version()
-+    raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version)
-+# require a reasonably recent requests module: 2.4.0 from 2014-08-29
- import requests
--if requests.__version__ <= '2.2.0':
--    raise SystemExit("This program requires Python requests 2.2.0 or later.")
-+# PEP 396 has only version strings, bummer! PEP 386 is also not helpful.
-+requests_version = requests.__version__.split('.')
-+# Depends on the version scheme of Python requests
-+if int(requests_version[0]) < 2 or \
-+   (int(requests_version[0]) == 2 and int(requests_version[1]) < 4):
-+    raise SystemExit("This program requires Python requests 2.4.0 or later instead of %s." % requests.__version__)
- 
- import os
- # add the custom linkcheck_dns directory to sys.path
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
deleted file mode 100644
index dd9526e518aa..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils multilib
-
-MY_PN="${PN/linkchecker/LinkChecker}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://wummel.github.com/linkchecker/ https://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
-
-RDEPEND="
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	<dev-python/requests-2.15[${PYTHON_USEDEP}]
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-9.2-unbundle.patch
-		"${FILESDIR}"/${P}-bash-completion.patch
-		"${FILESDIR}"/${P}-desktop.patch
-		"${FILESDIR}"/${P}-requests-check.patch
-		)
-
-	emake -C doc/html
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-		rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-	fi
-
-	rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
-
-	newicon doc/html/logo64x64.png ${PN}.png
-
-	docinto html
-	dodoc doc/html/*
-	newbashcomp config/linkchecker-completion ${PN}
-	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
-	optfeature "Virus scanning" app-antivirus/clamav
-	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
-}
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index d3c49f316f78..dd72dc62cfd6 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="gnome sqlite"
 
 RDEPEND="
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index 9d79cc1437bf..024a8869b405 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
 AUX prometheus-alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
 DIST prometheus-alertmanager-0.13.0.tar.gz 2782163 BLAKE2B 4918f84a8a8312a3fa53f03b78bb8acc6118e69048ff3fadb2676721340fa120360a636fc11485999e948965569241658eb8ee01204453120adcce6bd1da40d4 SHA512 3f402f577e42bfc9dd9ef2dc1cb634d3654776f3b13d698170e3ae3c1612a45115e0d188d0768880ca968ec9157e05a2082647ca1de132f8be3c7eb7ad0dad42
+DIST prometheus-alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
 EBUILD prometheus-alertmanager-0.13.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
+EBUILD prometheus-alertmanager-0.14.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
new file mode 100644
index 000000000000..bb54481780e1
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="fb713f6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 3bd6485f8668..502eb3081b0e 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,10 +1,6 @@
 AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 BLAKE2B ac3b81ddc8dacb457e57b86ec9d40238d578b584ed79160725e0c8b7f3464aadf1de15ce76275bf1546d9d6077f805634abcb54d4f7aee6e2c4490c4b9015c88 SHA512 d071aa76158334c5184766b8c6f0cee0dd789df433a633461cff834f91cc87cf717bf57449c8417ff793708e521ad2ad7f5db43808252393066b2181a378790d
-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
+DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
+EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
+EBUILD speedtest-cli-2.0.0.ebuild 664 BLAKE2B e7a99e1d91e1de89eabfe8b481835c822973e9161da4bde276044088bb430b07f5d880fa86c4c4f20b1b940e504534660c54217325d830d322a851243914080a SHA512 70f27e8f337e173384c973b0c574d45942b9b5c39602c687a0df6a32693729cb36ef2c3bcb016e173b2e97c4ecbc2f24c9d3706d4cb5b3bf9e81a85f861c70b0
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
deleted file mode 100644
index 9d15ffc0b7d4..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-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 ~ppc ~ppc64 x86 ~arm ~arm64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.4-fix-unicode-py3.patch" )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
deleted file mode 100644
index 0ddf1db51517..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="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-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
deleted file mode 100644
index 0ddf1db51517..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="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-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
index 0bf6c921ff5b..5d55575fd650 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
new file mode 100644
index 000000000000..0bf6c921ff5b
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.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-analyzer/tcpreen/Manifest b/net-analyzer/tcpreen/Manifest
index 017587768d0f..f29322512b45 100644
--- a/net-analyzer/tcpreen/Manifest
+++ b/net-analyzer/tcpreen/Manifest
@@ -1,3 +1,4 @@
+AUX tcpreen-1.4.4-literal-suffix.patch 498 BLAKE2B 3380254c7dcb97958ec8ddeb9aa2e93fac39643088dd6b5daf686b657764bd8e9cbac442c3b6e2084ae75ca1286ab78e4fe5df3689d08e3eecdbcdf8c6660e0e SHA512 542de59ab2129093b2e4dd56d370e595a82f54eea70c70f764c7f1aced308864f4f594dde37575ec64076d9da76fd7ecf7fd8bf7fb7572c1b978160f220b14c6
 DIST tcpreen-1.4.4.tar.bz2 187979 BLAKE2B ef76c7757c5e630a8b0019ede74314bdf7b0e1e48af00091c8b1a28075499b1e0411b5a7ff8bd01bd54ebb347dfc2169b5efe54d36ef12e6ce31f54c4d278d70 SHA512 94496bbb21218b5acc9e76dd4377f92e35b17e03a2d10a7c42177ba5ccbb6aea1b0b54f49d52c5a97456f8cf77685e1c90c27773f4237c33e95f648d4258b786
-EBUILD tcpreen-1.4.4.ebuild 523 BLAKE2B a38a2ec393aab6a888c709f3590d448e07296af1c430b16c5661d2f2e91da66d543fa37d1386cec34a0c835779de6fdd448bc1807a226f0e45b3d12024aeec00 SHA512 16b80817ab65fd0e627de74d7b062675adb155719784477fbde4872b2af1af7f05d32666f5abcb4e43b0cc62067de8c72dce16922552639fa996152f29f180fc
+EBUILD tcpreen-1.4.4.ebuild 577 BLAKE2B 5bf67b5375465141fd8d6d393655ab483555d393d834337efd0b8c180fd5d6ec320d7b4943ad83b9baad1991120972b4d23091aa9a08ff9b4562f2eaf27b2fcf SHA512 5445c292d9145776236b227e5d98a7c8f03034a2501c8f6a851475745d7fa55920cea723e3813d47a47caa208fb6ccc275b9db675c2b3f32cc8756321e0ce1f3
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch b/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch
new file mode 100644
index 000000000000..1808a54f8875
--- /dev/null
+++ b/net-analyzer/tcpreen/files/tcpreen-1.4.4-literal-suffix.patch
@@ -0,0 +1,13 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -108,8 +108,8 @@
+ # define VERSION "unknown version"
+ #endif
+ 	puts (
+-"TCP re-engineering tool "VERSION" ("PACKAGE_HOST")\n"
+-" built "__DATE__" on "PACKAGE_BUILD_HOSTNAME" ("PACKAGE_BUILD")\n"
++"TCP re-engineering tool " VERSION " (" PACKAGE_HOST ")\n"
++" built " __DATE__ " on " PACKAGE_BUILD_HOSTNAME " (" PACKAGE_BUILD ")\n"
+ "Copyright (C) 2002-2004 Remi Denis-Courmont");
+ 	puts (_(
+ "This is free software; see the source for copying conditions.\n"
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
index a2cc20e37a9d..4a5d1fc11656 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="TCP network re-engineering tool"
@@ -12,10 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
+DEPEND="
+	nls? ( sys-devel/gettext )
+"
 DOCS=( AUTHORS NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-literal-suffix.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 7da5768e3233..3d7a3b1c689f 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -2,6 +2,8 @@ AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 BLAKE2B 33c38be287593dfeb2
 AUX tcpreplay-4.1.2-CVE-2017-6429.patch 858 BLAKE2B 988facdce3f6264edbd4712548248ee52db5347361d8dbece0a691d941f77d5e7751cd43def5dddf85c8028935b65e945e1adbab2966197ba6e38233bd73bfcf SHA512 934a42f9b70c882780a4a2fe3c9621b8a8380199ea63056291d27cbce006afcddc7331f9b73c8c244e89229c8526c55d2f534bedba50fb3d28ec3b873f700e3f
 DIST tcpreplay-4.1.2.tar.gz 2162175 BLAKE2B a99542277084a419c1f1208392e3d5b47aaf0be61a8e8de33bee9ba8e4f636fa78ae8eabcc07031c9bb659a8ba58a0aad6e4cc102e56d3dbddb0c3cf11c9df51 SHA512 3a7d125f38fe15070d666eacb4a5ef026a73ff850adec7ef3592966f38d1d155002792c5d5ac2476aa034d71be5f31b9dacd5be34af01a336149af3a42cad360
 DIST tcpreplay-4.2.6.tar.gz 3494827 BLAKE2B 57222d7347efd780d2e1297145a7d81c8cce58a8d43bdb9b1485ef2514751e61af317dc4f5ff2068c214b2a33115d8099204d4b3165671d87bd8549c2df08bbd SHA512 a46846b29e3cd7fbc635faee9c4be90db0d346c0d0f291ac8e007e1fbf614289094e14480c1c5b40feb5a175d3cbad018e2dd4d1a5762b7d31a4325af6102e7e
+DIST tcpreplay-4.3.0_beta1.tar.xz 719884 BLAKE2B 872ea10a3986f122cbf48bf9217d8df96f8c8c08e37aee095fc92ab5d5cf2607b42327aab9de5453c8bd198e1a32a3ae8964b085ba3065a6b3adfd853dd0b43b SHA512 55a9c419d4604cb4912571a631035ad4bc70d06b44d0248629a47b76411c23cba63b824322c23e0f2eeac4131a5d6e4c1fb2b9a60c0f57a7397d46760ff818f9
 EBUILD tcpreplay-4.1.2-r1.ebuild 2020 BLAKE2B a8ab8eb44bdb1f221541ce2088afd501f160095ff3232892715f0bffa68c343fa7705e09586903a2b15cd3ffec038f8965eb88ce9abf57838df361de6df57a18 SHA512 f39b594d93adf778e7432fc0770ac4e3328fea9cb082169fe426e09034e997ddbff43b5b2678ed8324e7d0a95fb05513384c6bcdc94816711b05e2bff561c67b
 EBUILD tcpreplay-4.2.6.ebuild 1923 BLAKE2B c376b7b1e702e0a38cf05c8db6c574ca8b5c41a4ee22fe760969519be75698b081c215ff4314084fb7f58fd7f8ee3cd6b7efe180b3c69f2e52f1189b5a3f8ad0 SHA512 a9d31e3a2db7b7ec12c68a3229c7f0137daaaf6acf35808f7f797f11c025263c3f533c528d5bc763fe8f490ae24aa72f2351a5c2ef9154f96e347bf9c1486752
+EBUILD tcpreplay-4.3.0_beta1.ebuild 1922 BLAKE2B 1c0157c7a5b5ce349e09df3a1ed23e0459c8b24c171061b9925032cfc08ec3e1ad83f7d2189223ec0887fae40515c802a8ce190339667eb1e1a81d77aa54fbfb SHA512 e29584f2e7a1865ba60c53d19dc14a74ce8b491fcedd98ba2afbbe2adace9192eb16e2d36be4f2f63e3f4f7326058ac31f3531aa3393eb492afab759a752949b
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
new file mode 100644
index 000000000000..24946408748e
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+LICENSE="BSD GPL-3"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="debug pcapnav +tcpdump"
+
+DEPEND="
+	>=sys-devel/autogen-5.18.4[libopts]
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	tcpdump? ( net-analyzer/tcpdump )
+	pcapnav? ( net-libs/libpcapnav )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+	docs/{CHANGELOG,CREDIT,HACKING,TODO}
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-enable-pcap_findalldevs.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# By default it uses static linking. Avoid that, bug 252940
+	econf \
+		$(use_enable debug) \
+		$(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \
+		$(use_with tcpdump tcpdump /usr/sbin/tcpdump) \
+		--disable-local-libopts \
+		--enable-dynamic-link \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	if [[ ! ${EUID} -eq 0 ]]; then
+		ewarn "Some tests were disabled due to FEATURES=userpriv"
+		ewarn "To run all tests issue the following command as root:"
+		ewarn " # make -C ${S}/test"
+		emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		emake -j1 test || {
+			ewarn "Note that some tests require eth0 iface to be up." ;
+			die "self test failed - see ${S}/test/test.log" ; }
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 03cd764416ac..5016a10ace85 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/cagibi/Manifest b/net-dns/cagibi/Manifest
deleted file mode 100644
index c1422ec77655..000000000000
--- a/net-dns/cagibi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cagibi-0.2.0.tar.bz2 28959 BLAKE2B 7d6353e12e2e15831e0667f2eaba17d8dd0eacc41899940ade06b13c00f537c08ed446acb05a1be549e2e5b66d77f42cc69878824e3e5f2309624d7c5af2dbb8 SHA512 e438166b4b09039002d6735c68d73c037727e8a113b0c9118785e9e387b02c1a8d8b97462500f081898ee39d997dcf38e53cf78ad7bd46e259cb5c16c568fd32
-EBUILD cagibi-0.2.0.ebuild 541 BLAKE2B 72ac638fac0b970486ac83535faecb2354a024327a667aa318ac78c58edfe4c40caa1b0e604c0842aab54d08ce4076cf7d118596804f55a1db4ea5901384fc05 SHA512 f709c2e9dc168483827984b529adb81bb503f0317cd2c6b46c93899d9847aa32a0a237646473deecbb6cae3076a0fdcaa1c004ade9d9d69b1a2efa260df5d120
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-dns/cagibi/cagibi-0.2.0.ebuild b/net-dns/cagibi/cagibi-0.2.0.ebuild
deleted file mode 100644
index 9cf64596af88..000000000000
--- a/net-dns/cagibi/cagibi-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Cache/proxy system for the SSDP part of UPnP"
-HOMEPAGE="https://frinring.wordpress.com/2010/08/09/cagibi-0-1-1-released-network-kio-slave-freezes-kded-in-4-5-0/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-"
-DEPEND="${RDEPEND}
-	dev-util/automoc
-"
-
-DOCS=( Changelog README TODO )
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 0755866aa8da..5fb3af60ed7e 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,13 +1,14 @@
+AUX config-full-paths-r2.patch 2896 BLAKE2B 9a81c08a094e4700c6b1effddcbb80ec98460761c0ffaaacd2053458df0197da7bd59a941c2fbd104ccb577d9e86f7ef8a818bdd6fce4c2fc590755052839ac3 SHA512 1a3cf4b3e6b0cc27ee292a50e56ca6e425277d684885005471a7f04b5f9114a9644ff2fbccea2721afd534582ae96571be93b3b8eae892d2a8e40c1574c144ef
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
-AUX dnscrypt-proxy.confd 286 BLAKE2B b89f58c485398176b676d8c4d2dbfadcbff0a58182e26e29c6720860b73412b8960c6a3a89a8f91c7c2288cb111285e8f2abaff6d83e05327186448d3cd34aaf SHA512 7135d5fccf3b61981a1d085460f256d23cc63a28acf327f3b87ffed2ee3eb55ecad7703c9d4e4825bf5639d7469366933ff120ef0e7914cc756db829ce0f3d9d
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
-AUX dnscrypt-proxy.initd 1264 BLAKE2B e8a94afb5c643cb69e69bd31cde189b96b2e5ddc0aeaf546a720bdb4bd94814a9fd2e6436c6759bf0423614083bac28d36e9cab13fa72a508304d9bf4bb247b7 SHA512 c0aeb6410679ebd277c9c4788f244c8b0a3a8aa04603fb9ccec506fa324c16489cd9d25d8ebfa0aed7324abb018a19f126d8d57fb798cfedc55035dfc45c5d99
+AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
 AUX dnscrypt-proxy.initd-r1 258 BLAKE2B 86ceff0c2affc0508cafa782803498be680f46520a380eb64eb2fde026c65cd349a4a5f995e5a285c35db1514a77e95b5067c96cd41905f253e101bffa453f41 SHA512 700849b9a0b8a3a224d0c149091937f751461bb42c7ac4a4bccecf28d9a7b64dd2f47601bee1f8d5c08bdfad2defdcab0c0bc22c7393873612f56d78cd0edc6a
-AUX dnscrypt-proxy.service 662 BLAKE2B 603af60df828b1967b0857d0e5426ec64f2f91d7775cdb1e7aef02d91199bfe8e2be1de4051ca0cf91c75edae6ceb65bcaa58e31e37bf62cc647f37ccb7105d3 SHA512 4e018ec5f586e60ad1b2c16719ad56dc63184122861032dcccbe599f2090869d7193ebe4e0c1845d6005627902a25bf13ab26b5ad0bdf2c3ef8ae7c57a187798
+AUX dnscrypt-proxy.initd-r2 594 BLAKE2B 633906a42693dc99103eafa2694e9537f1622d757ced10f026b4564f7a3fa20c0c59871870f0e9eb8c1f9e8f1aaf63d073c6d4688da3362dd0b69ba9b00ceedd SHA512 d671c63b461c8e58aea0d4a7903dfd05ad458020f289c12d48140cd10416eb1c0b34f0ebb2833e8f129496e59df166a3014bf92d9b3d8e7c32ddc1030f2bbab6
 AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589abbb6e5e214253fdc4f6d6686484e22dc24f45f05b23223bb8ada91e594bd0d015d35ed4850ce47e90d778a7867 SHA512 ff226e1f6416de04b42828ab89a0df48b4eac1385f489ccad594b5e07cbceb57249006951f25237a55effdd2acaf8ce7e0fb2c36fc17799f963d506696b0cb4f
+AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
-DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 BLAKE2B 8b6fb85e8fb0784a4bc87f4d4b4af593cc78baa2e0f88e79183890cc62dcdc59755d31da76f4aa75807b6d4ef1491e81251307af01cab9e0d83699a255eb0379 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-EBUILD dnscrypt-proxy-1.9.4-r1.ebuild 1449 BLAKE2B d07fd9711530dea427ee558097ffde3b5446110dcceb347e81c2d9e92a1a4e498240c43a333265ab45c36d4d0b927b0abc6e2bfc6e205bcbe469ec306fab2406 SHA512 c17b1b23bd87deb1d6167ca01920d3cd5f9b804a70606af0dc23060e7e9b568b9539fe6d06a92efbf6665b8d4cbbd485827c2ccc3ba82b93e6e944c26f190aa7
+DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abb2222b548461ad09f3f57d SHA512 c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-MISC metadata.xml 1224 BLAKE2B c82d5e6c4144d94350deafde498fba72386e3553d9a54779654485fde7067d9bd44f1305b4793a4347562aa000cd2aec00d7df37a3f620078adedbab696e8edd SHA512 c0f3da90c86a751f65222503131f1ef1185f557946fba95fa52fc2c81777b65a22e1de687309ebab1b57ee12ae8dc91aeb1bce8484ec4d08faaacabf0ec7f9aa
+EBUILD dnscrypt-proxy-2.0.0.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
+MISC metadata.xml 967 BLAKE2B f423ce552f42f2f3cdcbe71a711104c34eb90b7cf75b6d60b324b1ce239cc34d13845971b9808b9ad19e3bd76c89d1bb3b2a5c3d53d33afafff7fa7009a01427 SHA512 7c2bab8a27a9bc8d8401867a2ec6e84928cf7520422604282e88db4dcba4003d675a457ce0225f67f7385baede7953b2d531b2ab68d7e6b016f1e7c5e0e5fdfd
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
deleted file mode 100644
index b8069db8ab60..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="https://dnscrypt.org"
-SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="hardened libressl +plugins ssl systemd"
-
-RDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable hardened pie) \
-		$(use_enable plugins) \
-		$(use_enable ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
new file mode 100644
index 000000000000..5e497f135323
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_compile() {
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+	golang-build_src_compile
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
+	systemd_dounit systemd/dnscrypt-proxy.socket
+
+	keepdir /var/log/dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
+		ewarn "please either change port to > 1024, configure to run ${PN} as root"
+		ewarn "or re-enable 'filecaps'"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2.x.x is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "To use systemd socket activation with ${PN} you must"
+		elog "set listen_addresses setting to \"[]\" in the config file"
+		elog "Edit ${PN}.socket if you need to change port and address"
+		elog
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
new file mode 100644
index 000000000000..b693f1abbb32
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
@@ -0,0 +1,95 @@
+--- dnscrypt-proxy-2.0.0/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-02-06 10:33:58.000000000 -0800
++++ dnscrypt-proxy-2.0.0/dnscrypt-proxy/dnscrypt-proxy.toml	2018-02-09 19:15:00.105927884 -0800
+@@ -85,7 +85,7 @@
+ 
+ ## log file for the application
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## Use the system logger (syslog on Unix, Event Log on Windows)
+@@ -140,7 +140,7 @@
+ ## example.com 9.9.9.9
+ ## example.net 9.9.9.9,8.8.8.8
+ 
+-# forwarding_rules = 'forwarding-rules.txt'
++# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
+ 
+ 
+ 
+@@ -156,7 +156,7 @@
+ ## example.com     10.1.1.1
+ ## www.google.com  forcesafesearch.google.com
+ 
+-# cloaking_rules = 'cloaking-rules.txt'
++# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
+ 
+ 
+ 
+@@ -200,7 +200,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -226,7 +226,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -255,12 +255,12 @@
+ 
+   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+ 
+-  # blacklist_file = 'blacklist.txt'
++  # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt'
+ 
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -283,12 +283,12 @@
+ 
+   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+ 
+-  # blacklist_file = 'ip-blacklist.txt'
++  # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
+ 
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'ip-blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -357,7 +357,7 @@
+ 
+   [sources.'public-resolvers']
+   url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -367,7 +367,7 @@
+ 
+   #  [sources.'parental-control']
+   #  url = 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+ 
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
deleted file mode 100644
index ceedd454b5fb..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-DNSCRYPT_LOCALIP=127.0.0.1
-DNSCRYPT_LOCALPORT=53
-DNSCRYPT_USER=dnscrypt
-DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
-DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
-DNSCRYPT_RESOLVERIP=208.67.220.220
-DNSCRYPT_RESOLVERPORT=443
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
new file mode 100644
index 000000000000..9934e828b82a
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
@@ -0,0 +1,3 @@
+#DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_USER="dnscrypt"
+#DNSCRYPT_GROUP="dnscrypt"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
deleted file mode 100644
index 9b07d7d47d82..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
-
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-runas_user=${runas_user:-dnscrypt}
-runas_group=${runas_user:-dnscrypt}
-
-depend() {
-	use net
-	before dns
-	after logger
-}
-
-start() {
-	if [ ! -d "${rundir}" ]; then
-		mkdir "${rundir}"
-		if [ -n "${runas_user}" ]; then
-			touch "${DNSCRYPT_LOGFILE}"
-			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
-			chown -R ${runas_user}:${runas_group} "${rundir}"
-		fi
-	fi
-
-	ebegin "Starting dnscrypt-proxy"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dnscrypt-proxy \
-		-- \
-		--pidfile="${pidfile}" \
-		--logfile="${DNSCRYPT_LOGFILE}" \
-		--daemonize --user=${runas_user} \
-		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-		--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
-		--provider-name=${DNSCRYPT_PROVIDER_NAME} \
-		--provider-key=${DNSCRYPT_PROVIDER_KEY}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dnscrypt-proxy"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
-	eend $?
-}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
new file mode 100644
index 000000000000..dcccd83dab3d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/dnscrypt-proxy"
+command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
+command_user="${DNSCRYPT_USER:-dnscrypt}:${DNSCRYPT_GROUP:-dnscrypt}"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="--background --make-pidfile"
+
+depend() {
+	use net logger
+	provide dns
+}
+
+start_pre() {
+	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
+	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
deleted file mode 100644
index 4403254280a2..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=A tool for securing communications between a client and a DNS resolver
-
-[Service]
-Type=simple
-PIDFile=/var/run/dnscrypt-proxy.pid
-EnvironmentFile=/etc/conf.d/dnscrypt-proxy
-ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
-ExecStart=/usr/sbin/dnscrypt-proxy \
-	--pidfile=/var/run/dnscrypt-proxy.pid \
-	--logfile=/var/log/dnscrypt-proxy.log \
-	--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-	--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
-	--provider-name=${DNSCRYPT_PROVIDER_NAME} \
-	--provider-key=${DNSCRYPT_PROVIDER_KEY} \
-	--user=${DNSCRYPT_USER}
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
new file mode 100644
index 000000000000..745b094aaa16
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
@@ -0,0 +1,23 @@
+[Unit]
+Description=DNSCrypt client proxy
+Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+Requires=dnscrypt-proxy.socket
+After=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+
+[Install]
+Also=dnscrypt-proxy.socket
+WantedBy=multi-user.target
+
+[Service]
+User=dnscrypt
+Group=dnscrypt
+Type=simple
+NonBlocking=true
+ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
+ProtectHome=true
+CacheDirectory=dnscrypt-proxy
+LogsDirectory=dnscrypt-proxy
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index ab4b0b748fce..547780397031 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -2,18 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>amesists@gmail.com</email>
-		<name>Jiajun Wang</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ya@sysdump.net</email>
 		<name>Georgy Yakovlev</name>
-		<description>Proxied maintainer. Please assign bugs to him.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
-	<description>Proxy maintainer of Georgy. Please CC on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 3b513b4c07dd..8d5db38fb081 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index b2984ec4b974..6a3f1b8592b2 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,6 @@
 AUX firewalld.init 272 BLAKE2B 0ba8a50a1e11f0416bc1d133a4e1c864958f2a60314cc97ea3cec9c0ac26ff7eb05d54c1a1f59feb4672a8e873c4d69ec39d8d100a2152048d59a568bae14e34 SHA512 ed71564d92f4235bb1209cf1141e28f825e4b0e3d84e7214456399e1ac0a787c02d06fecd38eaa7643b4c571b90bfe2e3c93d9826ea448ebd480c0794b62265d
 DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
+DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
 EBUILD firewalld-0.4.3.3.ebuild 2876 BLAKE2B 94229241d0ff7db8003de36bc0790a33cbefcde95a6d3decd6ac6a1accaf91bf01c0d50e74e24270827e6ca9771d04467b5d551605b1a83b2d28de20b3157675 SHA512 25fc5a1e8b70a5a8d38eec24adb924aeb9b7e349dcc4fcc595abbbdb4ea3b47d7e684e8b07e3c85d3b33e027d1f6388ba14bff91c8a3a883fd8311eb9d3f4ea2
+EBUILD firewalld-0.5.1-r1.ebuild 2719 BLAKE2B 9a365af4d3a89ccb14faafa2b0ee8eee5914b0cace48c8d160933ad1d4252d1df5bf687c70f5434d85d293421ed5e4e0d70148f3b92194c2092339e58968956e SHA512 022e8029b9575ab72cadc00228679e1b6a49acf7a9d07aa978613d95891bf97f878de3b287d4242b2277fe410143b1a73ce20bc58784ca174d18fccbd5d70552
 MISC metadata.xml 365 BLAKE2B f5f2b3b7646cec193cffcef9ca3fe51f4f071a996c20dcd5669f428a6759be96a014f477281d58a127149d82422862178289b362b0f30603a9fbac62c59ff6e2 SHA512 b317c52dc7ab211183555f45d1b84786f9aede73f3b59eee54aa696b4e358e42dd7c30044e89931c2362f3a11c5180f1136f7631bf19c1fe02e29d68bea4c5a6
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..516a0ba3d63c
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.5.1-r1.ebuild
@@ -0,0 +1,103 @@
+# 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 autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6]
+	net-firewall/ipset
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	gui? (
+		x11-libs/gtk+:3
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	# manually split up the installation to avoid "file already exists" errors
+	emake -C config DESTDIR="${D}" install
+	emake -C po DESTDIR="${D}" install
+	emake -C shell-completion DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install
+
+	install_python() {
+		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl install_python
+
+	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+	python_replicate_script "${D}/usr/sbin/firewalld"
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/"
+	rm -rf "${D}/etc/sysconfig/"
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart"
+		rm -f "${D}/usr/bin/firewall-applet"
+		rm -f "${D}/usr/bin/firewall-config"
+		rm -rf "${D}/usr/share/applications"
+		rm -rf "${D}/usr/share/icons"
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-firewall/gshield/Manifest b/net-firewall/gshield/Manifest
index 3988bffb7df1..58a13c9ba9e8 100644
--- a/net-firewall/gshield/Manifest
+++ b/net-firewall/gshield/Manifest
@@ -1,4 +1,4 @@
 AUX gshield.init 533 BLAKE2B 1bfa54b4935bbb97a0a133d7b9c7690ee77552d43d52c8f68bfe6944b4770675889da4e611cac5c6cfdb061799db0283f0a698e9a015a6155212a1f602efb4ec SHA512 d046f8a0c4da46bdea94ef45ce472a8c0c68688421a06c7254a2f5e861b0c4884215ec860af7440a0e42a3fcdc93828a95ebd99acee4951850e6c94f2d2a5796
 DIST gShield-2.8.tgz 47346 BLAKE2B f40a9a22bf7c989a2eb4dc693a16c90dcf025407b7549b1d089377340728fd15a2cd0cc88b32867a42846eed0bdfd46b6f4f261670e59dfa0993e02ec089b242 SHA512 f91ef18267817e3296c795b3f1629dad9ade269e12aba7f95d39b7ae39aaf76dc15e0046747281dc44859241a18b2ce7ac03e276984aee11af15e28cf80f736c
 EBUILD gshield-2.8-r4.ebuild 1159 BLAKE2B 19e6f504d8fdc47e4f8916181c22fe3fd4f7914db2f786c3e9144421d043a52893836aefb4604d45695174f4130480cf29148af04224cbadf1169a0a581216f5 SHA512 393375f184c49f9773ed82b2638de608920c70e1fb58116dbea23b99984ea65af2099293b2f74fe8705a31f923bd7a376bd12c5f677f4c72027940f1d8ee26e2
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/net-firewall/gshield/metadata.xml b/net-firewall/gshield/metadata.xml
index 74c2baebb4ec..097975e3adc2 100644
--- a/net-firewall/gshield/metadata.xml
+++ b/net-firewall/gshield/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest
index 1beb14904cb2..cf366f030552 100644
--- a/net-firewall/ipt_netflow/Manifest
+++ b/net-firewall/ipt_netflow/Manifest
@@ -4,6 +4,6 @@ AUX ipt_netflow-2.2-linux-4.13.patch 2403 BLAKE2B 4ec60fed8450e7e785fbe002c337c4
 AUX ipt_netflow-2.2-linux-4.15.patch 753 BLAKE2B e8cd5b34e14f4d29d4d5cba41166b58867204c8f32720fa74bdeb517e4d74c32c8d22d56d13eadaf01aad76fdebf8764d336b4c98a27dc47e02b07b0cad46d57 SHA512 28b037e7026e46d908d6e608bcc16894741e34d861128f919fa6cd797f93a7a249b560ac8b2c55a70c81a73716c9775f05cbea2b25ca857f3603d7284de30a48
 AUX ipt_netflow-2.2-linux-4.6.patch 2098 BLAKE2B c35035e789ca4c03ff2d7479d9d0243aceb405bcc37f46960416505ea8e7d791b384178476aed9c561a39071cd9b83062fca1a1a5562abce05e3a36774ed7037 SHA512 319b1a013e8d32854ecfbc207aa7197e2ef39bc2688ece952814d3092e9110aa3cf134c56f3b9f671c7856465814905a4d1f888f8dab3b40f0be09202c6f1a64
 DIST ipt-netflow-2.2.tgz 96697 BLAKE2B 996ad539b6a6a5198a1e4a4a1a51f0610d97fb45740ad9c92e19854f2928eb697ca8fe14625054a05b106eebc345dfe6c235cdf375d1360ef44ff6cf0b03f34a SHA512 a406ab9bd18616414d8c99f427382a075bdb8000d8c40959f5b6d6e577d7eb4dfc7f8b773664a516ec2228d15590f21c3fbd6aa3d4302f6cdf03810e1702af74
-EBUILD ipt_netflow-2.2-r2.ebuild 2509 BLAKE2B 5d37d7c10860f00924bbba2170cbf8032baa62b0f37e9ffadf9f6659fd1289ee00c580fc1f8e5ba1f870ae762ea07cdb363758d9ab296e26c32fd0abd5300466 SHA512 aeb6ac81634dd1eb1fd2d32f9800531364356207316253e42d6102548623665816faabbf6007c59f1f143119d83764dff489e27111e4065d6dba2d0e5cb45837
-EBUILD ipt_netflow-2.2-r3.ebuild 2571 BLAKE2B 2dc3b03d3c04761f350abe999a8e273c21e086ac9d0836f1c7fe3a25e3bb12e56aabb158d37dc51843a36001a7a131dc0907b94db8aae916c324702fae7878a1 SHA512 91854ca0d6bcee83df110f9c6237484fa31d8a6e794bd23667afd7902033ca48a375091f9b5c76279a5881b25421737a60d76a8e58eab59a3d382c7c1b61ffd0
+EBUILD ipt_netflow-2.2-r2.ebuild 2549 BLAKE2B 06710e06c8a16e8d65d4e6cee3907cd7a7277fe92fa147a3c33065586afcf3b3522fa13e8083e2a0a6c369f996ca51681d75b440ece88be446b06e708071564b SHA512 05cb81db07dadb62f82b0960bf51cd619ddc7fd5381877e40d0a69714ef78a95161c69fa60fbb8182d3c65d421006c7b19e5d3197f601e7093d89617c82bf23b
+EBUILD ipt_netflow-2.2-r3.ebuild 2611 BLAKE2B ec17c21adb5e26e25ffee0ddecb1b95d36f665ac61fea659051e0add43ff97192a1e9c2f20388c2dc2f3c4fe22c0b1827ae8b8429b0f32b4107bf0b0d67acba8 SHA512 abe23380ffc2de2908f6109ccafd3fb89232059202907f5acf71bae5a9f1006a6062df7b54925538f91824d2d40dd2baaa4ecf94ebf1ee810cddff4fce8276f8
 MISC metadata.xml 561 BLAKE2B 8b2d48273d5c27a1996089236e3981c7eff8546e73671136baa8a9ed0c18fb26a56be261b3162e4563878bf54487a0b26e389861a9dbc80af35783491564c7d3 SHA512 6cd4feab99315acfcf34f34fccd9ecb6b00b23efecef622cc638902a4ec62240f3d9f87d1f349a84ec7c4985a90f8632ffcfa9f403b42c26ce9d923ca9e01bc5
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
index c4a7b8bba0cf..256b146cb88b 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r2.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
@@ -7,7 +7,10 @@ MY_P="${MY_PN}-${PV}"
 inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow"
+HOMEPAGE="
+	https://sourceforge.net/projects/ipt-netflow
+	https://github.com/aabc/ipt-netflow
+"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
index b2bda0e58894..eb772b4d9b21 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r3.ebuild
@@ -7,7 +7,10 @@ MY_P="${MY_PN}-${PV}"
 inherit linux-info linux-mod toolchain-funcs
 
 DESCRIPTION="Netflow iptables module"
-HOMEPAGE="https://sourceforge.net/projects/ipt-netflow"
+HOMEPAGE="
+	https://sourceforge.net/projects/ipt-netflow
+	https://github.com/aabc/ipt-netflow
+"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index e6d7e3fd7ad3..1f3a7237d321 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,5 +1,3 @@
-AUX shorewall-5.1.10.1-fix-find.patch 674 BLAKE2B 4bb05ba775c0fdde4ceed50b381cfad29e51f54fbc10927a6b11088ee4c02825959206750ab6d099f9444bbd306c10f932a86389e8c7a9d2ad21172a55410e53 SHA512 d2e985e84bd0122aaed1e6a955c53344794ec1458ff4d97e138a355aa9549f7ae60d9ab556c0ffbedd5078a523a8e38267c51dab6eda2f25b1285d3231826080
-AUX shorewall-add-iproute2-4.13.0+-support.patch 889 BLAKE2B 45a9b0fbaffbf284f943c627b8b5bfb5e820f8c132ec5dd08247f17a325303e72afb28eeae0a6d5bf72d45f88d8eef5894321135da572dfaeefd41a37507cb94 SHA512 821dc1104671f1f5781ee597c1f5c5bff6a77935255be5329064a82b8d645f17dad106e505290620809c6ae1ba25239e667640eda9a003616ebc7b0f422210f3
 AUX shorewall-init-01_remove-ipset-functionality-r1.patch 799 BLAKE2B 5cbf0835d291464eca10356fcfe1de13bc90cf0e3b9869d0daf8e3ad3864a44939774179047cbf5e192f0e294d8e8765c6d7b60a02178c9c149cbda4d3342b83 SHA512 c8686cb9345abd1036a8fdc6cbdaacc21a69df9dc536393a65675a2ae19c9cfb71d71cc66a9776135ad923414bde783f01dfa69600d1cfaafd618fcea65c8dcf
 AUX shorewall-init.confd 152 BLAKE2B b670db8a1da8e37c9d0f856c27ceb9644ec7baebf82e8d053c02a6f133df15a04087340ac430c8dddc57295332834c3e8e1c6fcb994e96e7224452a5a039d1c4 SHA512 105393c3cbdd1820066e41ed941b6a79cafde3196eb723c06ca984fc663370d6902757467339b6b4ebfb8d00167b9f85311b6842dadc564029313eb36f1a389b
 AUX shorewall-init.initd 4357 BLAKE2B 192e36a9e488c510783454852e65e2963e400fcabc96a07201c9cc72e09bcb63171cd56665f4cc9e4b4631202f8bed3d618866bccdaf194dee25814241381739 SHA512 5cb410e0fe0391fd467f212b3e1cf3ec4c7fa3289de2341edbf301ce9087e7cba05a36999a8203d7bce28ac35a429c10bc017a96b750aec1bf257987aec23245
@@ -14,53 +12,20 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r1 2075 BLAKE2B 7aeaa263ea5c318d3c2b29262e655929f87e36de17e347e613bb9ac4141deea5ba983695b4279effb3ba8b4a5da706a2213209571866e8bdb844c9619f1df85d SHA512 9cf87d5b5807b224a325c9d038f159e55d277ad3eca62a1fd82d06d9ec1d0f71e58b239c57532b9b081271c7ab6f90b281cea1dca0bb9ea26e1e1c8ddaf3a691
-DIST shorewall-5.1.10.1.tar.bz2 535652 BLAKE2B afeb0c79e5e191e923f0e44f9925ec32f2d97a5962dd6fcc75e28ded1b3b13f33ddcbd4f60f261b2b7b4cf2112ff9074545d88c8dfc02bf2147c3c0c2b941c97 SHA512 75b63b418bfacf3151f1833547ca187a9d87e1657bf02f9225d5067bc05a137cabb74709cf6d64c37e2f8fd8d5304154f265968e8b707ba08167d91be93f4ef5
-DIST shorewall-5.1.10.2.tar.bz2 535735 BLAKE2B 49594b997e90859db4fd94f3017ea47696579791cca881460fd916eba1c477d62f9ed2fbc25b22a3ff425084a169260cf6a6d00f1f59e574c996b97dfccb7232 SHA512 6f0d88ecef130be4283103ebf2c31ddad6791caf113448fcf29664a951067a070a7becf495e4a5cbe96aff81aff7d2028011421208e6d0dbbfa4608f3350f401
-DIST shorewall-5.1.11.1.tar.bz2 538193 BLAKE2B 88e2d83eab34edb8009469e1b9b30631f313e43f431287acdf2b6bdb4bdd4660717219c56968f0cfa95db8247e3f0078f9b90da0095f64f5995f55bce5d72658 SHA512 c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a
 DIST shorewall-5.1.11.2.tar.bz2 551818 BLAKE2B f0bc4b7f55e0e5189b50c1fb274229c4485802ea891256cb39c1bb89ff90b8a7e6c46d095fcedc9900ff211d218627c7822db9abc5e3bb6d6764be75b2462f01 SHA512 d214d497b70a56e40af115148907fd36cfc3daa8bd8689605cdc52c0312a0843d081f8c6a33f725cfd6778b400a91eb5c5d538f5083c8ac27f72652ce026714c
-DIST shorewall-5.1.12.tar.bz2 553543 BLAKE2B 82e5236b7b3a7c28fb29a1f661ec9f4609b8d142c8d262c0dc93be25841d5ee9f2e9fe894664ad95f70627579c0e7c27941d1ca42bb610c2dbdb267e38007b5e SHA512 e4f45b24433b2ec34a2b3fdaa665104bd6b18fce4d1c51d47a29edf35dcb96fce233d12ebf8a23939ddfc3fa83edb3f3f776d2d89fd5b1bce710f738415577e0
-DIST shorewall-5.1.9.tar.bz2 529237 BLAKE2B abf9b54ef6083d322bd2e4fc00f98c2058759b2bf0e30f4aeebbc3cbb0e943543c7c304c8fb3b00ed7fd60391d1afa7d713cb88040a76eb8db549426ba3450e3 SHA512 a29155d8d92e21b7fc6d3fb3ec0be5ff4a648237317ff83aac523ce6d04c863c2ff48a14d368130431c41897e15068a54a2c0d3d0d9867017c11ba50a14e02b5
-DIST shorewall-core-5.1.10.1.tar.bz2 83398 BLAKE2B 4c0f2321cecd35f7590cdb533e7ae08616f9f9c2a1e125382d568f681e0459dd9bf027c1f2a23531830ca9dbed181f5b57e0c688c6eb0eff5653fc199a78d4d2 SHA512 5f7b924505f3c78df2602c3dc637983f21b0f15383bf1b346205cb54ddf129c04a7a7e10617aeb624a2b1fc770d23b0f5e844db5ec639eab7af468942e3eda3e
-DIST shorewall-core-5.1.10.2.tar.bz2 83729 BLAKE2B 774aab1eb21c73f5d1ad116b2fdbc91d7fe692124aad527c59fb2f88cfb38529d43fbf8a20e95d9b3679f8c5690a6d31bc3b474f0f9ccc65b2d160d809754021 SHA512 3977ee81d37107889c51a1d68c450073e16558ef84518a083932134abdbce195ca00f3149691dd42f224bea5f87d4d18a4456d440ac7759ab1418ebf54c76bef
-DIST shorewall-core-5.1.11.1.tar.bz2 85004 BLAKE2B ae3f016b8d22ea93bbb4f49cae958ec44e443e92a8a39675fe3d8b75335dee38649806069f14458d7c3a7905734bbd5ca2677e6c4b640f2034108314173bacd0 SHA512 a87b857db961d001fc0ffe2f504df01e8b08ba05014986132e63dbe01e07411983a0c0b16b1e3618f2551d3d3a3fbb02d20569cb295ffd8ffc77ad65ff745b0b
+DIST shorewall-5.1.12.1.tar.bz2 554575 BLAKE2B 1f49f5fb2dec41f6f1040c82c2a95bc1b658d3add16d385a0166fc3cb9fca8bdfcb594d620b969243b71420c9de15bc84ef4d0648dde9328794fb6383d0e6468 SHA512 7b79a0f849dc24680ab99bae4345857ef70d20cda5e089c74c339b5483cacdfbbff72ae671729bdba87d5940e66b32ccd5e00f6d62a3e2d65577edbf5a305986
 DIST shorewall-core-5.1.11.2.tar.bz2 85166 BLAKE2B 7e6d3d858163fa6ab20a3b663bc59339c4d2a244f0f4b00a125e48a45739dadaa102a4c8637e662db5452967bcc36b0ee95752c0d92bcfd8cd9dcaaf6d03fadc SHA512 6951a4d3139bd624ecc654a1992dba367cee84d6de218f20d6c2929b34de51a6a53f94061e1e9dc286094312ece75f113e123983c80de0f450d6e786093c6030
-DIST shorewall-core-5.1.12.tar.bz2 85304 BLAKE2B b0d2459b6a4bad9fb4524777138269ec7188fc7ab56f58b1c1b0ab3ed60e164417e7b702065564e50107750ef48b6aba856e8e3f16585138eaba94ea73ad7e25 SHA512 9308f7c66ae0d2042d5607f10871718b3353f4587652a3588c27aa2e8fe951c2cf13979a79833c36bd6db8c51c6378b51ce894eb6c4cfc8be922dd0fe1610651
-DIST shorewall-core-5.1.9.tar.bz2 81533 BLAKE2B 5c47197c6dc6d43c63efef4806707948c0edfb39b237a214249522200a6b0429b0a2a0e8350af5cf448f28ca2b07a9258f91a88d8e9fb7112b2f265100fdc666 SHA512 633ac2f5bd25946f90d6351ea510976b01a61292616856f119602813510e1c24b55e8d86531a854fdbca03572d9eb2865a8e94a1566d36bf286c411e92182877
-DIST shorewall-docs-html-5.1.10.1.tar.bz2 4279932 BLAKE2B 64ec2a5b544e3f8ded23271022599799190cce0653b35e7183f9e56ae94f6ecec1fd8633a7c5ccef4b5dafcef0cdfe59e317f2aab46e8dce6bec433545f2241f SHA512 22bbf18fabd63edc605b1f25c8a3a34e3677554beafa0b3e698d73675a566a134b8a6d1389fca4e2d98fe984ec92a3540ab1fc720ecd78a4b75587c53ce59cb0
-DIST shorewall-docs-html-5.1.10.2.tar.bz2 4280287 BLAKE2B 7db8c9d9f2f8793ab9c318f3d2a4983792b72e84d6b81f7509ce36143c8540aec805733e428d507d3effe43928f7b83404b59530aae99092e240db4b57b6df96 SHA512 8991d41c22d7c1771a328fa94cd76069a6e6d54c0db48866e3b5638f96ea9eeb91df96caff266a437017802fd2f85b09fbca89baa161eb8677b3035e41907234
-DIST shorewall-docs-html-5.1.11.1.tar.bz2 4280930 BLAKE2B 259c333d27e41201a808714df2a632a60cc61dd24bdf47472e71dc520f6c9ec04ed03f6f21f993649f727e023130a9562cb2bdcbe5b750f7dfaedea1d7feab1e SHA512 68f17e6f99192a8c47f377dbd298a84a77054d8c47e73c838e2f8eb68f9504ef73e60915d505fc33327ae4994db879414dce26f3b5dc2d637aea2aa42335daeb
+DIST shorewall-core-5.1.12.1.tar.bz2 85905 BLAKE2B f867d690c0c3ef8582b5418cf2a45200b5298db9f978d2d5531a4fee157298017b38e98beec0c243aa1009a138e92faa8e19fcf38f88ed030781d4a149fdd26a SHA512 d3f8e347fe2b0c9590830d297e6cea8a830c16467e461fd1d422138850ab80d0eb67213c26f0ca594d04b86d99999bf47800c57b47ae25bd064aa56d9e70fa66
 DIST shorewall-docs-html-5.1.11.2.tar.bz2 4281096 BLAKE2B 467d5fc2dd5d2dc6a8064b86439160f4f227b6903e5d84e9824a9e3a2504eec11b2957d39536dfe4edba426b439837c5dccb584ff061e61a7409f377a8599b4e SHA512 807c996c6c7a58a5f13d687025055ba4c5a3c94bff9e227e8fe8da71a909cd428bce163faac59e3d2463f9884f7f46a48c1f661daeec94f9a8c97aa0bd092cbb
-DIST shorewall-docs-html-5.1.12.tar.bz2 4281100 BLAKE2B d1bd2aaf3865d752ef20240f6c28ea67af3f47bfa74875cd16ee204e9c1f232a26fec225183848cb705cc3c56d53f9f849b24db5dc2288ab8a01295575cf9223 SHA512 68b175cf75510a0f457ec91322cd1aecc5791d3ad64c8a278343d9103cb260e97097f31b8c3de708a491919657d5efe9eb03835a4b305bbf6e381d1f805a7f25
-DIST shorewall-docs-html-5.1.9.tar.bz2 4279854 BLAKE2B 49a5285b19fd14a739090ebda718b936fe4be5222d32a23600c8acceb598ed7539c471ba02464c8c5e7aeb8944277d740dd05c99a09486b8d4933c8676e0f724 SHA512 38bfb3aa680c3e8eb2916aed63800396cd1ae1bac3e084e0d9aecf89ba457f10b578e1122a36d486095028a39f17bfaa1bc85e92fdf324e7d53b10fb5f3b61fe
-DIST shorewall-init-5.1.10.1.tar.bz2 38560 BLAKE2B 0f3e40914509814ed274840ce5effaa0c6fdc61d15ac94a15182adbece5a553e537191660f05aa5edb8443a89ee49f0ca98cc271bd56dc7b0a052ffbcd13029c SHA512 fa1ebdfd852e556a1e9bb3b550ad1e6fa9d256db39e8515d515f1d8a133c5956beb4e7fcc24da0dc776f1d418d2ca607232bbd2c6cc2585d00f858eb649af1fa
-DIST shorewall-init-5.1.10.2.tar.bz2 38857 BLAKE2B e82d22fd232a3990cb62548a7a637557326e2d6895516e41d9cc87d5b6ab9cc102a07e7590ab105ee8d12ab235db2e4a7e78f03220cbf3c03590b204f0c25867 SHA512 c18267d920033540169c7b02f1c09450e3dce6a6bbadc88c82897703f5706003ac59e766bd8cf09ff22ad47116028873cb6fc35d1d601e1e57e9175f8069a128
-DIST shorewall-init-5.1.11.1.tar.bz2 40093 BLAKE2B ec9fa6e83bc91d7c518dce08e6054806f38f7e66e63acbf55d82576c92c3bfa3c13ee72c26e42c890ef9e18d558bb40482f8111445d9a3650b85b73b4bf58eb2 SHA512 cbd45b8b5b88f7fca6065a7af372d43178035b25b317b4fe2d01a2d165e33638f0476874851541b4d134d986a8eb1a60bc1e8e9c1eed46a5a4ef4e9397698c4c
+DIST shorewall-docs-html-5.1.12.1.tar.bz2 4281459 BLAKE2B 4696dcf2ebe6a3a2c9078b4081393b040481f6769ecff381512a40d97d0ba52042b3e6f3c74361917b2623a4ecaae1c76409ef4f543eb6feaab2077f96250cb5 SHA512 96f6015c9ad4a42432143f5e2411d051bc55004c6479d53b6d8b071052f309aa30df858ac2452fe1d80f2e0071d05c2fa6eee12a70065726f9e775cc2f909575
 DIST shorewall-init-5.1.11.2.tar.bz2 40214 BLAKE2B e793d272b80e849ad85e0f54e88d7b0817356c35f44669a478ba30ba8d0f4f274e44d5cfb84468896d8aa743126cbdd4bce35b10f3d952c3377294344f95b562 SHA512 5ff9d85c8412cbe6ba9d0124cd3711febef14980c428ca2a4974cd82217ddf28f7dd4a8ca35900c4a59a0c47a407d45da2bedff7b0c92770c11c9761a390e417
-DIST shorewall-init-5.1.12.tar.bz2 40841 BLAKE2B d575dd636645c6ee264449ba94962148ae42ae2bd045ffa713edd3a66b1fc1721bb64bae4f63fb81c397219ed3e6090f7ce8e2abda19c6c675bf2a4f403c0b68 SHA512 a5a1cc64ce0f6cfff39535290a1110352522d93591efae81c43c2567b04370eab72c58094e393c410a002b0a539c434b2533219722707e6c8a5b544c1fc222a7
-DIST shorewall-init-5.1.9.tar.bz2 36834 BLAKE2B 6e8ebdda40e547e528df1faec4174f757b7922f7f06fae07dcc4a5c11005d2da5df387c900a9aa07715c9d99940b62f4fef28aed6b845b93f3172eca88e091fa SHA512 b7dd4394e4b48d225acff6f81d559b4020bca0f80447a179ad0a87536ce6a4c75af2f0bd9eca313bcede14c73d29c3a18a2c48cd230103b3ab656ed76747a95b
-DIST shorewall-lite-5.1.10.1.tar.bz2 44231 BLAKE2B 46cec387c7f7ccc862dba3575c272dbab038ada62aae32617d53262aff9751ebe95c6ba32ea365ee4a8d28e4775f3802282fe08fa07eeb7036e1064a1eaa3260 SHA512 8d25ca48fdf8a5f96060a3510b475144935ed15625847542f879e4cd1d6b5e7c9e7b333f299c59920f8cccb32685e9dd8f118942e0f8224c1c5deffffbaad146
-DIST shorewall-lite-5.1.10.2.tar.bz2 44515 BLAKE2B 44e9c432f818fe372841a5f80c39520142cbaee2d8fc5aa2573958b0c9321588266e63d0fbdf32d476e34fcc61cf896625e9c60b61e41129c7a6a2ce25143738 SHA512 9fa6809d79d90513512e11ee5d2a278d6a3104ce86f50073819276068f00159288f2f5dc38af6ef5f564d9bc47de7cc01c4a21aafb4860a029022410fd8b92e0
-DIST shorewall-lite-5.1.11.1.tar.bz2 45763 BLAKE2B e941407698418d3c317a97de5675c9877c917f71f10ee7db654722f163fdce852c84f6c5b4900e7ffdfbb5768349f28708a0fe3900cdb010b7a0e78d7ed3b2cc SHA512 4dd616c5fe2c7aa162a48f074d99f57c87c916c0ab2be9cb6f31d75a0c0a2f721fa9d198a99031ad68fdbb0d43852f65a1c3ea99abbbe27aea15dc928e9b7a13
+DIST shorewall-init-5.1.12.1.tar.bz2 41044 BLAKE2B e38a1f085e74720949ebca053c175fce405699120684b1165a00e5e357cef0b288dc9f0cfa7001795cd626226aed60f286e9939e537e5eaef0bf908f96db2c9a SHA512 e3394c5ca5edbe09941b9ef26e68a606673b13a3a3bf97e3d74a2f7c78cae50611a7f429ec322d3bf105b4b52fbef184cd286eb557af65515f0a6178e3431266
 DIST shorewall-lite-5.1.11.2.tar.bz2 45821 BLAKE2B a51f745a111a2aa8c824f625bcdb779c019555d8e68323dec21d20c96054241cb69b74c25664ef7e51737bae959a567c24cc5b8ab771ee5a613bd889af20e870 SHA512 75dd0e7612f5e5903bdd1a54a152ac98fb277e464a856b4ef7cbb5f5d9d67eb19de29dcc994f4b0cb3b60af68e47c0a8e19d7e33e72a8a34d71992dc043bd88f
-DIST shorewall-lite-5.1.12.tar.bz2 46523 BLAKE2B 803df174b9c05617ef9f8b4e208018db134bfc1e4d9c99976113dd62e271dbde4f1a34430da7193ffe8c9defde20abc14770a47448e85d9eeb89222e083d9793 SHA512 735eaa07d8e1139201256050b69153a9b23e186994e5c3273ece778893b1013e3c00b6c49958c7c4e18c1096eab7623b35c46eacf72fe4b45fc64ac6875f9905
-DIST shorewall-lite-5.1.9.tar.bz2 42487 BLAKE2B 6a8c41f87c0f60f7ec453ea61490560da7640a37839d0c6be004cad48aad53143e3ee327690a18cbbfbb9292a4d998ece2500fc5274a036a82d2406eb27cba1d SHA512 61eb359155fd261bf7aaf5ce03a04aead297a17e80ba9ab45a3a8e23cd0deadef780c18b2d39ffe19bce9eb0a81ad64abb9643e466af4a9e78f3464f27f95092
-DIST shorewall6-5.1.10.1.tar.bz2 199827 BLAKE2B efc888e098c36045da426441f33ea7d46c39e2e7496ab81a3301f64e5ce3eaa5f741ade8a3a1d29c620b1970a8c9c835fa7e9c51c54737bfb38a94ed73be4546 SHA512 2a8c5f5c1b3ca85d873a9832bde3b2588c5158c6a5af129f2a5ee2fd18042e766e5c37e9246c2f42217527372a359fef2e1cb87e5591271669ab8759eb3b3c35
-DIST shorewall6-5.1.10.2.tar.bz2 200310 BLAKE2B 3b5ae332b275388edfc42dc8abd6961ac1f77ccce75c75370a51ab835c516903c05781ed240854e8a54fac571bf08d0410e23d1a1bd29933fce1a06b60491e0c SHA512 9613869fd9452d5c3db0305b5a13b92f39c7881ffb0e15db6ebb1bf87df2e801616510f5685b5cadf9e4c49cc42276815c65f36f7599d6d2e2f7fa6590dc3820
-DIST shorewall6-5.1.11.1.tar.bz2 202537 BLAKE2B 4cad90fc2ee4e9597cd289c14038bc2c24664ef226c0d855f1ea641a30c467e79f65318baff00523610a40cf4ae9e17d0a0174ebfb2aad733f891bf5ea484ee1 SHA512 26bdc061e72fc63935465acd9601a6f48d4aa851bef21820d1726b6f39c61bbba5b69ced5e298f932aedee01e4335d5e7cfc40fb16615983053d33c1d84bde83
+DIST shorewall-lite-5.1.12.1.tar.bz2 46683 BLAKE2B d8429721ce76bb6b73d8f49bd2ec75c484cd48e732b17c49923a40cb23647a6f2de84d0d8ed798ae2ea89d5ec0cc9a1c367a13175224320f7868298481261ad0 SHA512 37146a1d9bb82b6de69f46b727fb2fa66a0933e13799008716b74d882d28607329795911e9843e0bdf5e5324954c8a7fe14a0e4995184ee38d69ab9c3408deed
 DIST shorewall6-5.1.11.2.tar.bz2 195491 BLAKE2B fd9d05e9b30037fead69add2ca62e0fbbfc2481212485f3f67935c2a062f5fa97378c74e88093b81b218445e4068014f5dedead3370a7ad2424a4ccdd1ad175c SHA512 5488679f2e10bb9ff8b5d66276b068d7acc111256d06f3e1c46863948edc9b5734c3289720c5b3e444f7f9eb25fc3603f676d02df50929802f0e1d582e23f997
-DIST shorewall6-5.1.12.tar.bz2 196455 BLAKE2B b4ef60bf903824178ea0e4e1fcd8861981a221f54d28388d8302ed011ee64f917a8ccde3200b4b195dc21e5d67ed7e2cd479a7b4326dd6060b64353db25f54e6 SHA512 074f6a06cd3e03bbc9262c183b9f45e50372dc8e7d583613db76ed0dff4847b759b5192b41f82870bafd4a83d8bf54906cbb38e6947142064766ea62294b8686
-DIST shorewall6-5.1.9.tar.bz2 194504 BLAKE2B d849470c9f737f16b47d4a0288767d7a5c6fcd48dacf4d2f51df434e43f34b9e71188a01e8b893ed64d84c1afc41a7d40e9f37ed2b6ad6b4b2b57e118ec28565 SHA512 e086dc8721865b2ddf891842838ed2ae6683154977ec1005d5c1327f76e7441b6056bd2bd53bb5ee9b95ff8dd50e5ae5b821ddbf8e5fe8f5543ff0028b7eda49
-DIST shorewall6-lite-5.1.10.1.tar.bz2 43906 BLAKE2B 42b58bf34ebad66efacbe964cb40dc37f04c559c9fa0e0396490dad8a3212c6c9af6cffe640a4cafef80905540e440ef5b77a69e5c4675d80b1c64164939aec2 SHA512 f4eb540f1c8dbb163b97d6f6c90609fd0d2513c64803cc2362842665bad382023d703e605e159fd5759135934890b46d10f4555da19e1d28e87926d41f5b9253
-DIST shorewall6-lite-5.1.10.2.tar.bz2 44219 BLAKE2B a11f015021aa47f6421389dae127e7e42ed0941b31563f6251be1450e05f78a6504007bc4c2df1bf7ab0183fc285e85feb8c8b39407ef4299fca6b58847a43c1 SHA512 f067a45a635ddcd2c357953feaeefd881f1a57c4fd129c51ca62c025b8966da935961fc938e84070b93c278b5872c4dd58eaf7aff43bdcf1d838feed91141be8
-DIST shorewall6-lite-5.1.11.1.tar.bz2 45473 BLAKE2B c8a0972efa4cbf3fcf92c8576800521b4bf6a1d043d5bc8aa910dd4e8d7e1f54559caceb00b292810308ce6878bd3c4b161aa62e230891de3d96243fa8b59c2b SHA512 7988b5102a5ff8980ecfeb75d0f29eec796489c66f600592f0a5a1639e6e1c22076f9af30fa2e5bfa3d978839f9abb9732004bf2c12dc401849f33e8b5ef0dfb
+DIST shorewall6-5.1.12.1.tar.bz2 196607 BLAKE2B 35d29ccd73184b6905fffa60d209b4bd91cfe05bee73f7205f24ac178f78f74a2b847342c9f27435279fc2bfd7e5e840842d6c1333245f0a04b811d1fc2a94a5 SHA512 bd982de71d53cb1f669c293c825295a2eebe70f52b98bd0a172b13b119d5daa17a14ce9c79a97a41dbf740d4864bf5ee22b40c2bb22401bffb7a84fb911d88cc
 DIST shorewall6-lite-5.1.11.2.tar.bz2 45581 BLAKE2B 760b29fb864a942f15bba5a88cd2933ed6791533ed2492c1985567253c2cd8f02c4931552c0b8ad35599099de70bca2d0f5b2219b98298ec9541ba3f16bac035 SHA512 d5db740f4dbe86ae31d44123de0f0244bf8caa880e9f29cb19590a9a2abcc1b17ef5ba0cd0b40c5bf843415857d988cacb079a4aae7016148be1f71afd8433de
-DIST shorewall6-lite-5.1.12.tar.bz2 46172 BLAKE2B 4654d0277ccacfea2eeb199ba209ae9d7912b606c1f7734ef1d53db1d2ae78c53676581d754f4167fd4387853c75c80539dea24e687915548590c3bfa5700acf SHA512 d8d361236284aaa1025b4e9da67f265c187879998d8f4623566e60a139b8d7a43bf36f7101d3f4ce6123c7ac7db8975bccba69ec6482d3f763211c9f68ea1377
-DIST shorewall6-lite-5.1.9.tar.bz2 42198 BLAKE2B 7854a1f4221241c3e91ba2fa4ea40ee4f78e320fd251fe9f491c32b4847aa1608bc56f53ccf0e573f77240693881fa18a006b6e2d0dfd88971a83c0b292ed2fe SHA512 a3fefc75ad6cfe461943e9d3390b08f214c493724060d710e104dd44345c3913a3a2c9d28ce26288042329581a9e4630aeb3ae4db49e915e8c073dde48cdf975
-EBUILD shorewall-5.1.10.1-r2.ebuild 16190 BLAKE2B 5953e5fbfaacd1bc2bb37e2c83564fc173f292ad3912731ad4b9fcab8db0d6676d8dcbc9d19ab9698d471a36536ef09f219e5f1cf9053ed2cc1bae046f154b53 SHA512 b9af71fab802e904062cd2f28c04511f95541de81679314766a4b6ebb06c3a8236f39988846603129da1656c2be2343549b9c88dd0962ce9e84e4bedf0d732f8
-EBUILD shorewall-5.1.10.1.ebuild 16138 BLAKE2B 773362be92a5387b429438909a85900c0b0c44860149693ff3e1bc5b0262585160b309166b0e1fce6ef66f577e0ebfbfd9190c7745cadf9c2d541a0ae9729ded SHA512 0eed0236de6f7a2f336e052cbfd7c57a95687520df51b580557bc5ba11aabd5d6dd8ac23809950ec76dcce24e78922d254f52187df5d82bd4e70c6af020a9893
-EBUILD shorewall-5.1.10.2.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
-EBUILD shorewall-5.1.11.1.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
+DIST shorewall6-lite-5.1.12.1.tar.bz2 46365 BLAKE2B eb3fdaabdc11d5d2694964d69ae452e52557eff6539a1eb0de3bf607252f52515d285c858b0a75b1ff35ef02c62031ab9c510517e9e5aaeb5f6b860b50156ce3 SHA512 1992cfbc2ca4c9e4b004e10c1b0bf73157da2cdf2fe03ecc8ad9a33e941d7881565c00bd68abec6e8711c58d8df03b0dc1c413639ef7015661fb4ef79151a78e
 EBUILD shorewall-5.1.11.2.ebuild 16131 BLAKE2B 7d84ec26d9331f14660a6fa5add471302d608c09202a6a05dbecebe3efe1de29c7783f33ec872d52bb0c1a21c147f36c3704fef3846491de9efb196ecb357ff1 SHA512 759b68fe29ea4fc9a412da40823a021067ee27d746733a24f323a45516cd13c34c6dfee70d7179ba132942df8dfd6c6339aae75146f30444ed0ced31199166ab
-EBUILD shorewall-5.1.12.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
-EBUILD shorewall-5.1.9-r1.ebuild 16199 BLAKE2B 99451766a294d056ba5c0a0ea807584c241e187abe425c7d42473a8fd92a743c68cb1bb6aec6fc9df1551ec35a3aa25a45f17fd86a5ca98c63ad982ed4a19617 SHA512 2282ce7bd8962f0733fe1e2d2c0696b40c29abf0519f058fec6d87b0cce2ff164a1658935aa59f4f22c04095e1cb70dd19800d1518f0b390f3d5de8c24d675c4
+EBUILD shorewall-5.1.12.1.ebuild 16138 BLAKE2B 1e94a98a4907f0187b824bac38ced587df41e912b990b0777e3e184ea68d6b7529c9b5f13fe47a70d9f920b791db47ffb0f53ee838d772deb5695f76436c44b8 SHA512 1652569e4558621ec9c3e163081829dddf304a862f7cfef5bbd96c68426b792fa57d2ff9b206340605de6cf702aeef400e0d3595415c41498ad391942b25a246
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch b/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch
deleted file mode 100644
index 2850d12297f0..000000000000
--- a/net-firewall/shorewall/files/shorewall-5.1.10.1-fix-find.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 4e5b98d3d928579bc3530893ceaf166337ea8e22
-Author: Tom Eastep <teastep@shorewall.net>
-Date:   Fri Dec 29 15:32:05 2017 -0800
-
-    Only search files in each CONFIG_PATH directory - no recursion
-    
-    Signed-off-by: Tom Eastep <teastep@shorewall.net>
-
-diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
-index 6f220aa3d..95eafdf65 100644
---- a/shorewall-5.1.10.1/lib.cli-std
-+++ b/shorewall-5.1.10.1/lib.cli-std
-@@ -386,7 +386,7 @@ uptodate() {
-     IFS=':'
- 
-     for dir in $g_shorewalldir $CONFIG_PATH; do
--	if [ -n "$(find ${dir} -newer $1)" ]; then
-+	if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then
- 	    IFS="$ifs"
- 	    return 1;
- 	fi
diff --git a/net-firewall/shorewall/files/shorewall-add-iproute2-4.13.0+-support.patch b/net-firewall/shorewall/files/shorewall-add-iproute2-4.13.0+-support.patch
deleted file mode 100644
index d4b3d9bdcc61..000000000000
--- a/net-firewall/shorewall/files/shorewall-add-iproute2-4.13.0+-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
-index 49dc7f6a4..58b0bed92 100644
---- a/Shorewall/Perl/Shorewall/Tc.pm
-+++ b/Shorewall/Perl/Shorewall/Tc.pm
-@@ -225,11 +225,11 @@ sub handle_in_bandwidth( $$$ ) {
-     if ( have_capability 'BASIC_FILTER' ) {
- 	if ( $in_rate ) {
- 	    emit( "run_tc filter add dev $physical parent ffff: protocol all prio 10 basic \\",
--		  "    police mpu 64 drop rate ${in_rate}kbit burst $in_burst\n" );
-+		  "    police mpu 64 rate ${in_rate}kbit burst $in_burst drop\n" );
- 	} else {
- 	    emit( "run_tc filter add dev $physical parent ffff: protocol all prio 10 \\",
- 		  "    estimator $in_interval $in_decay basic \\",
--		  "    police drop avrate ${in_avrate}kbit\n" );
-+		  "    police avrate ${in_avrate}kbit drop\n" );
- 	}
-     } else {
- 	emit( "run_tc filter add dev $physical parent ffff: protocol all prio 10 \\" ,
diff --git a/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild
deleted file mode 100644
index ffef283075da..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.10.1-r2.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-	eapply "${FILESDIR}"/${PN}-5.1.10.1-fix-find.patch
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.1.10.1.ebuild b/net-firewall/shorewall/shorewall-5.1.10.1.ebuild
deleted file mode 100644
index d04ce070693a..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.10.1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	<sys-apps/iproute2-4.13.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.1.11.1.ebuild b/net-firewall/shorewall/shorewall-5.1.11.1.ebuild
deleted file mode 100644
index 4e94df20e83a..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.11.1.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.1.10.2.ebuild b/net-firewall/shorewall/shorewall-5.1.12.1.ebuild
index 4e94df20e83a..4e94df20e83a 100644
--- a/net-firewall/shorewall/shorewall-5.1.10.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.12.1.ebuild
diff --git a/net-firewall/shorewall/shorewall-5.1.12.ebuild b/net-firewall/shorewall/shorewall-5.1.12.ebuild
deleted file mode 100644
index 4e94df20e83a..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.12.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild b/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
deleted file mode 100644
index f6ef8b56e58f..000000000000
--- a/net-firewall/shorewall/shorewall-5.1.9-r1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-4.4.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	if use ipv4 || use lite4; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-		local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-		local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-	fi
-
-	if use ipv6 || use lite6; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-		local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-		local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r1 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-		eapply "${FILESDIR}"/shorewall-add-iproute2-4.13.0+-support.patch
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r2 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r2 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		cd "${S}"/${MY_PN_INIT} || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		cd "${S}" || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		keepdir /var/lib/shorewall
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		keepdir /var/lib/shorewall6
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		keepdir /var/lib/shorewall-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		keepdir /var/lib/shorewall6-lite
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idp51151872"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f353fbed7e53..fb98a6214b1d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index e004361d5763..b7462edff8e4 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -29,4 +29,5 @@ EBUILD nfs-utils-2.2.1-r1.ebuild 5399 BLAKE2B a44119f006ec1123ea235478ad0425a5dd
 EBUILD nfs-utils-2.2.2_rc1-r1.ebuild 5378 BLAKE2B 8e5cd7e2de1546fd148a7c295c4ab9830e7c250dee1ee5862ae8501075bdf0abf894362cca6954b05d69e2149f781420e0084b9bfe90e2c8c8662810546cb0c8 SHA512 85326df8b59fd0bfe1d0b862fe9270704fc69e05183ce4f9662e8af12b9033681ad70593336b29e5050e2d0bf14f6721787b59c1927064a1c53bed88d2d8679c
 EBUILD nfs-utils-2.2.2_rc1_p20171107-r1.ebuild 5263 BLAKE2B 9edaccda54726385d778c22cf70c13e7532ba1c49ef7593dc0aec5e17376ca3bca0732a1a8182e753791313426c1c838d8e47baeba2bd904a0439c4154660a07 SHA512 043e4a3d76bf7e51d4199c566ac2dde2567715f24af27354672263d68572b500a8a1adaf34dfd6572fe833181761d8e9b84db0edf15e9b7a7bc1995961eb2d10
 EBUILD nfs-utils-2.3.1-r1.ebuild 5440 BLAKE2B aba69b2b931c7414d6ec266b6bc6bb38d105e0006c85c3ca66289d6e0dd10a5a229ca2516a75186fc1b82f3c8fc4b457010f34da42be90cfffa067efbaa785e1 SHA512 0774440f9e4d862122dd80d90d0d8b03d75e4cc2b898bf426c35fb5a80e19a237c682c040ffeda716c6335b4b7e57376d14f89825eca3410b591ec7112d1ca2f
+EBUILD nfs-utils-2.3.1-r2.ebuild 5239 BLAKE2B 5a56ef3d6a0053fbabea03d365e51cd36b0f0278f005a553b020a5e762a5dfb40499b736a10685eb2ba501a503d9d3fe855dc2d316e290a536437a5b45e48fd7 SHA512 9428a7e7bc57f29dd301cb9d5250f9404dc22539337576def77decc83b0964770d304917d035005050ca0356227aa1b41a660a0b629605b44b813bffa994adcc
 MISC metadata.xml 861 BLAKE2B 14c4f9e530e9c3a695f615d698f7a96d1252c14936849a846536790059c79f992c79246028b1945f496fda813891e1079ef0a6ad3411d18e0ee8ad9b6e0315c3 SHA512 21e7e63ddddda196f114b98b6ae2c67abe9cbabf91d60ab7877b34ed96e749c0ea167169c6ffa0502c80f993bbd2243db7bf544b304900a07d2b6c84141d1cf5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..97eb0f1a0911
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	inherit versionator
+	MY_PV="$(replace_all_version_separators -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND_COMMON="
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	"${FILESDIR}"/${P}-svcgssd_undefined_reference.patch #641912
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	local myeconfargs=(
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-systemd="$(systemd_get_systemunitdir)"
+		$(use_enable libmount libmount-mount)
+		$(use_with tcpd tcp-wrappers)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable ipv6)
+		$(use_enable caps)
+		$(use_enable uuid)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		--without-gssglue
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED%/}"/var/lib/nfs "${ED%/}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED%/}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED%/}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
+			ewarn "We have switched to upstream systemd unit files. Since"
+			ewarn "they got renamed, you should probably enable the new ones."
+			ewarn "You can run 'equery files nfs-utils | grep systemd'"
+			ewarn "to know what services you need to enable now."
+		fi
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index e220b05b3f30..11b7813eae6b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -21,20 +21,20 @@ DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e78524
 DIST samba-4.5.10.tar.gz 20989431 BLAKE2B 564d7c98dad101e74be1d54790abd3907b502ad1bdb7322be4853370dd6877a8f5604fec967555cf048978cbcb5a4ad111810657dcc8a58d0cea2843dfcd29ff SHA512 046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.15.tar.gz 21020181 BLAKE2B 0d113c4d3147102e2cc192a14d145c46930b8f772683bc27e90b264e43c5660298e468c494de41e80fb2dcd80a0dbef0b9ce1f74dc9e89eca52865ceba605382 SHA512 e77d746767d55ff933cddbb4d6e0f97f0b12e630c564852bee02f5f9764633167f1c098df7606af2a1930a9bdd4665fb79d7748ff07532db4e9a581fb639450c
-DIST samba-4.6.11.tar.gz 21157318 BLAKE2B 7784b898fdf5bf96f3d0b0d3786be20aab55b05a76f4ccafe77c8882aa980e74a39a8747ef68d80965010c6bc316e3c271c942594a8874801f9358721c8fdbe9 SHA512 8acb0620cc7fa87692edfa1b42883384b1ae88c6b9d75432169d53c1c6f20415ed4980b2ba9d023cc69a8a1b457bcb25ecea9bdf427accfe9fc05431c3480283
 DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b26bf8c039619359b789e675f963aec044e11443a8f6a865ea8564d58fe12d5268f00d71c9544e1abd27e9647f7 SHA512 e45a6ee43bcb2fba224bf38771d30daace46ad92b05f580a261aaacf7de9eca3d71cb4f4b2f956d83d84df489cb6f015b3b7abb42702ed2936bf92faa945340c
+DIST samba-4.6.13.tar.gz 21160952 BLAKE2B 6d7927f00c8d013f8ce702168f5810fb112b0e89f3e298178d6e7bf98f0cb8182e54eb9efe2b74c41d16af751ced0a536e08c93b0527c5c88502b7e1f908042b SHA512 bc6ef2558cbdd3d093f5d29e5a79b069b6a4dabdad4becaf0010514c5d67646f5e6ec8d8dbefa1e6ba7891b3e0eb728bcb91522ba910947f90841437b9fe7dda
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
 DIST samba-4.7.5.tar.gz 16862398 BLAKE2B dd5fc044e70483dc04e423ee8221afaeb90b1bfaf4ace434000b89d28248b4d9c73a11c15acca31e4b81d27b89f789b59de3da4e27faa4fa5eb025cde112e824 SHA512 1cd70ebbe59e467701e6607147d19492c3fdad99371aa182ded9e4e2f37a53c76c04e796725bd747e5e1fb882bfb73d82a0d26f25de5ef135266d33be9f7fb61
-DIST samba-4.8.0rc2.tar.gz 17619396 BLAKE2B 3fc9a7f696df012ba1e1c9d131d650aaec27296b50a2a56d7941b066d164252b34bf9dad3119bb4f99b5a09eb11501a39bfb23d64e33c72e245fa825b418b573 SHA512 215c093b2144a858e646a075eeabfdd90790c7e6eeaed39cede98b254a68fc74dd93e3be314659d60437cbcdfc604b74f3b7faa75088bcf858e23a4a34dfb105
+DIST samba-4.8.0rc3.tar.gz 17647231 BLAKE2B 6e5ad34cf9bb459f02bfefa02b070d3062ad8299b1e58d9e19648f8fcc62025aec00bc34fa8597231874a9c79b777de07733acba8477ae4bdb9c0432e6017ff7 SHA512 03df9131f171fb78d5f09ec5b1b68982c0f88699e6913cd9024df3a7e35fe91ba7172735c3a3f37e5287c89a74620b28147ebee67778b90bac2cd8efdbb85579
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
 EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e
 EBUILD samba-4.5.15.ebuild 8077 BLAKE2B a37b8af2f093ad59e8a9e8368504e1c308a3f8e48dea0486eea3d7a5d1a76bc746cfedd2cc450c81ca99b3e06ad3cfebe6ea32a6674ef1cb176d57f90e9ed815 SHA512 5bb13acbec1f4105bd0a383eaad0c110033aeb55b22b54d6ea5e1cebca0d551e80ed3b826b46b6e46516eeb32d94ed38544d7b94d4f9f2c06c966bb87a1d134a
-EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
-EBUILD samba-4.7.4.ebuild 8659 BLAKE2B 91e4f49ec36cf05e9c316e945beabc27deb63c696e2e047b7a07d35ea177019edbba5b49cf755aac7a17cd50ea63662a6beb73270cffab98325423a6115a2de4 SHA512 2308064a16a9e250d839e5e7abf5fcf46fb488d9fb9b4877c835c75ce399a0597f2af3c00c1806fd4521d8d9ef2084c199bc49e9a9688f9b2735b1d195a9b457
-EBUILD samba-4.7.5.ebuild 8613 BLAKE2B 739244d4d2c06fdd0db31b3690c69babb28cdc74a443d48a187c051577f036a0800f30973ae2808ab7057e896fadd1a490345c7eb5bc4af179c6f008fd7b0014 SHA512 1ef26b480618a0ae38bc63c36fe3706e716f395dc8f67198bc1dc2d14c63472b51f7986e116cea1a702f41f85647a9c4dfc8d4e865e200d3ea5157d968131b2a
-EBUILD samba-4.8.0_rc2.ebuild 8223 BLAKE2B f0ffd0cf3f0ea82f95c10c0dbbbdd023d8b2bd061c1755f2eb97fdbe362d3c8dd24d58aa8183333539bd2310758bbd97ad4f9b7a6122295bad20eeafff80ea79 SHA512 5f3725cf4ad9b80df6039216ad0c1ffa6c8eb0220508615f81693c47717ba6b329d57e95b3c72d730096cec3244d7d301fca307db9621dd2c0ccb44598affa8a
+EBUILD samba-4.6.13.ebuild 8598 BLAKE2B 0a65164727671d2b354aaea1ee2e5a52e5f79578311ec6eff7084aaa5203c137bd2fffd74c8aebd7bd521e4445ad694d0f582014890f67fa0d76042bc92b2a4c SHA512 dfd1ada0fa469758a020df2d8f809392435161317a973f3238a525d0b7bb1bd8b616789895a9c29d403f230de20691ad8fef947cd1ae0aa158731ae8d07c21a6
+EBUILD samba-4.7.4.ebuild 8679 BLAKE2B b30fd404a691591979e9036b4d134c8e6773fef3c475ee1dfd2e9ea829d83853b52f3f587a22456ef5c6fdaec86bbc62f136a01335e08825d51d17b9c438fe61 SHA512 aa49e259e6b863c66596e80dc3c561542452bd27a7692ba64478c133734d83b62d764949d09fddaf12f84bfa69eb9db43a62d827cb7d070bf809712af10d32af
+EBUILD samba-4.7.5.ebuild 8633 BLAKE2B 05750e87f1128adaf53bd8bd3df7dd84e7a78ca1e812f0bcbedf2bb43ec16ea0a7ded6d509660755c820d037d9dc1cfe50443a41af7034c7454419992846c385 SHA512 1cf04d30e69908d4c006c7653d3b955aad1413056f89f4e4795c438367fce09dfe6298c6d0e1f6676edc1160b0a5287dd5789474af46ac8132b863606eca9c49
+EBUILD samba-4.8.0_rc3.ebuild 8243 BLAKE2B 7defaaa97e2e731333cc7eab4bfe9a477312b090fee299e0f8bbe4529e9450a804247db547ec524de8f4022bfd2144f3fdf59c56af1fad5f22a1138524358659 SHA512 05ddf008b70bf04d027685ab543c645cc0dc694183a4f9e6eec995b0de4532024349696730b5d9567fa0e2c1e62087b46ea246a4aec492ddc9351c6fcf9bff11
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.6.11.ebuild b/net-fs/samba/samba-4.6.11.ebuild
deleted file mode 100644
index 89f52e0eaf41..000000000000
--- a/net-fs/samba/samba-4.6.11.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
-	test? ( python )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the patches from tarball(s)
-	eapply "${WORKDIR}/patches"
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_enable ceph cephfs)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with debug lttng)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex python '' '--disable-python')
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--disable-cephfs
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			$(use_with debug lttng)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.6.13.ebuild b/net-fs/samba/samba-4.6.13.ebuild
new file mode 100644
index 000000000000..ff66041de150
--- /dev/null
+++ b/net-fs/samba/samba-4.6.13.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches"
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(use_enable ceph cephfs)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with debug lttng)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_with gpg gpgme)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex python '' '--disable-python')
+			$(usex test '--enable-selftest' '')
+			$(use_enable zeroconf avahi)
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--disable-cephfs
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--without-gpgme
+			--disable-iprint
+			$(use_with ldap)
+			$(use_with debug lttng)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
index 477428fd681a..791413f4a91c 100644
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -83,7 +83,7 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
-	net-libs/libtirpc
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
 	|| (
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
diff --git a/net-fs/samba/samba-4.7.5.ebuild b/net-fs/samba/samba-4.7.5.ebuild
index 981e4b7d1549..ae147981edc7 100644
--- a/net-fs/samba/samba-4.7.5.ebuild
+++ b/net-fs/samba/samba-4.7.5.ebuild
@@ -83,7 +83,7 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
-	net-libs/libtirpc
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
 	|| (
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
diff --git a/net-fs/samba/samba-4.8.0_rc2.ebuild b/net-fs/samba/samba-4.8.0_rc2.ebuild
deleted file mode 100644
index f0c7f58ce66a..000000000000
--- a/net-fs/samba/samba-4.8.0_rc2.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.35[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls )
-	test? ( python )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.0_rc3.ebuild b/net-fs/samba/samba-4.8.0_rc3.ebuild
new file mode 100644
index 000000000000..5f0c42ef44e4
--- /dev/null
+++ b/net-fs/samba/samba-4.8.0_rc3.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.35[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 44670955ee27..14e4a3f5da80 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/qshare/Manifest b/net-ftp/qshare/Manifest
deleted file mode 100644
index 9bbd5579b553..000000000000
--- a/net-ftp/qshare/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qshare-2.1.5-desktop.patch 758 BLAKE2B 5cb91758f6a9dea358b8348050346e4c45981537bb3e412c6f53c23f4470b43cfa70ceab12c879b29abde9243f73fc5e6f52763748d2870598c54a660e2999f1 SHA512 eb4ee8b9ee6004afbfa5601f9205b9712e1c68f656d5671b3e00ae1e361aa6d9fad2469a47f3d80f4035c088c8e0fc130da1707bfb26990bb629b72ee51709a2
-DIST qshare-2.1.5-src.tar.bz2 770556 BLAKE2B 3acdd8126963760b35e959e65158f074311d5fb82925cd9dbf1e91295e62ee3c72ee1146bd1cc4f7975e7ada7752b94eae28e32fe1be1d88178bd0b6da4ded89 SHA512 5d1ca2ffaf93d1136a2549cb4b7525f4990182a53dbff0752d60c2d24b4022f4082d39c8df2758d97e3830bc59033da9018a80474f52dd83245a8830ec3b4c1f
-EBUILD qshare-2.1.5-r1.ebuild 521 BLAKE2B 9634f0a95201710cf1f97652b873abd882e1e91b35bcc7fa35277f91e9c70d58cd325eb579150b290f321f3a380071a5a172b3bcd04a556f6cd613f903bc5da4 SHA512 86b9d9d4d3f0e9ce6a551a5c6a01a3a32583aed5ca318808d8998bf85bd0b4f50728eeabda27f88d2254350c28ed02f21a6ffe0ac94bbe5f400cc013b8950062
-MISC metadata.xml 243 BLAKE2B 62402a9efa915237fe628c64d7f86b5f50b86761152a67e78115054ff61475d1ae71ee62e9922abca7db47c89488a99b8c8162cd79683e0a69540e946f8fec0a SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b
diff --git a/net-ftp/qshare/files/qshare-2.1.5-desktop.patch b/net-ftp/qshare/files/qshare-2.1.5-desktop.patch
deleted file mode 100644
index 1c18e85e8db1..000000000000
--- a/net-ftp/qshare/files/qshare-2.1.5-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gentoo bug #457712.
-
-Index: distrib/linux/qshare.desktop
-===================================================================
---- distrib/linux/qshare.desktop	(revision 90)
-+++ distrib/linux/qshare.desktop	(working copy)
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Comment=Desktop FTP server without any configuration
--Comment[ru_RU]Графический FTP-сервер без конфигурирования
--Comment[uk_UA]Графічний FTP-сервер без конфігурування
-+Comment[ru_RU]=Графический FTP-сервер без конфигурирования
-+Comment[uk_UA]=Графічний FTP-сервер без конфігурування
- Exec=qshare
- GenericName=Personal FTP server
- GenericName[fr]=Serveur FTP personnel
diff --git a/net-ftp/qshare/metadata.xml b/net-ftp/qshare/metadata.xml
deleted file mode 100644
index 32fe1293e9a9..000000000000
--- a/net-ftp/qshare/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>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-ftp/qshare/qshare-2.1.5-r1.ebuild b/net-ftp/qshare/qshare-2.1.5-r1.ebuild
deleted file mode 100644
index 774b89db7b79..000000000000
--- a/net-ftp/qshare/qshare-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="FTP server with a service discovery feature"
-HOMEPAGE="http://www.zuzuf.net/qshare/"
-SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	net-dns/avahi[mdnsresponder-compat]"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README )
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
diff --git a/net-ftp/scythia/Manifest b/net-ftp/scythia/Manifest
deleted file mode 100644
index 45c377055813..000000000000
--- a/net-ftp/scythia/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scythia_0.9.3-2-src.tar.gz 407388 BLAKE2B 52c6005fed88779d855c2660afa03599d54bd77f18be973ad03e6aeee626459794c9cea05b8013052680d8d04b4071579a0f944ebfdbe3312b8c8e3cbed528d8 SHA512 48ca7640da8ccbcdfea20427b153692e0a276acef7ca3b5abb08fe0ef886cb5486815dafd83d1f45f98a4d1723303713480c048a2b49b37d298808c95a0be786
-EBUILD scythia-0.9.3_p2.ebuild 694 BLAKE2B fa60a805136fb7da0c20c2314a19ed821bba08fdf7ad07f76175b15651d31fb1e4e04f3c9d1c7f7d6abeb24fdcd013c7a3afc37149a5f04c3191d690b2dc022d SHA512 1e3ef1ccee3ff3813ad6a45e1b67889cfab11bc2aae15bcfdf8c26179a28ab40f6420a610ae4ad9beefa6dd763009862febeb38a4a4c1f900d7f95535622ce3a
-MISC metadata.xml 253 BLAKE2B 135681de74058b17bbf3526a1ba19e1536ef15e29c9088d5e5981a23a5aec6c46304882a43f00d9ed963af78aeb9c9f5f4eed7339dda4bd9eb10583ed6451aee SHA512 5417d2869e029c2e156185a3263bef4e78109b9306575cfcf072105a61ad2f75ee7bc6401db3564c1ae5c7630aadf551e09234b4448cd64341380f687ee47436
diff --git a/net-ftp/scythia/metadata.xml b/net-ftp/scythia/metadata.xml
deleted file mode 100644
index a7f1abb3029b..000000000000
--- a/net-ftp/scythia/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>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-ftp/scythia/scythia-0.9.3_p2.ebuild b/net-ftp/scythia/scythia-0.9.3_p2.ebuild
deleted file mode 100644
index 31d38020de70..000000000000
--- a/net-ftp/scythia/scythia-0.9.3_p2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils qt4-r2
-
-DESCRIPTION="Just a small FTP client"
-HOMEPAGE="http://scythia.free.fr/"
-SRC_URI="http://scythia.free.fr/wp-content/${PN}_${PV/_p/-}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i \
-		-e 's:/usr/share/applnk/Internet:/usr/share/applications:g' \
-		-e "s:scythia/html:${PF}/html:" \
-		scythia.pro || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 063e583565fd..47d0a282c1ad 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 49e9f09ddfb6..6207863bb12e 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,4 +1,6 @@
 DIST ii-1.7.tar.gz 10174 BLAKE2B 93af2dc182d77dbfca65cbee6c40aedabe9166be7abcb03c87e80e74273dea1e4dd875d86cf0e1dd04b4a10bfcd825ea9a8c109badb72cc877a484bdaea705d9 SHA512 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90
+DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
 EBUILD ii-1.7-r1.ebuild 740 BLAKE2B 2792190b5c90b7cefb8eaa1625c82ab68f5b66545e2a372337fa364c94d16d7a49557e5b0843c1ddba571d5822ec6ec33b2ab11b18d7b4415a2970531a9940c4 SHA512 a4ebf245df4485a7fc9ae75ebfa726b84d924640054a55f6fe79ee5f9224d06ff765033bd89bd4e248242b1afaab0a268f66547f78b9816b54b2cb1df5bb24df
+EBUILD ii-1.8.ebuild 678 BLAKE2B 0e47f78c625fb72afa497779f3b8736f5e3fd9a59da37dddad723719081416b52ba70893a9c473edf5b1b8890f4d1da734a88edc09d12d7763c27b484755b865 SHA512 bbcfce23940913d2cbba027c70d747f4df5641054999dd8fade6ec300fb8bca82791d748ae8fafbbda04bfdee52b8fe10045fbe7053748672e7ee8875206db0d
 EBUILD ii-9999.ebuild 653 BLAKE2B bcefb912baa5b9f4484e9ae25db6561e141a7ce10d80cb673d655cfaaa637d90ec087a82943df8040115a9b7b2984bbbbd6a937df8ac89118c7cf8501441ebe4 SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild
new file mode 100644
index 000000000000..0a4bb49da753
--- /dev/null
+++ b/net-irc/ii/ii-1.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="https://tools.suckless.org/ii/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ii
+	dodoc CHANGES FAQ README
+	doman *.1
+}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 1ad4afae5514..7f08230a7d34 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,8 @@
 DIST kvirc-5.0_pre20171001143427.tar.gz 6035319 BLAKE2B 764b079b2d991f3b80b48eaf4119ac9cbfef3429d97e990fdc9c95a23561d3efc553c876a8eac17465cf14533f3230af24695f834dd985d73f89d45103457eb2 SHA512 ccf9b032737ce24cc98c23f3e1363b7ad874452837805b9a240dfd0d5e067da556dcd6003398f3cb2826f144656540592189e7f88d68608d6fbb2e8294535640
 DIST kvirc-5.0_pre20171211100641.tar.gz 6035018 BLAKE2B 0da30cbd0ac7443b994f4f8f4b8b39255219d99a34dd026cc59d119bec11985e261f281928f817ffe0865427a2f59b2a25abbe20d9d4a391086c26c507f83074 SHA512 599ea40faac97ad0604e29fe8f77a92f36a9f52fdee118dead712e1cea8d03d2b2791cb121dcd7efd39d5719e9133ff79e45ea1ffefa5886b0b11709ae41f814
+DIST kvirc-5.0_pre20180209140255.tar.gz 6035048 BLAKE2B 1141fb73b2498f931b8e2b28368cbae8b94d6268e2f5548e38f5a5a6c0776a9ffe4c7c2d5139eda7166c1cae73fb61ebc894cc085ec1ad20edc1f53136a21492 SHA512 c9dc3d257dcb9446c91be07d490fc76418eaaa93bd133dfec5b659949baae68383e04cbfbab9624db8bf6f1908fd93a190a74f95b6d1b929a75739c3032f82e6
 EBUILD kvirc-5.0_pre20171001143427.ebuild 3846 BLAKE2B eb9572bdde0e10d7758987cf8b8f047499c1143b90e317d7b67b0a22cc6bcf76a04f8fb032e1a63a0fa18ae31d9deb641498869a22cf75431cb0f24af9418f71 SHA512 7986bde6410f1125c28cc05899ce155a9614b3ebba0fc4402035ef80868dc25c1a62be4f9685aea4a0f7ea7eb2e36a78abaff68167be908c3126afcf748d8122
-EBUILD kvirc-5.0_pre20171211100641.ebuild 3848 BLAKE2B 4d92b5b08e73212a6d7b9db307f2437bb8b64a09cb4dfd42a0154c1b9fa44c545067f6878011723bdb0a34f4d2853664634bd787e34a869e44fa942d621b4235 SHA512 52ab91786f1729461563a2bd6d5a31bc216c219c99bc8fae1ba21805142cf37a71db0051144281619c3a27c33dfab93b3b058a63bdd3630f40a6259c0bf0e68c
+EBUILD kvirc-5.0_pre20171211100641.ebuild 3846 BLAKE2B aa287984c675d7a17f14ff03a118e4ee2378a826f81f309065b33c4583b83d5a3e441b44dbd9d0eefeea5c4b46044b8b02a8bc0040dca6be30f2226ec18b3756 SHA512 f714f2c7646f85bb4f8aa9125e4651e44b47bb09c045d6078d36cee356ff26023916646c584100fb3040e72964532dbb6b0ae93c39ee2228725afaa7644e17e3
+EBUILD kvirc-5.0_pre20180209140255.ebuild 3848 BLAKE2B 413a8018c510a1376b20c10794f487c3297b1d276e4df62c23fd5f1db431d22602812f9cd63b86901196c31554f1021c948e24e9c70401ae8d83afbc73b1cf05 SHA512 ae73c3b629f2c80afeac60e0cefec0eac5510d80bf07f092a9a10b6813c0566461dd1efaa30d3c104e6c2663566d04022039f803e3083db3cc39abd614869cd8
 EBUILD kvirc-9999.ebuild 3785 BLAKE2B aa2a973fd69e83e8ae14f51a5a7ffc2048428f72618b9171c486bb9c6cad565460efce1b0e076f07f38d3881d4733e0884e2ebec6c28c6bd9e2d266fcaf98594 SHA512 c867319c4d13c8a88a6fb1eb9076340542372e763441bcef5c3ac4f99a77b8c786eac38b5b91c2667322fbf6e923e545ad29373cd783f7a148e1f05d6ea5aa0b
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20171211100641.ebuild b/net-irc/kvirc/kvirc-5.0_pre20171211100641.ebuild
index 63671c3838c0..6a024dd1f62e 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20171211100641.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20171211100641.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="5"
@@ -30,7 +30,7 @@ fi
 
 LICENSE="kvirc"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180209140255.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180209140255.ebuild
new file mode 100644
index 000000000000..70bb052ba4a0
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20180209140255.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION="bed7de9c146055237f62b6dfcf6d68f04b2049dd"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS=(ChangeLog doc/FAQ)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=yes
+		-DWANT_VERBOSE=yes
+
+		-DWANT_CRYPT=yes
+		-DWANT_DCC_VOICE=yes
+		-DWANT_IPC=yes
+		-DWANT_IPV6=yes
+		-DWANT_TRANSPARENCY=yes
+
+		-DWANT_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc_video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
+		-DWANT_QTWEBKIT=$(usex webkit)
+		-DWANT_SPELLCHECKER=$(usex spell)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=no
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e8004793a24e..bf64b39de2dc 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmediawiki/Manifest b/net-libs/libmediawiki/Manifest
index 2f0e602392e5..96232a2d8b10 100644
--- a/net-libs/libmediawiki/Manifest
+++ b/net-libs/libmediawiki/Manifest
@@ -2,5 +2,5 @@ AUX libmediawiki-5.0.0_pre20170128-tests-optional.patch 470 BLAKE2B 856433e48d50
 DIST libmediawiki-5.0.0_pre20170128.tar.xz 54888 BLAKE2B ec048f6ef2d2f1529e0f3f3f0eb976adbd39fa261020f03330eb4e4772024e40aa0aac299a2b2c8f6ad054443358294bfe96f072b95cb7679ccbfccfb8b81b12 SHA512 325cb89939e56698a805c63226ca6bf6abc8a673f11a7aaafb5e698f3c1f4014e29c2fb96e7ef6c84cffa7668835c41dfeb4c61b8fbdefe273d54751da87ca01
 DIST libmediawiki-5.37.0.tar.xz 55188 BLAKE2B d04ea7dc346792c49009b382fd774ad9573e70cb52599caa57ac3f0dcfac93c0569a42cc54e11ba185e80fc2a5847d6a6f6c81adda9907c87dd3f7459771da3c SHA512 5efcd30782c8d54cddad51c6a96065f2942529e89facfd1c3a71af343a898858db02fa95dd0af0161b3e13aee6a9a373a0a641ce64e128c7282cbf3770db6993
 EBUILD libmediawiki-5.0.0_pre20170128.ebuild 516 BLAKE2B 8f42e6ad3f24ac1594568e5fe87a4771d9cbf4b89846e6ed15899c108accaf5d7f8435a54f087e455524ed6dcd0a1cd27935b1b28d9398ff0c9f5ced0c1676b5 SHA512 9facb1f2043047ca2f0dabb2fddaa31187990fac7278e91739eabeebdbbaf228bf2e8a49f3d320e3ecf6b38885841593d134bb9246ed3b42f4e865d6dd6905cf
-EBUILD libmediawiki-5.37.0.ebuild 531 BLAKE2B 6dbdac2451a377f1b3210bc40fe4cf1a24df1a055ace5506dca260432705895fe62b12376747930a80b51c0d110e580c95231f7a67cf9406c0fff810d8cfa354 SHA512 495c7a10d2fa24bef7ec5ca8bcee2ee78640d05130bd03978284ed35e077e207db57ea0c0d04ff43506172ed086f040e98527adb43f8dc77e677b73797e8234b
+EBUILD libmediawiki-5.37.0.ebuild 670 BLAKE2B 33161c719b76fd577010200ecdb03b5b372f648f6e905cc75f8c925c93fdf20b83592720b9be479a48e13b25eb54d5c27c48e25ac9bb1a2d0d40ff67929fc2bb SHA512 02909e995bdea760da9afb00a62d0e19bb8d61c5941e4612dcc9380cc099b0e0a37dc5c65daff42d4a67ba798b430e5f0207a9b99aaa4c9a7902c0a555112681
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild b/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild
index c85aba403a0f..0b4cee2e06fe 100644
--- a/net-libs/libmediawiki/libmediawiki-5.37.0.ebuild
+++ b/net-libs/libmediawiki/libmediawiki-5.37.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
@@ -22,3 +22,12 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.0.0_pre20170128-tests-optional.patch" )
+
+src_test() {
+	# bug 646808
+	local myctestargs=(
+		-j1
+		-E "(libmediawiki-logintest|libmediawiki-queryimageinfotest)"
+	)
+	kde5_src_test
+}
diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
index 3982b553ac5b..1a82dab6280d 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -1,7 +1,7 @@
 AUX libosmocore-0.6.0-automake-1.13.patch 245 BLAKE2B 776b88a297b1ad6edaaff357bfc52f5f219b1372c428cc095ea415d4e91b89bbd2d1dad83a893d3c46cfb4e9716f7ec4296bf06f07bc731f752e99d88cd1e4c5 SHA512 be6ad33f91009e6a38d02deafcb69e4e6d88e7436531ddee822b461d95263609b9a6983d7f523cc6d7f97fb8794f32b1b15f9afe1f784bee907ad48535091e1f
-DIST libosmocore-0.6.6.tar.bz2 396707 BLAKE2B 087036c4c0e583d1c071292bb4cbd659c44560d193c9cf82a3ed11a952c0fb6cd9b5c996ae9083aeb25dd4ff6feb9607634703a391eba3730513fc0948e372af SHA512 d0b2a4f0efb8c364a3c3da8cd888a30eb19f193ae13e9ecbb7126b33dd18c2c23a19672866efc365cdc49b0a971ce87d828ec3fbf7e0df4f4d6ff5f3e32a9c17
+DIST libosmocore-0.10.2.tar.bz2 646555 BLAKE2B 62dbabdbb8a397662b618863aade394ef4638dd266e059ef4c6fa54364aba60db29cce1fc6c2692af095f32b3ce186ee5b788598595fe2128f0d04caad9d83d2 SHA512 a42db3467faec9c814efe40ae8cf4a41e610b97cac04c1da30c211f116e1f7907117aaab89aca8af3dcd8aedc2be73c9e1c194b9062d33856de02feddf4bda22
 DIST libosmocore-0.8.0.tar.bz2 439320 BLAKE2B 2614ddb8a1f7a0a72bae888d601264d90836daf2067716f2a264f0632699929db9b0a3d3f353629c08aaaecc84f429d6fa2c36481c8bd27ecb078f4447c937c8 SHA512 4ffd5943807440f80f70e381e477631a592fef41a3485819d94e7ce9523785e20057759aec6cac7abe57ba21b7d48e38164b7272c5bcd89882a3a8e213d89361
-EBUILD libosmocore-0.6.6.ebuild 872 BLAKE2B 21025386eded765c37aa6bdf27a790fd55e151a82f57127dc18b79b4fe2c209dea6106cff5c4944aa0c91f8cc34a94ce45ffb899a465a688aea933983d1fa432 SHA512 f36dca7fdc6191bf8c00b24892b544f83be0dae78dbce8505ec9f3dc0493b15af94e300f0174f3d8ce74a7d4f7c61819674accaf4a3405458c0f5ee5eb9ba721
+EBUILD libosmocore-0.10.2.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
 EBUILD libosmocore-0.8.0.ebuild 1072 BLAKE2B 345c0dcc9366551db87ced603a17ba986680e4da4a7f7ab75a039be268a6926bb8096a20f981c50789e2abf539fd166c5016d3e65cdc25d1c14c28153c48ffc8 SHA512 05f3d6e1d672e9b4bf259a4c4c0523d25d5eff267a93b504b23a96fa1d3ac60b690d9abbb2d2c0151171a646a46a82fe08873e9b705ff41bfa3d859ec8bf6206
-EBUILD libosmocore-9999.ebuild 1072 BLAKE2B 345c0dcc9366551db87ced603a17ba986680e4da4a7f7ab75a039be268a6926bb8096a20f981c50789e2abf539fd166c5016d3e65cdc25d1c14c28153c48ffc8 SHA512 05f3d6e1d672e9b4bf259a4c4c0523d25d5eff267a93b504b23a96fa1d3ac60b690d9abbb2d2c0151171a646a46a82fe08873e9b705ff41bfa3d859ec8bf6206
+EBUILD libosmocore-9999.ebuild 906 BLAKE2B 17533a7fba36cf814bde7fb4a6407e919b6f85773dd830013f3e7d11675db8d4d128448755357b2212dbf1db7143c638b1d3e98172b09189a22c6b2f9b44f42e SHA512 21fca38c83177653078fc20df1ae876ce6f91d2e6e3e7e726cd3cc68c5e3248fa9270a64ff9ed03a741f1d933448083b1a566877128ab9effb2b571b264b7ef3
 MISC metadata.xml 432 BLAKE2B 955701be1bdd728ec1ff6851f1bb84c281a65c63a28c47e4a4328794e26381ec709cbd9dbb2b99f3bdcaaf77793c849b5d30a232edfe5a7866b3b4b927860ddd SHA512 3b4c9d8e510a658b9e1d5ea30042a45aefcd128429d45665b152b238b216bdd8a245479c54ef0842fda7937830b38d33cef6e12b802b7ce525ced80d38951157
diff --git a/net-libs/libosmocore/libosmocore-0.10.2.ebuild b/net-libs/libosmocore/libosmocore-0.10.2.ebuild
new file mode 100644
index 000000000000..fbd3f9ee9b99
--- /dev/null
+++ b/net-libs/libosmocore/libosmocore-0.10.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+IUSE="pcsc-lite"
+
+RDEPEND="
+	sys-libs/talloc
+	pcsc-lite? ( sys-apps/pcsc-lite )
+"
+
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
+
+src_prepare() {
+	default_src_prepare
+	# set correct version in pkgconfig files
+	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcsc-lite pcsc)
+}
diff --git a/net-libs/libosmocore/libosmocore-0.6.6.ebuild b/net-libs/libosmocore/libosmocore-0.6.6.ebuild
deleted file mode 100644
index 5910efc66f2a..000000000000
--- a/net-libs/libosmocore/libosmocore-0.6.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="embedded"
-
-RDEPEND="embedded? ( sys-libs/talloc )"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-src_prepare() {
-	# set correct version in pkgconfig files
-	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-
-	epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable embedded)
-}
-
-src_install() {
-	default
-	# install to correct documentation directory
-	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
-}
diff --git a/net-libs/libosmocore/libosmocore-9999.ebuild b/net-libs/libosmocore/libosmocore-9999.ebuild
index ea57bb86c30e..fbd3f9ee9b99 100644
--- a/net-libs/libosmocore/libosmocore-9999.ebuild
+++ b/net-libs/libosmocore/libosmocore-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
 HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
@@ -19,29 +19,28 @@ fi
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
-IUSE="embedded pcsc-lite"
+IUSE="pcsc-lite"
+
+RDEPEND="
+	sys-libs/talloc
+	pcsc-lite? ( sys-apps/pcsc-lite )
+"
 
-RDEPEND="embedded? ( sys-libs/talloc )
-	pcsc-lite? ( sys-apps/pcsc-lite )"
 DEPEND="${RDEPEND}
-	app-doc/doxygen"
+	app-doc/doxygen
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
 
 src_prepare() {
+	default_src_prepare
 	# set correct version in pkgconfig files
 	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
 
-	epatch "${FILESDIR}"/${PN}-0.6.0-automake-1.13.patch
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable embedded) \
 		$(use_enable pcsc-lite pcsc)
 }
-
-src_install() {
-	default
-	# install to correct documentation directory
-	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
-}
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index f2672806aac7..6c4a38012975 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -2,6 +2,6 @@ DIST qxmpp-0.8.0.tar.gz 1115730 BLAKE2B 57ca5d5a9f2ce625e78572ef52210defbcdab8da
 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 1810 BLAKE2B ba6cdb9018c63d63371bf62a41bfc391a1c692637f15e8c9c308c400632206ce56ce0bcbf291a77da41cca82b104ac85b46aa8c59d6e6f5a2c3a49ad7bf410d6 SHA512 9ca034a48fe78c2ec2051703cc94ada28b191b0c62ea5d171926ced915013996f380be6ee4de37ebde2b8f34866762e3c871b2211d8d0b76e56a25ededea0f84
-EBUILD qxmpp-0.9.3-r2.ebuild 1817 BLAKE2B 2940ff875beccf601d933c25bac8c3ef9f6f1749e22ee5acad30363e8a6332f11fc7c16dc222b89e457f6ed7f07c4a58a487cc3af6acb5ae4d27ef4adff2dc2c SHA512 b31e554f049fa4ed46ea17bfa453d1c9ab11287bef69aa5996ff1220b6542792e1a684bcf6d9e0747d4369139d4c15b3afdccf25fe959edf29d9152fc8e771be
+EBUILD qxmpp-0.9.3-r2.ebuild 1816 BLAKE2B c56fc7d8fb942154464b35635d1e177414683a53660fe4cefd482644557b5abc840ab714558c88c16ee94175655de5b27cdddcfcd0bea96eeef12d9a4401828c SHA512 c155d0c0eeea45b4484f0bc327e0879263bf16f278c5025fec5c50e57ce43a31b25db4d7669cb3de4ca53596cb423489902685d65af9b3d4a763f754bca69024
 EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a
 MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
index 6559c0669396..b903a6e427a6 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="debug doc opus +speex test theora vpx"
 
 RDEPEND="
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index cf57b8846205..780cb37c647e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index f721cedb039e..ed9f9f9d14ab 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,14 +1,6 @@
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
-DIST mu-0.9.15.tar.gz 2203193 BLAKE2B f639af3d851ba72605840ef969ff046ba59eba656d57be54f53b5d02fcb948989419972307dfbc60e66314ef3abfe9be379e094d72ffc4a836a0454846f6afc5 SHA512 36a0dcaa9b355c7a75f1d8c7730241ade979ec050e18f8609b840d6dff6befc96cf3fb649b8970649542724b2c20482099aaf9827b17a5e9618eb13cdda9c4b5
-DIST mu-0.9.16.tar.gz 2212969 BLAKE2B b56fe468ad1e077f7f66bdd0afb6e81f7ba500aaf55a867ea4b44f78f9b7f8d723905075515692da38918c3b7b89d3679e473774fe03efbea1210b3b75b954fd SHA512 8cf9b83aea287ee79b5160ed19e7dc6ef27f0784143b5eac9cf55d07b7718bc777624d752e0b407258b5078e998544d18dbb258a7eb03cafe55596f07a60d1f4
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
-DIST mu-0.9.9.6.tar.gz 2172349 BLAKE2B 371db6a38e7a099e5d4f16b097c450be608390ebcd2edf02f316f308c06b102999be24c1ab3f29975a9a153ee2443e4833f404e5613123b7ed4e3d27bead9f67 SHA512 0213033aa7599a5120c38a4b9ec018357ebd63a3c4828e0f9d7af41529dc1b001db8d506408b0341e0efe9835fbd21dbf23c836920c98ae2caabcb0cdc7dac2b
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
-DIST mu4e-manual-0.9.9.5.pdf 396250 BLAKE2B 83bcc3a5b70dc6480189a803748b530b7a3ba11187f418e45e81dc7e67501086ebccf82859600d123137901feede75270dbc1df9c59ce4020c4f75c2999e0a95 SHA512 ef9d36a1d9c7a397d89ce5a01072408165dc37b1cc7bb90658f35421cd0dfe28c8fa932cc602f5150c7947aa09c94a470924c98fcae3d9caa7d92fb1d47f7e7e
-EBUILD mu-0.9.15-r1.ebuild 2103 BLAKE2B 1e80b8a668e13b755dfc96e486ec4c50f78648ceb7c08d418cb69ca50d39d5265aaf5dc548efc65273b326ff13ab4df51ef96ab1f0f3bdca35663b1538b4d550 SHA512 31182b79ab81a3fb15a3abbd2a89465e071882e1aa7b3955270f46dbecf18c8f202bd8d37ac3ed46f5f4adc1218fbe715b587022879fc27b93c75a5c091cb9e9
-EBUILD mu-0.9.16.ebuild 2104 BLAKE2B c52e1a7b808c690448f0bc7b26246651ef96bb38a34c45896e3c0950723bef27581873ae2e8e5175e46725cec2944f6b2fbd654bee19c96ae21f99a5f02df1b0 SHA512 27d37bee83c7b8dd956e873da34fcf154ee54b8686a826ead1e28f4e1e135e665588e30e49bb13a0f4de6b1acb62012fd5c248c6503403214fc2df1b003c0208
-EBUILD mu-0.9.18-r1.ebuild 2126 BLAKE2B 85d3c9fd9d1ce59672e2ecace48ab272ced738100624edfda84111a055027c90b816eebe077fa6faf1c63b63b6ca5d6f58534f406f8559dad122d07aaee9326c SHA512 07f527eea48a74f0b260ee861c07deb51655eceea4acc2570a4be3da8ca259f89666624e78ab60bb846b69082a33c59e54813dd54d6e556e596336010536f525
-EBUILD mu-0.9.18-r2.ebuild 1968 BLAKE2B 3c3df8bf236e10a9485426b0c91d0f09c7d097352b3c81551d42618178f9169777346b03fa60e0445dbf929548b38a49661886d6929c579640b1d6ccd2830ffa SHA512 eb2cd179c7f59bebdb22afbd6c7436b440e45752c46bb19d09a52a345d7e4be02f6175049e66e095654777d3346243105e4a8214736886ffc0c1c93c77993940
-EBUILD mu-0.9.9.6.ebuild 2088 BLAKE2B aa98be00d833b5c8c0db5cedde29f87655bf9439875dc70b79f28039e485b50f31e52f87092eb2b436e93ff49656d361f78bcf627c9da66e34a1600e29f81473 SHA512 9ea907c47bb88e13f2437a5e76841d7aa619729f27027227643f562c06f396e3c3be82fca1f2f57314d1c435a8ed1d73b39653cc79dcc402629c60955848a33e
+EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-MISC metadata.xml 893 BLAKE2B 56022e2c549b0c8f2d11f4eb2ecbf92cf44f522c291e8cbe3b97969cec946180e2c70bc691891920ec3c82ef98a72938a837dc2e18f0c1897999b42ee0946070 SHA512 13013b9e11642092e1f3d2a9af64ed08fd52c9125be0ff3deeea5dfd2e54dfc2beaad9e96dac3da817e594e14f5cff9723e4b166dcdd667c427a6cf3d8aa6df5
+MISC metadata.xml 821 BLAKE2B fe40637ca5578df13dba58f8a526585025aadadbbbdb8192de5105cab2125dc86b1ec3eff4ee01dc1a301e3d02d7e9850ca3058f751ec911fcdba9dabe154ea2 SHA512 f0517130dac1c678752562d03178fe74588b34de0f9fa1a6b449a0d1d2de3c98fa80f4cd130b08ba7a4f01732a189888d8c2410ff364bed5203b6d10d5aa969a
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 7b72a85abe33..e8ae737901c9 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -14,7 +14,6 @@
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
 	</longdescription>
 	<use>
-		<flag name="gui">Build and install the experimental gui 'mug'.</flag>
 		<flag name="emacs">Install the mu4e mail client.</flag>
 	</use>
 	<upstream>
diff --git a/net-mail/mu/mu-0.9.15-r1.ebuild b/net-mail/mu/mu-0.9.15-r1.ebuild
deleted file mode 100644
index e6830778b4ca..000000000000
--- a/net-mail/mu/mu-0.9.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.16.ebuild b/net-mail/mu/mu-0.9.16.ebuild
deleted file mode 100644
index d6af3e33c345..000000000000
--- a/net-mail/mu/mu-0.9.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.18-r1.ebuild b/net-mail/mu/mu-0.9.18-r1.ebuild
deleted file mode 100644
index 0d23cc5c5d9a..000000000000
--- a/net-mail/mu/mu-0.9.18-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 288e651c506e..17815abc9802 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="emacs"
 
 # net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
diff --git a/net-mail/mu/mu-0.9.9.6.ebuild b/net-mail/mu/mu-0.9.9.6.ebuild
deleted file mode 100644
index 39345c09b4ea..000000000000
--- a/net-mail/mu/mu-0.9.9.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		doc? ( https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mu0/mu4e-manual-0.9.9.5.pdf )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc ; then
-		cp "${DISTDIR}"/mu4e-manual-0.9.9.5.pdf "${S}" || die
-	fi
-}
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	base_src_install
-	# Installing the guis is not supported by upstream
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS TODO README ChangeLog
-	if use doc; then
-		dodoc mu4e-manual-0.9.9.5.pdf
-	fi
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-src_test () {
-	emake check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d83f82525e43..564d77053124 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 0e64b1bb6803..6f169641732e 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,7 +6,7 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
 DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
-EBUILD dhcpcd-6.11.5.ebuild 3286 BLAKE2B 6f09e65d7dcb00af50d776da3ac69866ef931e846fa28c567b040a607148385d1718be9a321c623d05233a2ddf26f484c4e97362c5dac2cadf915de445a5c979 SHA512 f53e6833c9bd42b8347e9f497f639da2efcf5b44f69178df5a6728a35adb9838b935f8ed8eda8a754ef9b4b1ef17cb9e6fc9c89fd9f5974c2864cb6b9608fcc4
+EBUILD dhcpcd-6.11.5.ebuild 3285 BLAKE2B 14590d4a8a9e719919be8d47a163da84be0211bf60bd30f4abaf5291cee7e20854628dc8db66820a4bdd9397a94c3a0f110741ce46ad52c9812d1d597629e83a SHA512 d966c15bb465d092b4752488e52ec4d7a4da9024c45ffdfaef5035002ea81a3e009f4782c6f3ad89c868173231956c0470058b40ecfa665fbf837d1777c21c0a
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 EBUILD dhcpcd-7.0.1.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index d8e30661f774..1b5576761902 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -10,7 +10,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 84c5d7b83631..60973cb77685 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -5,11 +5,11 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.10.tar.gz 290282 BLAKE2B f36ea3572c53dc94646e09372dc0ad3bda6a3d13dbab2eb059e8ecfbb51ad663c2fb456f3365a1645d84e9865ecd397bf695e2f21def54e83ebdc00b0880e2aa SHA512 74bf49133cd123243c179e174cbaa7d2f74ca9fb47c80ca2c88b2e68ce8bca0a73709e51b3aac6bd85b8c70483b70f33e8a2424e7e0e5922397967330f7e2ecc
 DIST iperf-2.0.9.tar.gz 277702 BLAKE2B 6de23e43be0c14bce2379e699b1e25a8ac5ed80cdef1493167c80253cbefac3357dadb00c15d572c5e4213528d0e48b9242cd93b71dc367e22753243e56b2496 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2
 DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9
-DIST iperf-3.2.tar.gz 588723 BLAKE2B 41a57e82b931da250fbac50667f7632988a51455cf4a97326e55fdcfac2e24ee1f6a28218fe5cf4f9802f643a7fef9993d2e0c2a847fc0c1436f3c2f9b65632b SHA512 5c49bb832dd53956d15b0a9374b052a4e4e03c7c3b6e8c150001a7aba07b6ad5f8cd2b9ac2d9876981be0adf8b0396535ec9e021d58c8fe909a0f92743b4f855
 DIST iperf-3.3.tar.gz 592986 BLAKE2B 808e66a7e16d492c5602653b8a784e30ca65805e700d53555091fda0856cb64a6528a96025b5457f48df73561da7b64dd2fe7c21eafda04ce1b598e4582595f7 SHA512 f01f317f308301cc10abc6f592ba6e5172aa41d191d41927e2aa764210b8572126061d42c517ebda4b593a828ec545b1e04175f2f564999e124ad9a462acc342
+DIST iperf-3.4.tar.gz 595206 BLAKE2B 948b629178afadce3498f4665ee205dcb6033a1b410d00906da104de72d059e934ed74b69da11c149c88602a280a6d0b4097863ca5867cb197f90621fb619e19 SHA512 dacc1c02515d42276f810609eeeeb95c393222695e541917928f5373e4bc7033da93038a6ffa3898d00e39a47c6e4bdf02d08e39f429e9032f25912d723c71de
 EBUILD iperf-2.0.10.ebuild 701 BLAKE2B 6ae19ec54c963ebe5609c22370a80662e13db46e7750785da8b4087b7ba7fc8949df61ea8665b93cbf7bdfb6938f6aae57a8197af439a771b342bb303d65826e SHA512 7c2136a8ad639bbfc43929813ed43148daf6a3320ed729a2b41c464eb42f5f3eca6a5260654f21c132ac1190bfd0271fd8b5d3931f3d931ca2dbfb20750d785a
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
-EBUILD iperf-3.2.ebuild 913 BLAKE2B 63a3d14ffd7aa1f55550cf1f170ac8c10bf5de6d91c748def6db9bcfaea273eca5ab45ded01b3ac4a2c23815e6070b96bd358cf335a69672fd2a8ce5be0768a0 SHA512 423c1d6feb7a0c864f165393ee8325c39ed4f6a570e2651d1db52d1f211994dddfaaac82be87e4f3fd6df6141c83ed5a7dd689ddc437c8b4c973dbd8fe1b8e1a
 EBUILD iperf-3.3.ebuild 913 BLAKE2B 63a3d14ffd7aa1f55550cf1f170ac8c10bf5de6d91c748def6db9bcfaea273eca5ab45ded01b3ac4a2c23815e6070b96bd358cf335a69672fd2a8ce5be0768a0 SHA512 423c1d6feb7a0c864f165393ee8325c39ed4f6a570e2651d1db52d1f211994dddfaaac82be87e4f3fd6df6141c83ed5a7dd689ddc437c8b4c973dbd8fe1b8e1a
+EBUILD iperf-3.4.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
 MISC metadata.xml 406 BLAKE2B a76547cb9d2885900ccabe6c2549039abba6b7a4a0febd58038a088957817634e7340393f0f5c0b4cb655bf54f4ecb33232040aacd0bca3070d6ea48146f70ec SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17
diff --git a/net-misc/iperf/iperf-3.2.ebuild b/net-misc/iperf/iperf-3.2.ebuild
deleted file mode 100644
index 37399ff4a4d9..000000000000
--- a/net-misc/iperf/iperf-3.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 autotools eutils
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="sctp static-libs"
-
-DEPEND="sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	use sctp || export ac_cv_header_netinet_sctp_h=no
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	prune_libtool_files
-}
diff --git a/net-misc/iperf/iperf-3.4.ebuild b/net-misc/iperf/iperf-3.4.ebuild
new file mode 100644
index 000000000000..5943f9805db6
--- /dev/null
+++ b/net-misc/iperf/iperf-3.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 autotools eutils
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="sctp static-libs"
+
+DEPEND="sctp? ( net-misc/lksctp-tools )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	use sctp || export ac_cv_header_netinet_sctp_h=no
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	prune_libtool_files
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 8d10e57eafa8..d1413e11e27f 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -3,5 +3,6 @@ AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae10
 DIST kea-1.2.0.tar.gz 5720941 BLAKE2B c97e4fc18daddbbcba85fa35124290d926b9fa56c83d218b72da886bb3c03540e76ee1a0c1be5f01738b84b8a26f3a395f5b67b0cbc298e8a97cde0aba48a3f9 SHA512 d90571027edbce9eeb75d9ac889865dc24c2fd3ab17e44e23337ff623ca098ffd02560f01273da3c28f13734d95d5950110bc116bed527a295a9dc70addcc240
 DIST kea-1.3.0.tar.gz 5996560 BLAKE2B 2037aed1d72c8db58f6be88caa695956e482776571879f439d39dad909c1f79e4fa4353fef1eacf1135e763109f777a8a30500892a9ee1d8d261d3fd41f6257c SHA512 4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b
 EBUILD kea-1.2.0-r1.ebuild 1320 BLAKE2B 207afa1c8d7ba6d25a45168cb0255cd6bd9e65506bad1dd6cbfab9129e3417ccf630dd85aaae86ed3d1911f8954cd5b053e9ce8a9e229111d65d424c2d11459d SHA512 5148b065c65c7dcaa1e479831b20dd7c29020c36c0442854647b9a0e4d969f9c0bbf7aee805f95ba61945a4682bf519fe7a59bff66f80d7fb7ddcab8dad958ee
-EBUILD kea-1.3.0.ebuild 1320 BLAKE2B 207afa1c8d7ba6d25a45168cb0255cd6bd9e65506bad1dd6cbfab9129e3417ccf630dd85aaae86ed3d1911f8954cd5b053e9ce8a9e229111d65d424c2d11459d SHA512 5148b065c65c7dcaa1e479831b20dd7c29020c36c0442854647b9a0e4d969f9c0bbf7aee805f95ba61945a4682bf519fe7a59bff66f80d7fb7ddcab8dad958ee
+EBUILD kea-1.3.0.ebuild 1325 BLAKE2B 1ffdea5221ba73471253b50a1fcf1e6c974588f45e5df67ea04c11bb2e2207e9182e9277aabe1f547a4596c042b36782aad53af4c7b2c4d3337f9efbfdd5cad2 SHA512 b846b3b7c202bd05b4be60ea4d89142052f46ff1ef10bea4b04b8e70cf4160d34f6ca6a6d637b821e8803ba5c7fc393e2fd1b50e8d670e8deeea45526fc668b2
+EBUILD kea-9999.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.3.0.ebuild b/net-misc/kea/kea-1.3.0.ebuild
index b8c433491d4b..8b6b7de73e33 100644
--- a/net-misc/kea/kea-1.3.0.ebuild
+++ b/net-misc/kea/kea-1.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="openssl samples"
 
 DEPEND="
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
new file mode 100644
index 000000000000..b3312db88dd3
--- /dev/null
+++ b/net-misc/kea/kea-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="openssl samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	!openssl? ( dev-libs/botan:0= )
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = 9999* ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with openssl)
+		$(use_enable samples install-configurations)
+		--disable-static
+		--without-werror
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 6deb94643934..5cf5d42df78a 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,14 +7,10 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.4.33.tar.gz 389813 BLAKE2B 1dbee338c0cb3c9006c71e60353328dbabb8e7b576760ca3be617d94dd1b1b31ed027618008ee7e0e86716bb146c63bc89ef793f8299d6bcffa313e6c2af4b22 SHA512 00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136
 DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe87d1c8ed9acbc6e61cb8889604c6c2715e49556473a1b9215974150b0ccb03d5dbb7210108c87d8e67f19eaccbd87 SHA512 055d39d9d681adebb9a6a255bce5d550b61df0a1981f0105f8ffcc936e2053bca60360d755b65d79af836ba1ca71d4c739c67e20a2e0e7110ada183a7b0b63d6
-DIST memcached-1.5.1.tar.gz 407282 BLAKE2B cdaf384c10c28560acf97304fe97b39ed7b90110394bdbd913025ef239a45b04a273d7b322f1408a2b9b228c7371935b3024f6352909e35b3d247aa680744200 SHA512 686ad82f1fd73f683fa09930d4e14aa85bd8237106e39752c9676d31aa397db1687378c4ddfadf4591f7c623837cadf90e6643263aea78a80eb294683ed0dfbb
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
-DIST memcached-1.5.3.tar.gz 409131 BLAKE2B e54b364c19ab1ecc2b4d56b5a778d8542cf588155bd4c5f352bb5c9993e53017e75226cfa805f11e2727fc2ba5cccb39f91dff28a8c27dafb223694500f4565e SHA512 b28282c579891e7c5508eb5ab4680b933aa76e8e4a8fe575c996fd4e750f2b4b35ee734d01ae0f280cf4cf6e0530f7f6a95c2e07be3660b07c5ade6ad3c835e2
-DIST memcached-1.5.4.tar.gz 448831 BLAKE2B 721288bdc6184daf70817010074d6513b3fa189c86bde04afb61e7d8ac28f09e71eba0f819a0e0a96df26a938b8f94c3d047e85d93e43abb884cafdbaf54b323 SHA512 3154a2cad54d57f14bf9c07cfc6e4ed0bd6908f81642de9766d65c69b78bb36effb6221684b1e5f9e355fd8c64a0338aade3cb3bf36603d311c86bc94fe5d13d
+DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214e68ddfbd79afc9b71543227ee08279b5a7d1beb5da5f9b4f5ae6c9670979eba6259eb299510b80abcbfa29e362f SHA512 38883600398b5d9378bb57508ed94b80ed2c4ef0e2610e328a60bcb79268f85c67c99159993040b36eac964138822862fa78f62c649560abc4818233b1b2f3d0
 EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568
 EBUILD memcached-1.4.39.ebuild 2874 BLAKE2B b60878901f27e675361fbd99cce16cb29961ee5ae7a741bd94dd63fe5328d9787f8f48f1f509c7eac763969725bdd28a59ab7e220931c5a779c78edb7275647f SHA512 8bad575b3917d919ede30eaf5e19e45cf8ac717a104fe3789716fbd308c813be685175dc103d24ceeb46252ee51d3280250173bb2711daff7275454d19633502
-EBUILD memcached-1.5.1.ebuild 2891 BLAKE2B c2f9e6a542dd005b14a5ca43188b0c5895f5f2a383e7ba348206eb90cb47a7dd4386aa3bbbd54f84c3935565ea34bda1d338bc0622b60f516cb2a98d0077dc96 SHA512 48824a3a0c620f06b74a4903b0fd1d2df97700906855f4f86c4c80167c86516b4e2f48ff1d03155cab15796f482f5da9ccdd898c16cba5084e6dcab4a0e52726
 EBUILD memcached-1.5.2.ebuild 2883 BLAKE2B e2af9f55c4ccba675ec3abdd5312134d37f353a009ba2d99cc4ce6aad2d6e6bc16161f9a2e1610a8455074ba95b4864c06b1d77cb8edcfb27ced7d8f379afdd2 SHA512 08a70dd85f3748fc7c1c1d30a80388b104096f17932026604fc7d00d6f8b22c0d3db32948f25db65159f7ba3c57c0de722114e492561b401e8095c987defa39f
-EBUILD memcached-1.5.3-r1.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
-EBUILD memcached-1.5.4.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
+EBUILD memcached-1.5.5.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.1.ebuild b/net-misc/memcached/memcached-1.5.1.ebuild
deleted file mode 100644
index 8372334551da..000000000000
--- a/net-misc/memcached/memcached-1.5.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.4.ebuild b/net-misc/memcached/memcached-1.5.4.ebuild
deleted file mode 100644
index 7b92758285f1..000000000000
--- a/net-misc/memcached/memcached-1.5.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-		 dev-lang/perl
-		 sasl? ( dev-libs/cyrus-sasl )
-		 seccomp? ( sys-libs/libseccomp )
-		 selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.3-r1.ebuild b/net-misc/memcached/memcached-1.5.5.ebuild
index 7b92758285f1..7b92758285f1 100644
--- a/net-misc/memcached/memcached-1.5.3-r1.ebuild
+++ b/net-misc/memcached/memcached-1.5.5.ebuild
diff --git a/net-misc/netfleet/Manifest b/net-misc/netfleet/Manifest
deleted file mode 100644
index b32632995b7b..000000000000
--- a/net-misc/netfleet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netfleet_0.2.1.tar.bz2 162733 BLAKE2B 2b518b8cdf0a2afb09cb013560f922b969dcaa225be4c81d6ffd16a68997ec2a058fe6d7fb579e28dbfd154b47716298be55ec3e713a88b4c438e6927bd3fbbd SHA512 6fa6e55fd94298798f84bd7416683dde0b7ef3219d7a745353d69973549f2886117408b1e2594033a4f911ef0d95f384ceef51823c4149fba95ea87bdf8c38cc
-EBUILD netfleet-0.2.1-r2.ebuild 564 BLAKE2B 626506bdaa0884f791882ee0def641b62334946840d17af6df95144e8beb59f411c48632b377080510f518b541c120912be551de7ed94d3b1b5941b068378eda SHA512 5c3aa06c79a4aa2b29b4cb8f82a828979805414385e018f74831797fef8b4d6c5efe3e422b835276ba18baa31073c467a5d8400fb43bca12eeeeb9f2d993b05b
-MISC metadata.xml 325 BLAKE2B f357f36b7bc9d0067bfda14b56f7ab819c41bbf269b185a0c4860b15c71f5f7e8b6bbec9f72d7615d1aba768a49f63aaf6ecddc55bb84b4a557bdf18548066e6 SHA512 c5b66b2d7419e9be41d4644e24fbcf7b21a410a147ff51e89c91540431cc433058e2cf25fba4d9ea5407a4b040677c733d8d767b9d939e15e85629fcff572bbc
diff --git a/net-misc/netfleet/metadata.xml b/net-misc/netfleet/metadata.xml
deleted file mode 100644
index 0602d77bce69..000000000000
--- a/net-misc/netfleet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">netfleet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/netfleet/netfleet-0.2.1-r2.ebuild b/net-misc/netfleet/netfleet-0.2.1-r2.ebuild
deleted file mode 100644
index c688de61da8c..000000000000
--- a/net-misc/netfleet/netfleet-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Qt4 cross-platform multi-threaded download utility"
-HOMEPAGE="http://qt-apps.org/content/show.php/?content=103312"
-SRC_URI="https://netfleet.googlecode.com/files/${PN}_${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2a4878404b85..0f9d213856f8 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -8,6 +8,7 @@ AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e0
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
 AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032
 AUX openssh-7.6_p1-hpn-x509-11.1-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
+AUX openssh-7.6_p1-hpn-x509-11.2-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
 AUX openssh-7.6_p1-x509-11.0-libressl.patch 570 BLAKE2B 0b22cca997909743ec3247a80a9efffda7e85235274df98fd8aebf549a1a7cddb3906dd4cc678bf4176f634c5e4b123a00af9d0690672e9bee06e848800eb1ff SHA512 795d3e99d81cbd76533196b6a73a9c9a6db800f9de1f6c7860b56058d0a319c6633ab09b8a149ed6d840b3c9a43162ce299e2a16e334a66802260fbdc35b2b17
 AUX openssh-7.6_p1-x509-11.1-libressl.patch 570 BLAKE2B 9b8baee7a209108ae5bd11fb8c121e77e1908e85210d8ae65d5037521dc7c75f8c9712b20fd1c3ba99eadf588b7f5510486c1f2f915a7652c545d3bd6e14508f SHA512 a503ad8363400fa32d7ba916641a3d5008c9e6dfab4ca63c7b81125e5214733c38375c415dd4ada2b08ace4c9a17ee6f23c578e626289f5140461d01fffa014d
@@ -24,6 +25,7 @@ DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551
 DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e774ac7423e2f4439f2adf585aae18fcf55d63f7f5421e716d76e2dd0205b186b6fea1f53132453ea82f0821cea3124c SHA512 8445a9a8ae8e8baa67c8f386117877ba3f39f33c9cdaff341c8d5fb4ce9dfe22f26d5aedc2b0d4aab67864994ec5a6a487d18b728bd5d5c6efe14175eb9c8151
 DIST openssh-7.6p1+x509-11.0.diff.gz 440219 BLAKE2B 9329a7cf8575c21c31ec73f8ca1084708de34a5b530699d8be2a2a75e1ce0d37210a897c894ab75ee8e2ad0f0802d483d041b1bf3cf3ea46a4a423f1350f42d2 SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a
 DIST openssh-7.6p1+x509-11.1.diff.gz 451725 BLAKE2B 1397c05539ce7532f5e6bf33fc16d5661c32365e127ab1134c0a12c70f0645b05eb05d3ebd9bf64ed59cb94a63cbe8466ac87c9831605230d1ccd578a736904b SHA512 8d445911d8b28fb922a2a0ddb4b7783f81bc258af708148541d30cb79012789cc319bc2031b4584c4c5504480b70077e675be01070fd3065dc4f5ddee89ad8f1
+DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
 DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f54e3ee54e0d05a24d3331613c241e684a43354b6100ee2be76e5b2dcc8f0444fbae5d146830d634e53a85124d5e553759a552 SHA512 0e2c62cdec360090b359edfd5bbe894fb25d22e387677e8a5d6cf6a0807b0572fda30b90c30390d5b68e359e9958cb1c65abae4afd9af5892c3f64f6f8001956
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
@@ -32,5 +34,6 @@ DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e18
 EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb
 EBUILD openssh-7.6_p1-r2.ebuild 11172 BLAKE2B ce0c8101f1e13686c748aaeeb4603244618a1efce52f2a7fc7eaef8d4bf7acf0f19c41e5393d03cb8179a813b0aaae91eca1f86b30c22bafcfec542fa9e0f7f7 SHA512 4d725eee7492aac558b3c5a73a52521278f80777be96cbb8fb7e195bd4463dca19806a35ff276c00ac081f071fba6f2edbe39a1981c14c52c99a453fb78c3d3d
 EBUILD openssh-7.6_p1-r3.ebuild 11160 BLAKE2B ae47330e350d828199cfa0218e7aab64638baf63b5c4dda71872c0c5a3b729b8dcab63cc3aae5098dbb6958c013b9ece73dae46fd6185918ac2294171c9e55c2 SHA512 1ab8699ae71d2949960f252894fd1b64c8997abc384cc8a85f221c6ef5c16ab54ad4e8b297b6796e9d3d1aa693dce203ba38f72e74ce7a74c9ec76a41c956c49
+EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e52edc889407996ba640b07755dc713f28f9669e84a7f269d2be58764c561d7c2a14ff9af03ea7664794eb7f8656d9a SHA512 40276711daceea7e595a57b9805d5a4099e644650c6d2b501d581f5297bfc59bc20b325db455ce9e959d1a8d85bc25471e873177af5feadf1813f50205d6bb35
 EBUILD openssh-7.6_p1.ebuild 11171 BLAKE2B 0c91399c7dbd07f7101c609eba7ae19d91f5c270f817f7d1311935faf5520b22a0ddfd2e4cf1953055fcc601092370d37d223714cb597be798ffe4019af3bbca SHA512 5b3c82f8999a4e59ca481eb7c6b77571ec33341c8f2a7b949dc3894c13d8adb93c6df4270216d2ecee4576f3c5f96aa29873b0caca841aae54adcc998e54f27a
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch
new file mode 100644
index 000000000000..2ed6a7b54a66
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch
@@ -0,0 +1,50 @@
+--- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
++++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
+@@ -907,9 +907,9 @@
+ @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
+  {
+  	/* Send our own protocol version identification. */
+- 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
++ 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
++-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
+++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
+  	if (atomicio(vwrite, connection_out, client_version_string,
+  	    strlen(client_version_string)) != strlen(client_version_string))
+  		fatal("write: %.100s", strerror(errno));
+@@ -918,11 +918,11 @@
+ --- a/sshd.c
+ +++ b/sshd.c
+ @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+- 	char remote_version[256];	/* Must be at least as big as buf. */
++ 	}
+  
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
++	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
++-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
+++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
+  	    *options.version_addendum == '\0' ? "" : " ",
+  	    options.version_addendum);
+  
+@@ -982,13 +982,14 @@
+ index e093f623..83f0932d 100644
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,5 @@
++@@ -3,3 +3,6 @@
+  #define SSH_VERSION	"OpenSSH_7.6"
+  
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
++-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+++#define SSH_PORTABLE	"p1"
+ +#define SSH_HPN		"-hpn14v12"
+++#define SSH_X509		"-PKIXSSH-11.0"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
+ -- 
+ 2.14.2
+ 
diff --git a/net-misc/openssh/openssh-7.6_p1-r4.ebuild b/net-misc/openssh/openssh-7.6_p1-r4.ebuild
new file mode 100644
index 000000000000..01600c378d29
--- /dev/null
+++ b/net-misc/openssh/openssh-7.6_p1-r4.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz"
+SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
+X509_VER="11.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~chutzpah/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~chutzpah/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	eapply "${FILESDIR}/${P}-warnings.patch"
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}" >/dev/null
+			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+			save_version X509
+		fi
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		elog "Applying HPN patchset ..."
+		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eapply_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	# remove this if aes-ctr-mt gets fixed
+	if use hpn; then
+		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
+		elog "set since it does not (yet) work with >=openssh-7.6p1."
+	fi
+}
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index c9586034b8e1..44621e2bba94 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -3,8 +3,11 @@ AUX pps-tools-0.0.20120407-install.patch 740 BLAKE2B 3da7acd1c21d49f1628752e7b9a
 AUX pps-tools-1.0.1-LDFLAGS-fix.patch 537 BLAKE2B 9fbabfc6465043d86494d7e4bb4ae2e6281c7484188aff25e46f7ad6f3c7eb36b82fac4ae35b03a6a099792d71d562e91f94db708458d40e4f349e44a10c6f29 SHA512 1e5f301f7f7d40196db7341ed99160deab2efd9f38eb23683ca549241169cba441c4c893f793f26b55ff727274b1d44f2fdd65c870373b23e3e6f781cf150875
 AUX pps-tools-1.0.1-build.patch 1220 BLAKE2B 0f5f1cb76a57753a34913b308ebdc50bc399ad2a71958c9fa72520a3968243d518fc5aadce101033bfb6634c39ab1bce11c1a2202c59f9245353797685b3fdfc SHA512 d2f845e21baf0643dcdf222dc39790eb3e60ca112d6ce2de1a9b8b12f6d1dde6645a72a91df2cacb26fb10154e8f9b99917570a854e1a4fdae0f10271fa1ba0b
 AUX pps-tools-1.0.1-install.patch 693 BLAKE2B 6f85d636697c30abee4a5c3c83d8c0a636c1e70343a373ab483bb98a7d5d4db60373ad0337f2feadf0f64585bf180211df8cfc17f1e465023884477bdac3a8f4 SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc
+AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a573d4e69bec67283aac1c19ab86939478b2ce6a205671d9282cfd17f7f0731653374d1fb7971bbead75c6ac6a23e4 SHA512 3494d05eca69fb3b3011ce79a4b8cbaab5eb2ec89abb2b1ffabbd1d677585b4054bae398c4703048be0e32c4cdbd9c188fb624571b688630d95b03396e5e759c
 DIST pps-tools-1.0.1.tar.gz 12695 BLAKE2B 8c05f037b03efc2685bf303f521e168e6c56c203665482fa456278e3580fba8d2fc04935b7f32b70b6ac50c28d4f998a2808f5e3034dcffad4ff1589fd8f2907 SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784
+DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
 EBUILD pps-tools-0.0.20120407.ebuild 669 BLAKE2B ef45b85c29268b43ddbf80a2d143dc4d98b2d2b02907e0c3353013328e2f1f9ad416ea47e35cb02e3238c928ea913201d7810b4e60342edc20cb93b837c04ee1 SHA512 4a3424922816c0592f1cce1af2293588fb49cb630aff0ad68c3b76fa700207ab8762c6cb38555d1b99adab3c050d2ef8b15b09fb8b7a02c0b0fcc1150d6c2695
 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a
+EBUILD pps-tools-1.0.2.ebuild 546 BLAKE2B 2ec9fcf152f44414fd77be561266608cee51d1af08471b5bf2271199d2d747ea8441d2b42e86ea40db40ff0c6b9297686f8d9c03ddf7670865bedf32807836fd SHA512 f08f8363ac12f14b6e7cb25cc9285a4940a7c0fda147d48cd2ec11fa46d61559af0b5a198471f0209d8074fa7cc92bd32f90c12769516dcf27eb06b2ad1dfcca
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
new file mode 100644
index 000000000000..a62a6bb561cf
--- /dev/null
+++ b/net-misc/pps-tools/files/pps-tools-1.0.2-build.patch
@@ -0,0 +1,50 @@
+From 5deb13d9d980a595946ff58e4e6d83f9d770ff10 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 14 Feb 2018 09:35:34 +0100
+Subject: [PATCH] fix up makefile
+
+Make sure we respect CFLAGS/CPPFLAGS properly.
+
+Also fix up the depend include so we get reproducible behavior --
+the depend file is generated & included first, and we don't get
+weird behavior when we run:
+        git clean -x -d
+        make
+        make
+---
+ Makefile | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9394668..af3ae56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
+ TARGETS = ppstest ppsctl ppswatch ppsldisc
+ 
+-CFLAGS += -Wall -O2 -D_GNU_SOURCE
+-CFLAGS += -ggdb
++CFLAGS ?= -O2 -ggdb
++CFLAGS += -Wall
+ CFLAGS += -fPIC
++CPPFLAGS += -D_GNU_SOURCE
+ LDLIBS += -lm
+ 
+ # -- Actions section --
+@@ -12,11 +13,9 @@ LDLIBS += -lm
+ all : .depend $(TARGETS)
+ 
+ .depend depend dep :
+-	$(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -M $(TARGETS:=.c) > .depend
+ 
+-ifeq (.depend,$(wildcard .depend))
+-include .depend
+-endif
++-include .depend
+ 
+ install : all
+ 	install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
+-- 
+2.16.1
+
diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
new file mode 100644
index 000000000000..7291f8a36e61
--- /dev/null
+++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-space tools for LinuxPPS"
+HOMEPAGE="https://github.com/redlab-i/pps-tools"
+SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-build.patch
+	"${FILESDIR}"/${PN}-1.0.1-install.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 3876f6f4b34b..c315a075c902 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,6 +3,6 @@ AUX spice-gtk-0.33-sys-sysmacros.h.patch 1459 BLAKE2B 105b5b5d11ecb1b34f69df8d0f
 DIST spice-gtk-0.33.tar.bz2 1383927 BLAKE2B 96cbe8d3f81d596c4fd0d85cc0fd96588029a3b486327c64c5084b82e2c3acefee648a836ca46363dc03aff33dd72a4001c2ac8513b18b6479b56d11cc86f60e SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 EBUILD spice-gtk-0.33-r2.ebuild 3863 BLAKE2B ae6601e6c94762f4331d6b743b401fe74041982c4f650be44e21ddac374158e6ab46c3dfc6c6ea0fa8cbfe74c96cc6ea22b6a7c66965ab4c3966f8a658f94783 SHA512 c0f85f732c6b1d605ca494b230de817b45b7cf065c2a5be69f8e29aa860dacb8046056d4ac1c5877f842358fd84bc1ffd6526a7824fe7e620951d047179b177d
-EBUILD spice-gtk-0.34.ebuild 3804 BLAKE2B fa08233479508432e1122a3a967e4a64a8b948a9cbab49a62c3abcee0ca8b2e65a89c9229c151265342d108318b50efebf863f3dcbca366aa6a5de52b6bb213e SHA512 80ebb24cd596123ad803364f4102a2a7c165c4685ef00088d89d6c80f4ab37203cadbcd095455913a5c395575c0e52148d42860a3ff1ac7c6ebd4b0170cd85b1
+EBUILD spice-gtk-0.34-r1.ebuild 3804 BLAKE2B 9de7efe611fdbe0f09ff62838372b3b5584f43bd09c555147b5bde9f46c4a8d6e436af63c41ecb63503f8a5274c3030eb5bf4b281c1530ab00239125c596a51b SHA512 8d567d8aa4fd2065242a2208ef16467ccbcaae9ccafafd73f3117696f45331aa95af4a0c1cf8fab4ae4cc0ddf95ccff18a7a775fb662f6d46dc306539ecc6727
 EBUILD spice-gtk-9999.ebuild 3743 BLAKE2B 086fcc06783c34ad8b537b46279283d3fd8979d8e2cfaed297e7ede4552897e5d0a07aa6b482932e453572478549e616f1b14c75a5a4d872bf15ecd6a0688ae5 SHA512 4d1d5c498f8d30b19a307198e336d3b0ac47519b6d21f353ddb27c6018e564823e1a40a28d032cf139609d1332a74bccf1332e58e54d362b6cb3a770be5435a5
 MISC metadata.xml 1179 BLAKE2B c1417aa6d49d8ac4477762a60b4c360ad857fbad4ad7f20c65482c1f6db5845c5cf6bc2e99d234411b9a087ac3c1a98ed394739a598573387656e83b7fe2491c SHA512 6cd0e7da9d10bdefe4180785f4c19a9b6579ac098622bf5423f00f291bdd49be60769eb230830b8aa348da2b0d91ba303576380cd1d8a56de6b27f0f49442515
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r1.ebuild
new file mode 100644
index 000000000000..c2b498522a49
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.34-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.13
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# bug 558558
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
+
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_with gtk3 gtk 3.0) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstaudio) \
+		$(use_enable gstvideo) \
+		$(use_enable mjpeg builtin-mjpeg) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/spice-gtk/spice-gtk-0.34.ebuild b/net-misc/spice-gtk/spice-gtk-0.34.ebuild
deleted file mode 100644
index 437ee2e683f3..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.34.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	>=media-libs/celt-0.5.1.1:0.5.1
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/libgudev:=
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.12
-	dev-perl/Text-CSV
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	# Clean up environment, bug #586642
-	xdg_environment_reset
-
-	local myconf
-
-	if use vala ; then
-		# force vala regen for MinGW, etc
-		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
-	fi
-
-	myconf="
-		--disable-maintainer-mode \
-		$(use_enable static-libs static) \
-		$(use_enable introspection) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		$(use_enable usbredir) \
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
-		$(use_with gtk3 gtk 3.0) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable gstaudio) \
-		$(use_enable gstvideo) \
-		$(use_enable mjpeg builtin-mjpeg) \
-		$(use_enable vala) \
-		$(use_enable webdav) \
-		$(use_enable dbus) \
-		--disable-gtk-doc \
-		--disable-werror \
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index cae536a41c96..5fbac60b1024 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -6,8 +6,10 @@ AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e326179
 DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
 DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
 DIST sslh-v1.19b.tar.gz 57369 BLAKE2B e970a6c92975b716e95a231a83c61970620f40d732e84ec318d98c3fa78fd6c06bc7de91745c6ccbe37a2cd96559c07f939b3affae03c3fcb3c9f785d62ba268 SHA512 a78f94234f8ccef6ad0dcd299b25f2ecc9b4b2c1acf110bbf3203a63259b69cc3cbc21314799aaa26e60c3420c03be3335ba4d4bc01dc595068506066a60b98e
+DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
 EBUILD sslh-1.18-r2.ebuild 1753 BLAKE2B be4845b0cfa8e7360cee513a1c570e1f86c061d578344929fceaffc1f1006b358dd21ba2c4ced28b68934d3c868c36e8e3d471cecc91fc6306ebf20610aec4fa SHA512 a4a96c61476381f0870b0cef1278219d555e7b6c8760c078a4772ab26550163ec991b57797362bf885d07331d4ceac5294180e868dbf65af9e9122da7e467ef7
 EBUILD sslh-1.19.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
 EBUILD sslh-1.19b.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
+EBUILD sslh-1.19c.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
 EBUILD sslh-9999.ebuild 1928 BLAKE2B 9f4e67686f07566c4387ee2fadad300d6c148920855418c44a5b04a7b2bd5fd1f85d4bda24994f84b7287931044aa60aaa948fc8990d4886c03bb72555c0fa4f SHA512 08bfddfb1c4c0c0f4cf9e68baca31d36bc10becda46430ab62de408ff0522f9edb62d95a331e679c510246e36d03451333ca34556223f65ad2c12b58bc2a97f2
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.19c.ebuild b/net-misc/sslh/sslh-1.19c.ebuild
new file mode 100644
index 000000000000..3c1ac5f9f7f7
--- /dev/null
+++ b/net-misc/sslh/sslh-1.19c.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+	MY_P="${PN}-v${PV}"
+	SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre:= )"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
index 6479dd379a71..cbe2ae890d56 100644
--- a/net-misc/ssvnc/Manifest
+++ b/net-misc/ssvnc/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b
 AUX Makefile.vncviewer 295 BLAKE2B 6eee05699e3f14d54b8b7fcaecc6843d08d2fcdbd292be2bba2a76f838c398edad8f5a9b46a6621f8611913a712d945d94cdaaca3ee8dc21d2573ed957334fbd SHA512 1161a2612ab2d3a5e87efdf144baf84d0b90307f20c216cb7c49a6b13e0b8da4eb3aebc1db14192672d796cd92db6e7a6336611e07405b1fbbe2d2dcc5374625
 AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
 DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.29-r1.ebuild 1426 BLAKE2B b7a9e1a7230f85a7e29db82154309a68d2b819d964ba345ad51a4e40b8afe8bf6d66ac91b6ea4da962d458a52d6b6e7fe57e9ad9643f5849f3d4e82d36640811 SHA512 5b9240cebc7ea3b2ffd9fb42f54665de0d8aade0b855d95b8ef2b2faa798e0dbe470dbd37df760533abb6825d3fac69c39bd13a290aedd2d9c3b8f804b1b72b2
+EBUILD ssvnc-1.0.29-r1.ebuild 1425 BLAKE2B c1f9dc81a46cabe9f373e42aa162c5131b0ceaa7d75e22d8ad50757314a42cc69f99fd5c97f5c5e131c4a19a7a4ed57a9b9603a509f20a110a474337cf2b6b04 SHA512 01fed0001099c261b5c508662130de90e0f97fd04812cce0d621861c7926845fbd4afd2e2b44cef33aadaf4f3b7946db5dea7fccbc7b3dc8982e338349a1436f
 MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
index f31d0f32cd6f..da875fbd3fbc 100644
--- a/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
+++ b/net-misc/ssvnc/ssvnc-1.0.29-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="java"
 
 RDEPEND="sys-libs/zlib
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b9c413db2b2a..9bf8f8e02278 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.01.27.tar.gz 2893288 BLAKE2B 8c0c5c09d49d4d729c51cc706b94b3507f97d14591f76325bbe8c0174b7b485267067a8f11f788ad738cf890b1917ce746f5613b240f8f754d902f95c21d3705 SHA512 dfe43d855ed6162542531a471f3683e6fd0c3aa094f736a5a53b4efc298106e609787063380d112a2cd0888791e677c11e70fbc90aad096cbbc0aa82442eecff
 DIST youtube-dl-2018.02.04.tar.gz 2895562 BLAKE2B dd81345019afa82706e3f4ce617b89dc77bc12c904e245bb1605a82dc1ed83805679dd11be056463ad2cb584e1774f43f9e3b8e5e55694c58d7a06fd4e65aea0 SHA512 0f39fbcdc3ae4169fec3938fe4f13466e87ba977921b3af1a61571430b145ead21557962834a4e3d3d2660110ee1772602abc779e8cdd61c3ee57a6638f2418e
+DIST youtube-dl-2018.02.11.tar.gz 2901130 BLAKE2B f803cc7a94362e4ff20b57a64383c6751fbf56906c4d3cf8bdc882cd0edf8f74b211212334b9fcb81bedfc3bb0e907a4c1a5089d1d2a2478c2371373f1e415f7 SHA512 74731f346873074cd8e9f45f24f9fb1c0a9f37aabb6aa5fcff5e5e43085cfc700eff384531262a39c453c30cf18f27733b1d02709468906cb787ed3153cf2768
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2378 BLAKE2B d4103998f29f54f2ca5ff154e4bf4dee3f78e618cd8c049cbcb1d8fca987363c5eeab8d02e8bc4e24ccf80937b43e895056aa888fc9755edeb7308730fe306d8 SHA512 294f5c1cf25cc3fd59c16c6d7ca7091051ebc491e8cbd475ec09d70b7d9a8e369de5de5b2c2aa21c97aee344dfe0b91a4cfc2aa55abaf495ca25bb0e0400b2b8
-EBUILD youtube-dl-2018.01.27.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-2018.02.04.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
+EBUILD youtube-dl-2018.02.11.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.01.27.ebuild b/net-misc/youtube-dl/youtube-dl-2018.02.11.ebuild
index db51a779b025..db51a779b025 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.01.27.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.02.11.ebuild
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 42f653117e30..87893e087891 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -2,4 +2,4 @@ AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad695
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST zerotier-1.2.4.tar.gz 7963254 BLAKE2B 0c79533429e7aab8dc0a93d46ace132b168b6d83276e72cd66c72660d4e44a5336a91c011404690301de0b5ef4b45f857b340f38cd195d6479b480d3a62b7abf SHA512 82adb110208d24ae2745e3839810afcac87955de050ebfe0517a7dc2a875881dafd40c1b16a041742d8c4d0f6513abcc71d6ea3e06c2fb89b47be2630a500363
 EBUILD zerotier-1.2.4.ebuild 910 BLAKE2B 1702a5bdbc81996fbc8503b88cc2149793d8391d80e736e57b6ded5556f0fd6f2d3a90c6d4105e453e4395de9b6cdd2fed835e99bb66361549ff89a82e7bd5c4 SHA512 0b0e295145b5c3b149a41a3645f080e644ca336e151a0dd7c7f6be4c8bfb508414616415b1c95e1f8f4dd34a00cec87ecec6cb67ad1a1642d833e6531a472d67
-MISC metadata.xml 167 BLAKE2B 6c0e30dd2c7ad7044fee9c1e7065d02ba4ea022e00dc6ffb0f2963999c1dd2cf520462de2bd5c7bd3538feb2995fe22faecd5025505b0e23b85a566abad5cb96 SHA512 82819c7f6af01f9e7f859b7a25f61e44792421b66db7d6568022709d7ecb0d9b3fae57c8d1141ce05860b46561d187a3a4c252774d6f842c55097a9dc1b18cf0
+MISC metadata.xml 458 BLAKE2B b1d56145169a0127e486422114e0ebbd25097b5f3bc31df609addf4e23229ba3b99b2e5b5bd2b092d45b7bcfae9a30bae29b521441f7732758a4d1f484e9df30 SHA512 3f947bfba0281756bd4b8eb0b91af7cdc263b9dcc2b13c4a186897e7789424c088e9317c58ef35be2ba55880030cf81b11dc0f4d3e4dbf19cd275e139c2d7d73
diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml
index b372191c798e..a4b0e41d3e76 100644
--- a/net-misc/zerotier/metadata.xml
+++ b/net-misc/zerotier/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ramage.lucas@openmailbox.org</email>
+		<name>Lucas Ramage</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zerotier/ZeroTierOne</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 2fc50cf62585..310ddbcf6e77 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/gss-proxy/Manifest b/net-nds/gss-proxy/Manifest
index 42ee9d590930..548101d210c8 100644
--- a/net-nds/gss-proxy/Manifest
+++ b/net-nds/gss-proxy/Manifest
@@ -1,9 +1,6 @@
 AUX gssproxy 279 BLAKE2B 8413b5e581d084933a1851d3c8be363c07a750180ce72629297466d7afcfdf2dfd94c877883f4503314b5b25b608634f3258c3c1369948b6263dcd9c60b0aabc SHA512 c36d646ee1b7c2e172192782c8d54e51ffb13d75c7afbcd7c67872cfa2baf994a2582bb2b423b27e591051ca2e5b3969dc1f26e7f7a277999537d85e624bcab4
-DIST gssproxy-0.5.1.tar.gz 532525 BLAKE2B 5aa7cdd78d1d0f61532e27d2894a3263045de2e331736421115c16028967918293c250261c3e6954d0e33e635871a6852d615c1a03894231fca91e7309aeda45 SHA512 72cb987413feba341b57caa27d5efadb8ed63af3751fda7013fe68768457a88011ac3bcf6e90b3d1d5ecf8894708daa0f20e57fe191d8ba3ce9b6492b57708f7
-DIST gssproxy-0.6.2.tar.gz 547428 BLAKE2B 6bfd8f4809af4d3abc28642eb9dd631924fc9c2c79e9d22c6c20239c1c2d9aa0369ea7552b8485fd1851b3df2382803710cd40bf177a0edec62766b604edd84d SHA512 3c19fbd6e6c8aa2946512f947e016642672a98559b0c47dfb2a4abe2c9dbf06f1bd4f028199cd4828edf00eb0f5d3eac55bda73dcfeb27095e8e9ab14fc88bcd
 DIST gssproxy-0.7.0.tar.gz 552041 BLAKE2B 78ec58e151c801ea65e01bf12ac38591442073eef051302afbbd8c11e20c753ae481542a9cdaeb321551ac1ba14be5875b5dc0f9514a0d436bc28e71a5d28c9e SHA512 00cd1d05e12f93f81c11062ccf4950e521960f752a6121f2055e47294a51894eda2415c558d3bc0d4c496146ab8f82a1162328acfb5eb3405c7b116774fa9f89
-EBUILD gss-proxy-0.5.1.ebuild 1498 BLAKE2B 6b6468cc84eb0d160023445ea559027a28512d1fe628d21d9d3299d06ffa5d9c204a05dcbf1a61acfe2294de4e3126898a2670f607bab01d11268c95d5b68c70 SHA512 d0ee07f70a615b02add596215cc69352d8feb8e36f6237ea15845900fbb13bcbb4df8f53c8cd0fe86f50ef8bef4e30fd7de81b9503c69097b17caf41d8f3da1f
-EBUILD gss-proxy-0.6.2.ebuild 1481 BLAKE2B 6ca716a676f56b946d4e39f2fcad17c80f1f254d9097b8f3afa16490ba55896b37933c6b370a34e65ece34fc4ac09695a874db21a347d7eae35db67c784ad530 SHA512 ef465a9745413945bcc9947c1e9fe9f760c32603b16f9b34317836b90ec33462202d240fdd3e042066b2245206f6d8dcdd80ffb44f7d4916bdcb83992d269203
+DIST gssproxy-0.8.0.tar.gz 557386 BLAKE2B 14948bbd4c08834375ed00d9f9c6624797eadef3a4313af55a3f3cc9fa3133627ed11da97c1414caa1731ef6da1286dbc1e1c41af8e6c4f96dd42e5b0b2b69e6 SHA512 f3b8f053d6750d7ee6ab2bfb6bfc4dc1ac2e2f354f923590340bb3c522f57cc881df5a2850750bc00c0dcacf2ae173549dc3bb9ece4512cf2f39869527afc2ec
 EBUILD gss-proxy-0.7.0-r1.ebuild 2821 BLAKE2B e55cc723a29601e00d383aa07f5ce972ffe86cec64647ad6f85a1eca67eb81b0fa67dae18fef606651ae0eaa4fc1a132da15223d6aeb6d99cb23d646ff65ff14 SHA512 760b7bc7d2126272424e0faedd50ff64413d090046dc1121ec0dbcfc7123497450be78aff1c4b3dc4b55783113e4e7be22a22db0c9c00511fd7dddf63140054d
-EBUILD gss-proxy-0.7.0.ebuild 2745 BLAKE2B c5c8217251d0266cd64bdbb3d15bc8113ec760f4ac796895f8fa99db5db085388e03454a4b2a21a562c192efc2504cdca27f78948991a544d3b65341f279f7d4 SHA512 b511947c47973449e55bdb5d93ebff360f9b0e5c32cbfbf34aa3bcee46807c75700a9e6267f9021607604c3036a62189b4b5441b3b1a013d5a9be8b963b0ffcd
+EBUILD gss-proxy-0.8.0.ebuild 2826 BLAKE2B 364c92afba2306386e5d845dcadb27379a01296250ca456a470002711edd8883f68339430ef369fdb591b8140b4c85f5bfcdb0858c78c6721fd2fb42f5d11a38 SHA512 a79f7c2483a9a93fe12977cf3ccdfa188fbd22c2f5643adc59b88c2ab991bf04e2868458b58416e3038e64f7b127a4478a3281a8b25141b0549b3e4644f7fe56
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/net-nds/gss-proxy/gss-proxy-0.5.1.ebuild b/net-nds/gss-proxy/gss-proxy-0.5.1.ebuild
deleted file mode 100644
index 7abf2d67a635..000000000000
--- a/net-nds/gss-proxy/gss-proxy-0.5.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"
-
-MY_P="${PN/-}-${PV}"
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://fedorahosted.org/gss-proxy/"
-SRC_URI="https://fedorahosted.org/released/gss-proxy/${MY_P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug selinux systemd"
-
-RDEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.5.0
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# The build assumes localstatedir is /var and takes care of
-	# using all the right subdirs itself.
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-os=gentoo \
-		--with-initscript=$(usex systemd systemd sysv) \
-		$(use_with selinux) \
-		$(use_with debug gssidebug)
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED}"/usr -name proxymech.la -delete
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
diff --git a/net-nds/gss-proxy/gss-proxy-0.6.2.ebuild b/net-nds/gss-proxy/gss-proxy-0.6.2.ebuild
deleted file mode 100644
index 3c1721bf36c4..000000000000
--- a/net-nds/gss-proxy/gss-proxy-0.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${PN/-}-${PV}"
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://pagure.io/gssproxy"
-SRC_URI="http://releases.pagure.org/gssproxy/${MY_P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug selinux systemd"
-
-RDEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.5.0
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# The build assumes localstatedir is /var and takes care of
-	# using all the right subdirs itself.
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-os=gentoo \
-		--with-initscript=$(usex systemd systemd none) \
-		$(use_with selinux) \
-		$(use_with debug gssidebug)
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED}"/usr -name proxymech.la -delete
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
diff --git a/net-nds/gss-proxy/gss-proxy-0.7.0.ebuild b/net-nds/gss-proxy/gss-proxy-0.7.0.ebuild
deleted file mode 100644
index b91eda6e3747..000000000000
--- a/net-nds/gss-proxy/gss-proxy-0.7.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN/-}-${PV}"
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://pagure.io/gssproxy"
-SRC_URI="http://releases.pagure.org/gssproxy/${MY_P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug selinux systemd hardened"
-
-RDEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.5.0
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# Many requirements to run tests, including running slapd as root, hence
-# unfeasible.
-RESTRICT="test"
-
-# pkg_setup() {
-# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
-# 	# allow to specify the openldap use flag, which heimdal doesn't
-# 	# support.
-# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
-# 	# schemata required for the tests of gss-proxy.
-# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
-# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
-# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
-# 	fi
-# }
-
-# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
-# comment: see RESTRICT comment
-# src_prepare() {
-# 	default
-# 	# The tests look for kerberos schemata in the documentation
-# 	# directory of krb5, however these are installed in /etc/openldap
-# 	# and only if the openldap useflag is supplied
-# 	sed -i \
-# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
-# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
-# 		"${S}/tests/testlib.py" || die
-# }
-
-src_configure() {
-	local myeconfargs=(
-		# The build assumes localstatedir is /var and takes care of
-		# using all the right subdirs itself.
-		"--localstatedir=${EPREFIX}/var"
-		"--with-os=gentoo"
-		"--with-initscript=$(usex systemd systemd none)"
-		"$(use_with selinux)"
-		"$(use_with debug gssidebug)"
-		"$(use_with hardened hardening)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED%/}"/usr -name proxymech.la -delete
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
diff --git a/net-nds/gss-proxy/gss-proxy-0.8.0.ebuild b/net-nds/gss-proxy/gss-proxy-0.8.0.ebuild
new file mode 100644
index 000000000000..7939c3e2191f
--- /dev/null
+++ b/net-nds/gss-proxy/gss-proxy-0.8.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN/-}-${PV}"
+
+DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
+HOMEPAGE="https://pagure.io/gssproxy"
+SRC_URI="http://releases.pagure.org/gssproxy/${MY_P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug selinux systemd hardened"
+
+COMMON_DEPEND=">=dev-libs/libverto-0.2.2
+	>=dev-libs/ding-libs-0.6.1
+	virtual/krb5
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-gssproxy )"
+# We need xml stuff to build the man pages, and people really want/need
+# the man pages for this package :). #585200
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.4
+	dev-libs/libxslt
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Many requirements to run tests, including running slapd as root, hence
+# unfeasible.
+RESTRICT="test"
+
+# pkg_setup() {
+# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
+# 	# allow to specify the openldap use flag, which heimdal doesn't
+# 	# support.
+# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
+# 	# schemata required for the tests of gss-proxy.
+# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
+# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
+# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
+# 	fi
+# }
+
+# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
+# comment: see RESTRICT comment
+# src_prepare() {
+# 	default
+# 	# The tests look for kerberos schemata in the documentation
+# 	# directory of krb5, however these are installed in /etc/openldap
+# 	# and only if the openldap useflag is supplied
+# 	sed -i \
+# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
+# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
+# 		"${S}/tests/testlib.py" || die
+# }
+
+src_configure() {
+	local myeconfargs=(
+		# The build assumes localstatedir is /var and takes care of
+		# using all the right subdirs itself.
+		"--localstatedir=${EPREFIX}/var"
+		"--with-os=gentoo"
+		"--with-initscript=$(usex systemd systemd none)"
+		"$(use_with selinux)"
+		"$(use_with debug gssidebug)"
+		"$(use_with hardened hardening)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# This is a plugin module, so no need for la file.
+	find "${ED%/}"/usr -name proxymech.la -delete
+
+	doinitd "${FILESDIR}"/gssproxy
+	insinto /etc/gssproxy
+	doins examples/*.conf
+	insinto /etc/gss/mech.d
+	newins examples/mech gssproxy.conf
+
+	# The build installs a bunch of empty dirs, so prune them.
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 344c923123e5..f6749258bef3 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/suck/Manifest b/net-nntp/suck/Manifest
index c6a975de23bb..bc749ddcb3ae 100644
--- a/net-nntp/suck/Manifest
+++ b/net-nntp/suck/Manifest
@@ -1,3 +1,4 @@
-DIST suck-4.3.2.tar.gz 187560 BLAKE2B fd8e7ebb8e00f4ef060f72b12eae5001268399267914a617c3de73ed323a58cc87770a4ecf1eb5991c36a7f74f2475f3cd9076c60aec52bc8c05ae89cd0b32a4 SHA512 704559ea54daabc6ef7b205431e587a90de20d8a5648e60910e4bc1a1493eebc8a3497c308a9de34febf6b26eda13785cf9f1f5ae034ee7fb0a9230173d13d4f
-EBUILD suck-4.3.2.ebuild 1098 BLAKE2B 13c85af5cfb051d037a10fbd36b9bb95d3f8780a3bd5f8145b8d78928f4da6e846ef1320326ba460572c1d2ec03881cc9d76f08d7f79cca67753b9495865a7db SHA512 67e9300bef33a94a4c5ef227b68637fcc5be4bb89be60be203f10549eafb1714232acc7e934824a9104020d386758fcc1933872c14f76d001f8e4ed27d531ac9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+AUX 4.3.3-fputs.patch 639 BLAKE2B acbb1344a34b8176abcc10d61ed08d506cd80ad331aba78c97c5c0de97192ec2708d5c21f34a9b329303ab6c5066b0b248128977eb5d9e2c44633acb56a9919e SHA512 70e7e117692b27e9bcc646eca4e41cf432aca180358922f900e02b0ffa4c98e0a4814f05aa6b318cb38c50075bedf560a74f1a3e9dadf3e88c855d4a43bcc24d
+DIST suck-4.3.3.tar.gz 153624 BLAKE2B 434bdb21ba37deefcba4c0fa9ec3cdf14bc49e1295533ae3c7fb298f49819113ad05e26b3ca72e20ebdd498b0514155f8d79e7c82e95f423521586de889c2371 SHA512 629ecbd7e8d070fc9c1175be6dd10d49fe71b59b8694f32a81cc2dd5ec46e32d64463d221052922a7e21fcac1c9a330f56399bad7c64fa653d68127cd16dbfdc
+EBUILD suck-4.3.3.ebuild 1343 BLAKE2B 6a2982dac36e91102fa96da5b7035f66e3271fe9c5e8f64e3f7513df0acbb40e817219ef9d51b76e892d0a6594282ecfda9409e594caf3e778ea58dfb9dcb0dc SHA512 f8179fb68e8033c44e00d6cd68c855dd3790b93fdae78909bfaabf7e67f8102cd591e0171eabdc3426ed097fc875165b2bcd19b1f032aa77b14ea2ca7c5ecd8e
+MISC metadata.xml 446 BLAKE2B f1536ea731934392d13bec8052913b2b1735afb5bb8af79916fab70162b2575ece91eb5a93fecc69d1a964264bc1cf9ae4a44cbec89685fd02297bb1262c68ac SHA512 f8655b719c3dc9bd0a7fd4ef046c88c4e44624d206d544ba9c5f668084fc908c217813aedb6970dc9e081c8483fb1ddbf777e8e78e1432cb262c020e704e5c7c
diff --git a/net-nntp/suck/files/4.3.3-fputs.patch b/net-nntp/suck/files/4.3.3-fputs.patch
new file mode 100644
index 000000000000..df38f1d4316a
--- /dev/null
+++ b/net-nntp/suck/files/4.3.3-fputs.patch
@@ -0,0 +1,25 @@
+From 440c3c39c51c89c0a5bc53850e9b75b142a39bd2 Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Wed, 14 Feb 2018 15:02:22 +0100
+Subject: [PATCH] Use fputs instead of fput
+
+fput() seems to be non-standard.
+See commit cb0aadd0a2f16a09bc972d648b864a1fd541e75f
+Now we have the original patch.
+---
+ lpost.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lpost.c b/lpost.c
+index a2c0d29..39bb17e 100644
+--- a/lpost.c
++++ b/lpost.c
+@@ -42,7 +42,7 @@ int main(int argc,char *argv[]) {
+ 			}
+ 		}
+ 		else {
+-			(void) fput(line, pfp);
++			(void) fputs(line, pfp);
+ 		}
+ 	} /* end while */
+ 	exit(retval);
diff --git a/net-nntp/suck/metadata.xml b/net-nntp/suck/metadata.xml
index 6f49eba8f496..9949afff0b13 100644
--- a/net-nntp/suck/metadata.xml
+++ b/net-nntp/suck/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jubalh@iodoru.org</email>
+		<name>Michael Vetter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lazarus-pkgs/suck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-nntp/suck/suck-4.3.2.ebuild b/net-nntp/suck/suck-4.3.2.ebuild
deleted file mode 100644
index 5a7f05bff602..000000000000
--- a/net-nntp/suck/suck-4.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Grab news from a remote NNTP server and feed them to another"
-HOMEPAGE="http://home.comcast.net/~bobyetman/"
-SRC_URI="http://home.comcast.net/~bobyetman/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="ssl perl"
-
-DEPEND="sys-libs/db
-	perl? ( dev-lang/perl )
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix paths to the locations in Gentoo
-	sed -i \
-		-e 's:/usr/lib/news/rnews:/usr/lib/news/bin/rnews:' \
-		-e 's:/usr/news/db/history:/var/spool/news/db/history:' \
-		suck_config.h
-}
-
-src_compile() {
-	use ssl || sed -i -e 's/^SSL_/#SSL_/' Makefile.in
-	use perl || sed -i -e 's/^PERL_/#PERL_/' Makefile.in
-
-	econf || die "econf failed"
-
-	emake phrases.h || die "emake phrases.h failed"
-	emake all lpost || die "emake failed"
-}
-
-src_install() {
-	dobin lmove lpost rpost suck testhost
-	doman man/*
-	dodoc CHANGELOG CONTENTS README*
-	docinto java
-	dodoc java/*
-	docinto perl
-	dodoc perl/*
-	docinto sample
-	dodoc sample/*
-}
diff --git a/net-nntp/suck/suck-4.3.3.ebuild b/net-nntp/suck/suck-4.3.3.ebuild
new file mode 100644
index 000000000000..684bae61e05e
--- /dev/null
+++ b/net-nntp/suck/suck-4.3.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Grab news from a remote NNTP server and feed them to another"
+HOMEPAGE="https://lazarus-pkgs.github.io/lazarus-pkgs/suck.html"
+SRC_URI="https://github.com/lazarus-pkgs/suck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl ssl"
+
+COMMON_DEPEND="sys-libs/gdbm:=
+	ssl? ( dev-libs/openssl:0= )"
+
+DEPEND="${COMMON_DEPEND}
+	sys-libs/db
+	perl? ( dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	net-nntp/inn"
+
+PATCHES=( "${FILESDIR}/${PV}-fputs.patch" )
+
+src_prepare() {
+	default
+
+	# Fix paths to the locations in Gentoo
+	sed -i \
+		-e 's:/usr/bin/rnews:/usr/$(get_libdir)/news/bin/rnews:' \
+		-e 's:/var/lib/news/history:/var/spool/news/db/history:' \
+		suck_config.h || die "path adaption sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	use ssl || sed -i -e 's/^SSL_/#SSL_/' Makefile.in || die "ssl sed failed"
+	use perl || sed -i -e 's/^PERL_/#PERL_/' Makefile.in || die "perl sed failed"
+
+	econf
+}
+
+src_compile() {
+	emake phrases.h
+	emake all lpost
+}
+
+src_install() {
+	dobin lmove lpost rpost suck testhost
+	doman man/*
+	dodoc CHANGELOG CONTENTS README*
+	docinto java
+	dodoc java/*
+	docinto perl
+	dodoc perl/*
+	docinto sample
+	dodoc sample/*
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a1ef4db6a235..0652bc60fcb5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 85d52aaa7191..49c9ddd1f4cb 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,9 +1,11 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.0.1.tar.gz 1656058 BLAKE2B 685e5a7813f32e276a1cdd179c5d518c670e323b185270cce7368aa2f2c7b80a77076280d8604609d184e9e94776067050e65b722b20f1efdd5a4c3caba397c3 SHA512 0b7de89d37334c0c9867b65362c8664547a5b1f840446c071259cdd00848e9aab9ea3c160665a5d72efe9f50322f3c2e45f01035671b8eb4f341cb53abdd8452
 DIST cpuminer-opt-3.8.0.tar.gz 1656474 BLAKE2B 145126762aeb245d042c1a208b60fd4727b450b77ab2585043b13b82b61b947dea0db2489de08e619dcd54b8eb1ec429f83f21ce1e49c34e140f585eccdd14f0 SHA512 c610d58236c5d84a850e68e172d3fdfede5b86aefa8ff09890ffc43d47efd4754aeb345f6b5fd48b6afcbc771541418f6fde1c9e621ad89c17d2dad4c16151f9
+DIST cpuminer-opt-3.8.1.1.tar.gz 1657624 BLAKE2B d408d3da10ea6c0d91d0aa7097e52fb233f9a3c8f921c638899d18f99c1b1522c2d627d6869af6e650929da251f2bf6df87882ffb7169ac5a5633608d9399565 SHA512 f41e175492514c96d088c7f11aec88796b63d91aa8496794fac2222db24090685b4c76439bff39b5c074a5527494dfa8d1be6611b0040f5fca6436a80ea933f4
 DIST cpuminer-opt-3.8.1.tar.gz 1654969 BLAKE2B b8805e748b71d3c7049d5c97dd74a51da55f88c697963c938a372ff5ff0ac72fcabce81b86f373fdca2dcef7393bba3f53c049bc30dfbd02691ff5e9630cf5bc SHA512 800edbecf5edb0902adc54480a4984602c19087d55675212832ce24df109b7d66544d9db78112a04c3c374521737e2680013d354b6ff8195a17abeb213e2a556
 EBUILD cpuminer-opt-3.8.0.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.0.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
+EBUILD cpuminer-opt-3.8.1.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-9999.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild
new file mode 100644
index 000000000000..a1f4a660f6b9
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	curl? ( >=net-misc/curl-7.15[ssl] )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto $(use_with curl)
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index c0ce413d5eab..9adc778920ee 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,6 +1,5 @@
-AUX noninteractive-build.patch 513 BLAKE2B cc4042e4f82541eef27584d0e3122b217c5a8e29fa718442f64df0c85d85fb58c6712b51b8c94a4c34baac6106f5e3e27a86f9c1e62402a65434f4b827d7f419 SHA512 c4542db2557bfff82d7494b2e0540f485cc1a20c649eae0435f7d9fcdaf6b094c27cf91a2ce7fe1fc275a2774a846a5341b0cd7b96e5d1fe5946a7d2a0cca51d
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
-DIST pybitmessage-0.6.2.tar.gz 1053815 BLAKE2B 28ed1a836771318f59986532aaa8b87c0c6d195988f02fc977c3b21b423145cc5b732bc1d4ed9978c26c0edb1c040844c9c00ec4db6418ae1e938bae335ed118 SHA512 4aaa0f6b1cc04de01154bb5c90416901e51abb4465c62269ab07abb7da980ac07f2f548ae7a3780da9f3efe89d3b841b004996c5e33bc2638e58efcbecc8baef
+DIST pybitmessage-0.6.3.2.tar.gz 1118048 BLAKE2B 56245d2b6126fd0b325f20a829d4aa3d89d74fed48863ba236c74b33b074be5c88fd7d70bd08a9b4a1499aaf7e414f55c2f5ca93dca5769eaaf90c2082bc0cac SHA512 57bdbf10417973b4414f1a184b375a2dd6db1a07a6bc5596b5d256589eeae3c7343692be0f0aa681244c550d2b2d91773d9383d97c56eb48562d8099908c0261
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.2-r2.ebuild 1716 BLAKE2B b4445af49eb0f40bd7a3425031ffa94ee88ebf5e00a48db22a7ce13fd99a403af909d4ff24bb8db1510a9d6744d8c3553273e13a95c2e3b60c0e7f547b5f7188 SHA512 e77e1c10e68a1e622137f7a1d312b609a2c28c8b29995393534203484023b97e8aa948dd33c3eeaaa74989201f1a65a5724d1b748d7913d74ac2752b22c18ee9
+EBUILD pybitmessage-0.6.3.2.ebuild 1621 BLAKE2B 6260d3d042de67118062754a877486386748d84d58a451b7e465a04ab1041533254c180d7cdcddb63a410c7f73878a83fba01e4a536e0837b0185bc567e3e858 SHA512 2aa6c1862601a86cfc543fb331baf6959dff52799d969abe7c0b9ad36a40c1bf67ada9869e69196ed7f39879c3af0d318ccb4823d33830ab30bac4b5c037f293
 MISC metadata.xml 1125 BLAKE2B 91ce6c7afd6e759f0f7d5a049653cf970f7cf28d5061e9ccc9866dbf88c5a60cb3e518564ceb01551a830c419cdf47f905a4a744a73205725f50d966d022fe54 SHA512 04950f304ca8c087baa7dc370ff08da07bae555481798848d2ddddda33de318be83fc6a648428ff72419af857dd9bd1bdf0b43866b40e149f33dd834e9c7d9cb
diff --git a/net-p2p/pybitmessage/files/noninteractive-build.patch b/net-p2p/pybitmessage/files/noninteractive-build.patch
deleted file mode 100644
index 889711a7dce2..000000000000
--- a/net-p2p/pybitmessage/files/noninteractive-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Temporary workaround for a build system that wants you to press
-"Return" interactively.
-
-https://github.com/Bitmessage/PyBitmessage/issues/993
-
-diff --git a/setup.py b/setup.py
-index 2c769a6..166ab14 100644
---- a/setup.py
-+++ b/setup.py
-@@ -163,7 +163,7 @@ if __name__ == "__main__":
-         print "Press Return to continue"
-         try:
-             nothing = raw_input()
--        except NameError:
-+        except EOFError,NameError:
-             pass
- 
-     here = os.path.abspath(os.path.dirname(__file__))
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
deleted file mode 100644
index 10ef7b3f1fbb..000000000000
--- a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-# See https://github.com/Bitmessage/PyBitmessage/pull/952 for
-# why ipv6 is needed at the moment.
-PYTHON_REQ_USE="ipv6,sqlite"
-
-inherit distutils-r1 gnome2-utils
-
-MY_PN="PyBitmessage"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="P2P communications protocol"
-HOMEPAGE="https://bitmessage.org/"
-SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl ncurses opencl sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-
-# Some of these can be determined from src/depends.py.
-# The sound deps were found in src/bitmessageqt/__init__.py.
-# And src/openclpow.py imports numpy directly, so throw that in too.
-#
-# All of the dependencies that are behind USE flags are detected
-# and enabled automagically, so maybe it would be better if we
-# required them unconditionally?
-RDEPEND="${DEPEND}
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
-	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
-	opencl? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyopencl[${PYTHON_USEDEP}]
-	)
-	sound? ( || (
-		media-sound/gst123
-		media-sound/alsa-utils
-		media-sound/mpg123
-	) )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/noninteractive-build.patch")
-
-src_install () {
-	distutils-r1_src_install
-	dodoc README.md
-
-	# The man page is not installed because it's basically empty.
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2.ebuild
new file mode 100644
index 000000000000..5dc0e77b7621
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+# See https://github.com/Bitmessage/PyBitmessage/pull/952 for
+# why ipv6 is needed at the moment.
+PYTHON_REQ_USE="ipv6,sqlite"
+
+inherit distutils-r1 gnome2-utils
+
+MY_PN="PyBitmessage"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="P2P communications protocol"
+HOMEPAGE="https://bitmessage.org/"
+SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ncurses opencl sound"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+
+# Some of these can be determined from src/depends.py.
+# The sound deps were found in src/bitmessageqt/__init__.py.
+# And src/openclpow.py imports numpy directly, so throw that in too.
+#
+# All of the dependencies that are behind USE flags are detected
+# and enabled automagically, so maybe it would be better if we
+# required them unconditionally?
+RDEPEND="${DEPEND}
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] )
+	opencl? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyopencl[${PYTHON_USEDEP}]
+	)
+	sound? ( || (
+		media-sound/gst123
+		media-sound/alsa-utils
+		media-sound/mpg123
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install () {
+	distutils-r1_src_install
+	dodoc README.md
+
+	# The man page is not installed because it's basically empty.
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 16ca8efc3d30..99031c372b54 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 90e0b991dfa2..8e12d780ffa2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,13 +8,13 @@ DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81
 DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.8.3.tar.gz 2043861 BLAKE2B 7da143e783cf443f148389947361f0116428c694d68451b6a9c684547d7dbdc89b25b43bad72f94337d143a2c1c185776a12008d969f985605e2601eb58ccd11 SHA512 6118ccbcfe07d96c2cce1a78c30db9c428f8b64e64fc3f5660392a501ecbaefdc5b10bea2f65c6bb3d8e7763b3e17db4ee34e13f689474f8243b52250e212600
+DIST haproxy-1.8.4.tar.gz 2049789 BLAKE2B 30c5c0ed9e149d0cc3ec418dd737945c0646ff661747c8d0c27235ee9302ff85a0f3ea0a078837e24966c3c7f7dbc092c411bf1ee36a27961aaed8ce485fcdea SHA512 618a03062e832260249610d90b3a9ebd171d8a1b0921903f5f3447484bab552ef9399e431417cf3cf4927ac345fe4d2a345ee8513e209b22e0700f5b1edbf86c
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
 EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
-EBUILD haproxy-1.6.9999-r2.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
-EBUILD haproxy-1.7.10.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
-EBUILD haproxy-1.7.9999-r2.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
+EBUILD haproxy-1.7.10.ebuild 4631 BLAKE2B 1cbf41b86b2c3ca27fd73ace146cf9fc2956f87e8123c8d6145f28a06604fc1353b2a3f810ba503589d0779da4e4674e76abd0764eb7a1c8f895e160b289bfda SHA512 35ca7b350ad044b0d39f34c0ebc93ffc53e12daaea8d9d0b6cebd15f4dc590e5b8523bf7121cf7181759ce2f24e3813066c7372b062093674f19aa312830f1ab
 EBUILD haproxy-1.8.3.ebuild 4890 BLAKE2B 6fbd57c19ba5f561eedc6d03de1bb0128a8c9071e07a5a26195af97807186bfb9f0c69c7c1f4ef2b1164fa5ceea9a5d0fa45bcb3e1df1b299c9ca360d52a8601 SHA512 aa85af8f52c8c56b2a35a5dda1d9e114db4f14044336da5284d31635ec580610c97f4c91f66cd45814386b063f682378ce2a8bf262f6adf68b5bfe29a00f08a4
-EBUILD haproxy-1.8.9999.ebuild 4890 BLAKE2B 6fbd57c19ba5f561eedc6d03de1bb0128a8c9071e07a5a26195af97807186bfb9f0c69c7c1f4ef2b1164fa5ceea9a5d0fa45bcb3e1df1b299c9ca360d52a8601 SHA512 aa85af8f52c8c56b2a35a5dda1d9e114db4f14044336da5284d31635ec580610c97f4c91f66cd45814386b063f682378ce2a8bf262f6adf68b5bfe29a00f08a4
+EBUILD haproxy-1.8.4.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
+EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r2.ebuild b/net-proxy/haproxy/haproxy-1.6.9999-r2.ebuild
deleted file mode 100644
index 236fc4ec8bd0..000000000000
--- a/net-proxy/haproxy/haproxy-1.6.9999-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	dosbin haproxy-systemd-wrapper
-	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.7.10.ebuild b/net-proxy/haproxy/haproxy-1.7.10.ebuild
index 38e5fbe73044..6a08f308b881 100644
--- a/net-proxy/haproxy/haproxy-1.7.10.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.10.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
 	EGIT_BRANCH=master
diff --git a/net-proxy/haproxy/haproxy-1.7.9999-r2.ebuild b/net-proxy/haproxy/haproxy-1.7.9999-r2.ebuild
deleted file mode 100644
index 6c77e7061acc..000000000000
--- a/net-proxy/haproxy/haproxy-1.7.9999-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	dosbin haproxy-systemd-wrapper
-	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.8.4.ebuild b/net-proxy/haproxy/haproxy-1.8.4.ebuild
new file mode 100644
index 000000000000..44131da836d2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.8.9999.ebuild b/net-proxy/haproxy/haproxy-1.8.9999.ebuild
deleted file mode 100644
index 7827f2e5bddc..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.9999.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
new file mode 100644
index 000000000000..44131da836d2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c9de77098067..88fb52f99b02 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index ffb5d317b591..9f8b6741776e 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,12 +1,10 @@
-AUX i2p-0.9.30-add_libs.patch 1129 BLAKE2B 3de0a26134a9d3cec0a15bda0348adde8c1b4a7854853a201c44024e30797ba0cbc24aa688904b2d2f24b23f056799d862de1606932d283c80e509f94a0af29e SHA512 d5f746c5f249f81e39dc4f845bdbb8c6791efa681d8446a3ce2ff01f0febbfc93b4519b47b33ba0a63acf7788fb44e7cdfe100af4136956aeb19b162c015e247
-AUX i2p-0.9.30.initd 1165 BLAKE2B 05f5f19c819bd0d2ff1f902dcf01951b9973a5a78efc94f512bc68fcf430d2cc132522f21c46c174b6ca0f143834e76b7c8028696072904b7cc952df6aed4cc4 SHA512 1a18ab066ccb0ce190d7d26b8928fab260e8e76333145f1e5099bdc09891c517f6ae46c4f93b9559bce8427022698e56a8333360572a398fba2bd582ac3a77a8
-AUX i2p-0.9.30.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
 AUX i2p-0.9.31-add_libs.patch 1129 BLAKE2B 3de0a26134a9d3cec0a15bda0348adde8c1b4a7854853a201c44024e30797ba0cbc24aa688904b2d2f24b23f056799d862de1606932d283c80e509f94a0af29e SHA512 d5f746c5f249f81e39dc4f845bdbb8c6791efa681d8446a3ce2ff01f0febbfc93b4519b47b33ba0a63acf7788fb44e7cdfe100af4136956aeb19b162c015e247
 AUX i2p-0.9.31.initd 1107 BLAKE2B fdfda220dd31fd2f49c1b92e9d1cd64ff3787a9f94031fe1dc54fcbceaedf42a863911b66ae97a70c90ba14ef2fc92029ef88e7f28ddb8e263986d2e174b684d SHA512 78d68722d274f59b79423b2e7ca9f541c18ee0f23a9e4c8e15bec6f84fcad5fb4af3fb3b0708b38d5e0accb304e2302793bbbc667f6bfd84d5488dade560d55f
 AUX i2p-0.9.31.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
-DIST i2psource_0.9.30.tar.bz2 28035272 BLAKE2B 1e1b14b3126b8fd73489ddc99f7f83ea1b501d7c7ce31e11bbdb8e4a4fe33e06bf906277b7f10e912bdf54de8511c3c3d0eccf2607dcfaacb36ed89875425471 SHA512 59819125fd6aca9fd5ae25a424e78f25bd2e8f9ba995256f9bf7c1fb2a99cebf26a1dcaf1f202276f5656b4582c4b86fdcf9d23011f809b99764b0023fd243f8
+AUX i2p.init 489 BLAKE2B f7c484713fa043f1db991e95d58f0d184c0d49062e807671f6aca2c7489ad52e072e2d0f5b6c5b666cbda77764e90da6506b7fd0f7a5b2fb34bbfc0b3c96da53 SHA512 3b9b2bce4359f0ba32f690f7922ed95ccaa133b1cff2e5a1d6bfc91a380757f79f03e8a4966259d19ec888e6db468825e6a9d0d1acdba9d38c81a86b99c4229a
+AUX i2p.service 244 BLAKE2B c5532fc4554d738e71f820ece48101452d1e1ae9ddf2280808e215037d73a15f4ec65d77eaafab962e280a48666e26b45c74849896aab6c4c06b6dde15ecb013 SHA512 409438616aa655630e0e3256052fee831a8f68728b67eef077f5ea303d6dcccb06bbb549af5ee1023ef60ee6fa264d0170d991dbbdc0cc70335b030c73a7e6c8
 DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
-EBUILD i2p-0.9.30-r1.ebuild 4295 BLAKE2B cfc6c721d8fe72621cb680694249632137ff8785f6554c049ed9fe662b480632ce4adfbf0673dfafc289b61dac161c7b90dad58bd6ae5203c15f65c42d5da931 SHA512 ed0a65a028e644884a52cb6928365795cd43f00e8a5bcbc8efd8ecf913717d649895f30153527b8c5a6038b379ae8a08846f2de049dbefa3e9b6fcdb90fbc39e
-EBUILD i2p-0.9.30.ebuild 4382 BLAKE2B 006bf71e3f7bbfdff49ca7047275bc39ca4122e21a9c52a9de73a10bf801d620f141e118baa26e429fff059cfb704f749b805e0e25deeaef74b89e6bc6545351 SHA512 6be64c8d438ae098909040b9b7ce0fe4dde588cc11e091731459f0c761240e23981bc7ffdb91b89296cccc2cb50f686e5bf1a70f3384ffc895055f2029d637be
+DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
 EBUILD i2p-0.9.31.ebuild 4295 BLAKE2B cfc6c721d8fe72621cb680694249632137ff8785f6554c049ed9fe662b480632ce4adfbf0673dfafc289b61dac161c7b90dad58bd6ae5203c15f65c42d5da931 SHA512 ed0a65a028e644884a52cb6928365795cd43f00e8a5bcbc8efd8ecf913717d649895f30153527b8c5a6038b379ae8a08846f2de049dbefa3e9b6fcdb90fbc39e
+EBUILD i2p-0.9.33.ebuild 4227 BLAKE2B 8a0270c41a8c3ca6d727cf01eb1daf58aba144b384039bb131d70d18f18f79c9baabed9d2f21bf0a10bc0a4843ff074f94a0ba33c903540717e13d5fe4f59460 SHA512 a3143b919829a2e67ff8429965b90a6dbd3fa8f81562cbf0512fdc7123c89b028bd24878d93a7abb5d40e4ae2f547b740d37b809569fefd93418cbb7c6eee025
 MISC metadata.xml 987 BLAKE2B 9c6c40e02306f38304290cc90b0b928381a7ff7e832c684d213e72ae7359cb5175cb64e7445509f9626ef7460af88e16bdda5177d482ab9b0cd3e5fc89a422fb SHA512 0ef1206196a76c1f53b7c205fee1a9a49cb6441d53727901a1a203ca1845d4907d609218cbfe0502692de2eeef1c75eac91fb9544fa6b81f55ac146452ab6242
diff --git a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch
deleted file mode 100644
index 0ea3149a3628..000000000000
--- a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config
---- a/installer/resources/wrapper.config	2016-11-07 11:42:42.503030002 +0100
-+++ b/installer/resources/wrapper.config	2016-11-07 11:43:11.873031594 +0100
-@@ -61,12 +61,18 @@
- # Be sure there are no other duplicate classes.
- #
- wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
-+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
-+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
-+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
-+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
-+wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar
- #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
- # wrapper.java.classpath.2=%CLASSPATH%
- 
- # Java Library Path (location of Wrapper.DLL or libwrapper.so)
- wrapper.java.library.path.1=$INSTALL_PATH
- wrapper.java.library.path.2=$INSTALL_PATH/lib
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper
- 
- # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
- wrapper.java.additional.auto_bits=TRUE
diff --git a/net-vpn/i2p/files/i2p-0.9.30.initd b/net-vpn/i2p/files/i2p-0.9.30.initd
deleted file mode 100644
index 216d19474cb8..000000000000
--- a/net-vpn/i2p/files/i2p-0.9.30.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-HOME="/var/lib/i2p"
-USER_HOME="$HOME"
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"
-INSTALL_PATH="/usr/share/i2p"
-I2P="$INSTALL_PATH"
-I2P_CONFIG_DIR="$USER_HOME/.i2p"
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR"
-I2PTEMP="$SYSTEM_java_io_tmpdir"
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log"
-PIDFILE="/var/run/i2p.pid"
-WRAPPER_CMD="$I2P/i2psvc"
-WRAPPER_CONF="$I2P/wrapper.config"
-
-start() {
-	ebegin "Starting I2P"
-	start-stop-daemon --start -b -m -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -- -c $WRAPPER_CONF wrapper.daemonize=FALSE wrapper.syslog.ident=i2p wrapper.java.command="$JAVABINARY" wrapper.name=i2p wrapper.displayname="I2P Service" wrapper.statusfile="$I2P_CONFIG_DIR/i2p.status" wrapper.java.statusfile="$I2P_CONFIG_DIR/i2p.java.status" wrapper.logfile="$LOGFILE"
-	sleep 1
-	[ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ]
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping I2P"
-	start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P
-	eend $?
-}
-
diff --git a/net-vpn/i2p/files/i2p.init b/net-vpn/i2p/files/i2p.init
new file mode 100644
index 000000000000..bbc73b470053
--- /dev/null
+++ b/net-vpn/i2p/files/i2p.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+CONFIG_PATH="/var/lib/i2p/.i2p"
+INSTALL_PATH="/usr/share/i2p"
+WRAPPER_CONF="$INSTALL_PATH/wrapper.config"
+
+command=wrapper
+command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p wrapper.logfile=$CONFIG_PATH/wrapper.log"
+command_background=true
+command_progress=true
+command_user=i2p
+pidfile="/var/run/i2p.pid"
+retry='SIGTERM/20 SIGKILL/20'
diff --git a/net-vpn/i2p/files/i2p-0.9.30.service b/net-vpn/i2p/files/i2p.service
index ccbadbd4d167..ccbadbd4d167 100644
--- a/net-vpn/i2p/files/i2p-0.9.30.service
+++ b/net-vpn/i2p/files/i2p.service
diff --git a/net-vpn/i2p/i2p-0.9.30-r1.ebuild b/net-vpn/i2p/i2p-0.9.30-r1.ebuild
deleted file mode 100644
index d64a1c13eda1..000000000000
--- a/net-vpn/i2p/i2p-0.9.30-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network."
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="+ecdsa nls"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/bcprov:1.50
-	dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
-	nls? ( >=sys-devel/gettext-0.19 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
-	ecdsa? (
-		|| (
-			dev-java/icedtea:7[-sunec]
-			dev-java/icedtea:8[-sunec]
-			dev-java/icedtea-bin:7
-			dev-java/icedtea-bin:8
-			dev-java/oracle-jre-bin
-			dev-java/oracle-jdk-bin
-		)
-	)
-	!ecdsa? ( >=virtual/jre-1.7 )"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-I2P_ROOT='/usr/share/i2p'
-I2P_CONFIG_HOME='/var/lib/i2p'
-I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p"
-
-RES_DIR='installer/resources'
-
-PATCHES=(
-	"${FILESDIR}/${P}-add_libs.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
-		"${RES_DIR}/clients.config" || die
-
-	# we do it now so we can resolve path after
-	default
-
-	# replace paths as the installer would
-	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
-		"${RES_DIR}/"{eepget,i2prouter,runplain.sh}  || die
-	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die
-	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
-		"${RES_DIR}/"{i2prouter,runplain.sh} || die
-	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# This is ugly, but to satisfy all non-system .jar dependencies, jetty
-	# would need to be packaged. It would be too large a task
-	# for an unseasoned developer. This seems to be the most pragmatic solution
-	java-pkg_jarinto "${I2P_ROOT}/lib"
-	local i
-	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
-		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
-		sam standard streaming systray addressbook; do
-		java-pkg_dojar lib/${i}.jar
-	done
-
-	# Set up symlinks for binaries
-	dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc"
-	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
-	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto "${I2P_ROOT}"
-	insinto "${I2P_ROOT}"
-	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	dodoc -r licenses
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/${P}.initd" i2p
-	systemd_newunit "${FILESDIR}/${P}.service" i2p.service
-
-	# setup user
-	keepdir "${I2P_CONFIG_DIR}"
-	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
-}
-
-pkg_postinst() {
-	elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten."
-	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-
-	if use !ecdsa
-	then
-		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
-		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
-		ewarn
-		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
-		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
-		ewarn 'as the one you built with.'
-	fi
-}
diff --git a/net-vpn/i2p/i2p-0.9.30.ebuild b/net-vpn/i2p/i2p-0.9.30.ebuild
deleted file mode 100644
index 54eab04b7fe1..000000000000
--- a/net-vpn/i2p/i2p-0.9.30.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"
-
-inherit eutils java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network."
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="dev-java/bcprov:1.50
-	dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/java-service-wrapper:0"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	dev-libs/gmp:0
-	nls? ( >=sys-devel/gettext-0.19 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
-	|| (
-		dev-java/icedtea:7[-sunec]
-		dev-java/icedtea:8[-sunec]
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:8
-		dev-java/oracle-jre-bin
-		dev-java/oracle-jdk-bin
-	)"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-I2P_ROOT='/usr/share/i2p'
-I2P_CONFIG_HOME='/var/lib/i2p'
-I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p"
-
-RES_DIR='installer/resources'
-
-PATCHES=(
-	"${FILESDIR}/${P}-add_libs.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	enewgroup i2p
-	enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	java-ant_rewrite-classpath
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
-		"${RES_DIR}/clients.config" || die
-
-	# we do it now so we can resolve path after
-	default
-
-	# replace paths as the installer would
-	sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
-		"${RES_DIR}/"{eepget,i2prouter,runplain.sh}  || die
-	sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die
-	sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
-		"${RES_DIR}/"{i2prouter,runplain.sh} || die
-	sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# This is ugly, but to satisfy all non-system .jar dependencies, jetty
-	# would need to be packaged. It would be too large a task
-	# for an unseasoned developer. This seems to be the most pragmatic solution
-	java-pkg_jarinto "${I2P_ROOT}/lib"
-	local i
-	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
-		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
-		sam standard streaming systray; do
-		java-pkg_dojar lib/${i}.jar
-	done
-
-	# Set up symlinks for binaries
-	dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc"
-	dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter
-	dosym "${I2P_ROOT}/eepget" /usr/bin/eepget
-
-	# Install main files and basic documentation
-	exeinto "${I2P_ROOT}"
-	insinto "${I2P_ROOT}"
-	doins blocklist.txt hosts.txt *.config
-	doexe eepget i2prouter runplain.sh
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	dodoc -r licenses
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/${P}.initd" i2p
-	systemd_newunit "${FILESDIR}/${P}.service" i2p.service
-
-	# setup user
-	keepdir "${I2P_CONFIG_DIR}"
-	fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
-}
-
-pkg_postinst() {
-	elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten."
-	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-	elog
-
-	ewarn "The router will migrate the jetty.xml for each Jetty website to the new Jetty 9 setup during startup."
-	ewarn "This should work for recent, unmodified configurations but may not work for modified or"
-	ewarn "very old setups. Verify that your Jetty website works after upgrading, and contact i2p"
-	ewarn "developers on IRC if you need assistance"
-	ewarn
-	ewarn "Several plugins are not compatible with Jetty 9 and must be updated if you use them."
-	ewarn "New updated version avaliable: i2pbote 0.4.6, zzzot 0.15.0."
-	ewarn "No new version so far: BwSchedule 0.0.36, i2pcontrol 0.11."
-}
diff --git a/net-vpn/i2p/i2p-0.9.33.ebuild b/net-vpn/i2p/i2p-0.9.33.ebuild
new file mode 100644
index 000000000000..cf3d2654ed13
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.33.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="+ecdsa nls"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CP_DEPEND="dev-java/bcprov:1.50
+	dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CP_DEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:0
+	nls? ( >=sys-devel/gettext-0.19 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="${CP_DEPEND}
+	ecdsa? (
+		|| (
+			dev-java/icedtea:8[-sunec]
+			dev-java/icedtea-bin:8
+			dev-java/oracle-jre-bin
+			dev-java/oracle-jdk-bin
+		)
+	)
+	!ecdsa? ( >=virtual/jre-1.7 )"
+
+EANT_BUILD_TARGET="pkg"
+JAVA_ANT_ENCODING="UTF-8"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	enewgroup i2p
+	enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
+}
+
+src_prepare() {
+	# as early as possible to allow generic patches to be applied
+	default
+
+	java-ant_rewrite-classpath
+
+	java-pkg-2_src_prepare
+
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties || die
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties || die
+	fi
+
+	# avoid auto starting browser
+	sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
+		'installer/resources/clients.config' || die
+
+	# generate wrapper classpath, keeping the default to be replaced later
+	i2p_cp='' # global forced by java-pkg_gen-cp
+	java-pkg_gen-cp i2p_cp
+	local lib cp i=2
+	for lib in ${i2p_cp//,/ }
+	do
+		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+	done
+
+	# add generated cp and hardcode system VM
+	sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
+		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+		-i 'installer/resources/wrapper.config' || die
+
+	# replace paths as the installer would
+	sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
+		-e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
+		-e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
+		-i 'installer/resources/'{eepget,i2prouter,runplain.sh,wrapper.config} || die
+}
+
+src_install() {
+	# cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# we remove system installed jar and install the others
+	rm lib/{jrobin.jar,wrapper.jar} || \
+		die 'unable to remove locally built jar already found in system'
+	java-pkg_dojar lib/*.jar
+
+	# Set up symlinks for binaries
+	dodir /usr/bin
+	# workaround portage absolute symlink limitation
+	dosym '../share/i2p/i2prouter' '/usr/bin/i2prouter'
+	dosym '../share/i2p/eepget' '/usr/bin/eepget'
+
+	# Install main files and basic documentation
+	exeinto '/usr/share/i2p'
+	insinto '/usr/share/i2p'
+	doins blocklist.txt hosts.txt *.config
+	doexe eepget i2prouter runplain.sh
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.init" i2p
+	systemd_dounit "${FILESDIR}/i2p.service"
+
+	# setup user
+	keepdir '/var/lib/i2p/.i2p'
+	fowners i2p:i2p '/var/lib/i2p/.i2p'
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
+	elog 'I2P can be configured through the web interface at http://localhost:7657/console'
+
+	if use !ecdsa
+	then
+		ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and'
+		ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.'
+		ewarn
+		ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as"
+		ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation'
+		ewarn 'as the one you built with.'
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3fe488a97ee8..7c74a9fb141b 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
index 203a56a50bae..e6cf93a8ccb6 100644
--- a/net-wireless/yatebts/Manifest
+++ b/net-wireless/yatebts/Manifest
@@ -2,9 +2,7 @@ AUX yatebts-4.0.0-dont-mess-with-cflags.patch 434 BLAKE2B 132c4fd0fbd52257d66265
 AUX yatebts-5.0.0-gcc6.patch 1125 BLAKE2B 20d2fa8431238c888d5841c6895a84b7fd2b914f6fdc22238b12f78b1758ffeb810cf0d37bb917439b6098c78f7fd141fbf2e6442eed5da4fb2a2a7b34afc4d8 SHA512 e2a575d1e4a31f884b2af95439ce077a811d655cfcb646b20652638a353a9e730999134128003829a538b880ca07ea23e125a9b21073e46a7aae05b1eeb9baf1
 AUX yatebts-bladeRF-transceiver_revert_init_order.patch 2636 BLAKE2B ac1175836fdf844c93075003231d2a3092ad047a52b7bea5130e3bac622a5bc1b16aae85cc2cdda919adc2e031affc719752503c80e94e297314dbbb46a61150 SHA512 30e59e6e6f565c74d2ed15c70aee09c783cc710701de3b2d5e2f6530486dcde0dc63b03e4475d8e525e83e6612b13015e5d901e76061394afb6179987f3efa80
 AUX yatebts-sgsnggsn-inetutils-hostname-fix.diff 487 BLAKE2B f7d2b114259363c4eba833ac74185545678bba67db709abf2e097aec308e3aba1312ca6f35a78ab3e6ebc2f422ab397c81806b7e7ebdd78f3f27b1e11164205e SHA512 55a9ad165e00e8c9b5556c1f29e244286d3cdf425cdb94f1a3e49c1d27962c302bedbbec37e5ce4ce44867b7bd17587887dfe6cfd5fabffdba32066799bd86c6
-DIST yate-bts-4.0.0-1.tar.gz 3311644 BLAKE2B 9367179568970d968dc9556a7397535ecff207ab824f7f6f4d4ce4c0ad7811bcf9eb88b4ab981c2837db641d16afc811fa2d1ccb718f95a0a23e1a02d78b4b89 SHA512 802e765fb5dd1702b71c6e7a68f671dcfb82431d7c6defc4fea1494558b8824c0a4b61dc9b7b787bc8badf09752b12efb531d7435d6d32db60edd96fe32f850d
-DIST yate-bts-5.0.0-1.tar.gz 3352942 BLAKE2B 38b0449ab78fc97d91c9b695bbd216c7bd459cd84bf517ebce12797abf154a736d03e3ea1517c740064b3c487599b2cbb7559590cc752698042eb7a6bdca0174 SHA512 d893072f715f77dfe53e2d0a4332a02ffa441afb995a7280201d4ffb509b51d16888c961d753517f471915efdf03ec329707cd9d54f8bde6ecb9b2405d602939
-EBUILD yatebts-4.0.0-r3.ebuild 1167 BLAKE2B d3ef87e5fc48d9a9c702a1974d9cd17168f9245fa6058184228907aad52f4956aab30067b3225d8ddc97dd6efc4c5fd49daf173a444902fa27ee3e2ae35fd69c SHA512 d1c0265d91797fcf917d76d8b7bf39a422e67a136bff6d79e73163598093e6faaea7203635ba3fb89ae083948564aa42eb3ba61500a80d2358d04704f16d34a2
-EBUILD yatebts-5.0.0.ebuild 1253 BLAKE2B faeb40f3ae93fe239af54ea6b22e52fbb398e0a5dcae33a55cae31e23eebab36f59d0790e6fcacf596cbcfcdf5f2a5b52ed4a6b942d2fdc6409eead8c8a58d9b SHA512 009a384d5ac89b9d01ac7e111fe0f162e5633804904495829c54bcb3f3010f92d1fa98cd41eb535c72dc9731ad1ee9270f6ff7e22d9c2b5d86c39512df3cefaa
-EBUILD yatebts-9999.ebuild 1133 BLAKE2B acc329d7fad9df427d8ce26cc7ced043e563ebc430ad3600bab12c40f1da260ccb1c153bee693002bcd0cdc03d6da935635c6959370f71f7cbaa6bb68aec46e2 SHA512 e4b6e3754ea7cd06ffa67e20d4340eda83a7eb1c79c15b576d3051a60692f054e724825fcb46d7adf91ceda692e1a04755444f83381731bc35d93670da16cfdb
+DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7
+EBUILD yatebts-6.0.0.ebuild 1178 BLAKE2B 6f5644dcff8c94e5383bd60450389f71f4f212cef8d1633d99fbe7d5bf8c5840aef5a8ca6868bbdc3eb06d6ed38fbca9458313474fb43594b2cf1d9a46796f3d SHA512 aa9a26f89c5322e7ddacf2d31b7789d07ffee26c770a7b3380223bfe3308469fdbd744d04ada8a7ada8b9cb918d9fa7b1099757254f6b3eaf7bbe8060ffa4484
+EBUILD yatebts-9999.ebuild 1178 BLAKE2B 6f5644dcff8c94e5383bd60450389f71f4f212cef8d1633d99fbe7d5bf8c5840aef5a8ca6868bbdc3eb06d6ed38fbca9458313474fb43594b2cf1d9a46796f3d SHA512 aa9a26f89c5322e7ddacf2d31b7789d07ffee26c770a7b3380223bfe3308469fdbd744d04ada8a7ada8b9cb918d9fa7b1099757254f6b3eaf7bbe8060ffa4484
 MISC metadata.xml 459 BLAKE2B e4a03862c2298c785666d3a38a642840831781f99a8e0bf196d8a91012ccbbae187b1c9b5e7d0c4d33de68bf06929ecfa4929431b551da759f1fe88be17aba1a SHA512 e5cb7b858684817bfc6f4ce03dc6ad7c3743d649d96dc8bc2c68aa663a834593cb81081d72e7775bdafed38c932684985e37a7af82c39bd38d72e01dd8b30b60
diff --git a/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild b/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
deleted file mode 100644
index 0f975f7cca82..000000000000
--- a/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="http://www.yatebts.com/"
-ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-
-RDEPEND="
-	=net-voip/yate-5.4.0-r1:=[gsm]
-	bladerf? ( net-wireless/bladerf:= )
-	uhd? ( net-wireless/uhd )
-	virtual/libusb:1"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}4/yate-bts-${PV}-1.tar.gz"
-	S="${WORKDIR}/yate-bts"
-fi
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
-	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	epatch "${FILESDIR}"/${PN}-bladeRF-transceiver_revert_init_order.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable rad1) \
-		$(use_enable usrp1) \
-		$(use_enable uhd) \
-		$(use_enable bladerf) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41)
-
-}
diff --git a/net-wireless/yatebts/yatebts-5.0.0.ebuild b/net-wireless/yatebts/yatebts-5.0.0.ebuild
deleted file mode 100644
index fe1cf3ba12c8..000000000000
--- a/net-wireless/yatebts/yatebts-5.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="http://www.yatebts.com/"
-ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-
-RDEPEND="
-	=net-voip/yate-5.5.0-r1:=[gsm]
-	bladerf? ( net-wireless/bladerf:= )
-	uhd? ( net-wireless/uhd )
-	virtual/libusb:1"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}5/yate-bts-${PV}-1.tar.gz"
-	S="${WORKDIR}/yate-bts"
-fi
-
-src_prepare() {
-	replace-flags -ggdb -g
-	replace-flags -ggdb3 -g
-	replace-flags -ggdb2 -g
-	replace-flags -ggdb1 -g
-	#epatch "${FILESDIR}"/${PN}-4.0.0-dont-mess-with-cflags.patch
-	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable rad1) \
-		$(use_enable usrp1) \
-		$(use_enable uhd) \
-		$(use_enable bladerf) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41)
-
-}
diff --git a/net-wireless/yatebts/yatebts-6.0.0.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild
new file mode 100644
index 000000000000..3a932f78012c
--- /dev/null
+++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="The Yate GSM base station"
+HOMEPAGE="http://www.yatebts.com/"
+ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+
+RDEPEND="
+	=net-voip/yate-${PV}:=[gsm]
+	bladerf? ( net-wireless/bladerf:= )
+	uhd? ( net-wireless/uhd )
+	virtual/libusb:1"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
+	S="${WORKDIR}/yate-bts"
+fi
+
+src_prepare() {
+	#we need more patches or configure flags because things install in really wrong places per FHS
+	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+	epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable rad1) \
+		$(use_enable usrp1) \
+		$(use_enable uhd) \
+		$(use_enable bladerf) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41)
+
+}
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
index b06623ca8e60..3a932f78012c 100644
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ b/net-wireless/yatebts/yatebts-9999.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
@@ -26,13 +26,14 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}4/yate-bts-${PV}-1.tar.gz"
+	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
 	S="${WORKDIR}/yate-bts"
 fi
 
 src_prepare() {
 	#we need more patches or configure flags because things install in really wrong places per FHS
 	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+	epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
 	eautoreconf
 }
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7f47db38dfeb..c58575a12ec7 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch.list b/profiles/arch.list
index 64e86438046c..a917db8334a7 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -7,10 +7,8 @@ hppa
 ia64
 m68k
 mips
-nios2
 ppc
 ppc64
-riscv
 s390
 sh
 sparc
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 10b8a7a6d3f9..b5a541324b9c 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -12,10 +12,6 @@ firebird
 # The modern versions of CUDA SDK are not suitable for stabilization.
 cuda
 
-# Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
-# sys-libs/libapparmor
-apparmor
-
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable versions on amd64
 clozurecl
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 8ac1ac7a902c..9dac9c178b85 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -47,8 +47,7 @@ kde-frameworks/ktextwidgets speech
 
 # Patrice Clement <monsieurp@gentoo.org> (24 Sep 2017)
 # Unmask Raspberry Pi support on arm.
-# Recent mpv versions has broken Raspberry Pi, see Gentoo bug 630556.
-<media-video/mpv-0.27.0 -raspberry-pi
+media-video/mpv -raspberry-pi
 
 # James Le Cuirot <chewi@gentoo.org> (20 Sep 2017)
 # media-sound/mac's executable segfaults when compressing all but the
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 21804a4bc501..160866a5949c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,48 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Matthew Thode <prometheanfire@gentoo.org> (13 Feb 2018)
+# USE=mercurial requires dev-vcs/mercurial, which is not keyworded yet
+dev-python/setuptools_scm mercurial
+
+# Matthew Thode <prometheanfire@gentoo.org> (13 Feb 2018)
+# USE=scipy requires scipy, which is not keyworded yet
+dev-python/networkx scipy
+
+# Matthew Thode <prometheanfire@gentoo.org> (13 Feb 2018)
+# USE=mongodb requires dev-python/pymongo
+# which requires dev-db/mongodb which are both not keyworded yet.
+dev-python/kombu mongodb
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=dmraid requires sys-fs/dmraid that is not keyworded yet.
+sys-libs/libblockdev dmraid
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=smartcard requires net-libs/gnutls-3[pkcs11] that is use.masked.
+net-libs/glib-networking smartcard
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=sofalizer requires sci-libs/netcdf that is not keyworded yet.
+media-video/ffmpeg sofalizer
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=rdp requires net-misc/freerdp that is not keyworded yet.
+media-video/vlc rdp
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
+>=media-plugins/grilo-plugins-0.3.5 upnp-av
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=vtk requires sci-libs/vtk that is not keyworded yet.
+media-libs/opencv vtk
+
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# USE=lua requires dev-lua/lgi that is not keyworded yet.
+# USE=lua,jit required dev-lang/luajit that is not keyworded yet.
+dev-libs/libpeas lua jit
+
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # Requires dev-libs/efl that is not keyworded.
 dev-libs/dbus-c++ ecore
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 75edad6e51f8..1b0ebdaae07a 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,10 @@
 -neon
 -armvfp
 
+# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
+# net-libs/libsmi not tested on arm64 yet
+smi
+
 # Michał Górny <mgorny@gentoo.org> (23 Jan 2018)
 # sci-geosciences/gpsd is not keyworded here.
 gps
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index d6f8e6b8091e..2577dc4934c1 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -3,6 +3,6 @@
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index c3ff75cc1863..900b90b13010 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -235,10 +235,8 @@ hppa
 ia64
 m68k
 mips
-nios2
 ppc
 ppc64
-riscv
 s390
 sh
 sparc
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 9095c39e78b5..ffcea66595ee 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,12 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
-# revdeps on dev-libs/boost which is no longer stable.
-dev-db/mariadb oqgraph
-dev-libs/libsigc++ test
-media-libs/chromaprint test
-media-libs/gegl raw
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Feb 2018)
+# dev-libs/libical stabilisation timeout, bug #621724
+app-mobilephone/gnokii ical
+net-mail/cyrus-imapd http
+net-wireless/bluez obex
 
 # Hans de Graaff <graaff@gentoo.org> (26 Nov 2017)
 # Several packages no longer have stable keywords due
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 10be280ba22a..8fbeaaebed94 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -8,10 +8,6 @@
 # Temporary mask to support stable bug 639476
 ruby_targets_ruby23
 
-# Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
-# Mask boost for stabilisation timeout, bug #624662
-boost
-
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
 # Mask qt4, qt5 for stabilisation timeout, bug #620334
 qt5
diff --git a/profiles/arch/nios2/eapi b/profiles/arch/nios2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/nios2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/nios2/make.defaults b/profiles/arch/nios2/make.defaults
deleted file mode 100644
index e2d03c6a8e5e..000000000000
--- a/profiles/arch/nios2/make.defaults
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Main Nios II profile.
-
-ARCH="nios2"
-ACCEPT_KEYWORDS="nios2 ~nios2"
-CHOST="nios2-unknown-linux-gnu"
-
-MULTILIB_ABIS="nios2"
-DEFAULT_ABI="nios2"
-LIBDIR_nios2="lib"
-CHOST_nios2="${CHOST}"
-ABI="${DEFAULT_ABI}"
-
-CFLAGS="-O2"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Defaults for video drivers
-VIDEO_CARDS="fbdev"
diff --git a/profiles/arch/nios2/package.use.mask b/profiles/arch/nios2/package.use.mask
deleted file mode 100644
index 59d4960881b3..000000000000
--- a/profiles/arch/nios2/package.use.mask
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
-# Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
-
-# Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
-# Needs testing.
-sys-devel/gcc gcj graphite regression-test
-
-# Julian Ospald <hasufell@gentoo.org> (04 Jan 2014)
-# no keyword for media-libs/swfdec and media-libs/libtimidity
->=dev-libs/DirectFB-1.7.1 timidity swfdec
-
-# Markus Meier <maekke@gentoo.org> (26 Dec 2013)
-# Unkeyworded deps, bug #488724
-app-office/gnumeric libgda
-
-# Pacho Ramos <pacho@gentoo.org> (28 Nov 2013)
-# Missing keywords, bug #492820
-net-im/telepathy-connection-managers sipe
-
-# Pacho Ramos <pacho@gentoo.org> (31 Oct 2013)
-# Missing keywords, bug #478254
-gnome-base/gnome classic
-
-# Benda Xu <heroxbd@gentoo.org> (31 Oct 2013)
-# Missing keywords from dev-ml/lablgtk, bug #487722
-net-p2p/mldonkey gtk guionly
-
-# Pacho Ramos <pacho@gentoo.org> (22 Sep 2013)
-# Missing keywords, bug #484734
-media-sound/rhythmbox visualizer
-
-# Markus Meier <maekke@gentoo.org> (15 Sep 2013)
-# Unkeyworded deps, bug #481462
-dev-python/ipython nbconvert
-
-# Sergey Popov <pinkbyte@gentoo.org> (06 Sep 2013)
-# sci-libs/hdf does not build properly on arm
-dev-perl/PDL	hdf
-
-# Michael Weber <xmw@gentoo.org> (23 Aug 2013)
-# Unkeyworded deps
-media-gfx/fim graphicsmagick svg
-
-# Markus Meier <maekke@gentoo.org> (04 Aug 2013)
-# Unkeyworded deps, bug #474026
-app-admin/conky lua-cairo lua-imlib xmms2 audacious moc
-
-# Sergey Popov <pinkbyte@gentoo.org> (30 Jul 2013)
-# Not tested
-media-libs/devil allegro nvtt
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (13 Jul 2013)
-# requires net-misc/freerdp which is not keyworded on arm
-dev-libs/weston rdp
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (27 May 2013)
-# Firmware loader not keyworded yet
-sci-libs/linux-gpib firmware
-
-# Markus Meier <maekke@gentoo.org> (10 May 2013)
-# unkeyworded deps for dev-python/ipython
-dev-python/ipython mongodb
-
-# Christoph Junghans <junghans@gentoo.org> (29 Apr 2013)
-# MKL not available on this arch
-media-gfx/povray mkl
-
-# Benda Xu <heroxbd@gentoo.org> (1 Apr 2013)
-# dev-ml/lablgtk not keyworded
-net-misc/unison gtk
-
-# Julian Ospald <hasufell@gentoo.org> (31 Mar 2013)
-# depends on mono
->=net-irc/hexchat-2.9.4-r1 theme-manager
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (20 Feb 2013)
-# Mask flags of calligra and dependencies due to lack of keywords
-app-office/calligra openexr spacenav
-media-gfx/pstoedit emf
-
-# Michał Górny <mgorny@gentoo.org> (01 Feb 2013)
-# virtual/cblas not keyworded on arm, bug #455050.
-dev-python/numpy lapack
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (22 Jan 2013)
-# remove mask if/when media-gfx/argyllcms is keywored here.
-x11-misc/colord extra-print-profiles
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
-# requires dev-util/bustle, which is written in haskell
-# remove mask if/when dev-lang/ghc is keywoded for arm
-dev-util/dbus-test-runner test
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when >=app-editors/gedit-3.6 is keyworded here
-dev-util/devhelp gedit
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when app-crypt/libsecret is keyworded here
->=gnome-base/gvfs-1.14 gnome-keyring
-
-# Markus Meier <maekke@gentoo.org> (25 Dez 2012)
-# unkeyworded deps for app-accessibility/speech-dispatcher
-app-accessibility/speech-dispatcher flite
-
-# Markus Meier <maekke@gentoo.org> (23 Dec 2012)
-# mask kde-apps/* flags due to unkeyworded dependencies
-kde-apps/kalzium editor solver
-kde-apps/okular chm
-kde-apps/kstars indi
-kde-apps/kdeutils-meta floppy
-
-# Markus Meier <maekke@gentoo.org> (08 Dec 2012)
-# mask app-office/libreoffice java extensions
-app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher
-
-# Steev Klimaszewski <steev@gentoo.org> (03 Aug 2012)
-# No java on ARM
-net-analyzer/wireshark doc-pdf
-
-# Markus Meier <maekke@gentoo.org> (25 Jul 2012)
-# no stable media-video/vlc yet, bug #401313
-media-libs/phonon vlc
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
-# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
-# gobject-introspection[doctool], bug #411761
-dev-libs/gobject-introspection -doctool
-
-# Michael Sterrett <mr_bones_@gentoo.org> (04 Mar 2012)
-# arm is missing keywords for >=dev-libs/json-glib-0.12
-app-admin/syslog-ng json
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-
-# Anthony G. Basile <blueness@gentoo.org> (Dec 21, 2011)
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for arm
-net-vpn/tinc vde
-
-# Tobias Klausmann <klausman@gentoo.org> (02 Nov 2011)
-# libpcre jit is not supported on alpha
-dev-libs/libpcre jit
-
-# Markus Meier <maekke@gentoo.org> (05 Sep 2011)
-# unkeyworded deps for bug 379657 and bug 379651
-app-admin/packagekit-base entropy
-
-# Robin H. Johnson <robbat2@gentoo.org> (03 Sep 2011)
-# Remove this for your arch after you keyword dev-utils/google-perftools and virtual/gsasl (bug #381737)
-dev-libs/libmemcached sasl
-
-# Markus Meier <maekke@gentoo.org> (13 Mar 2011)
-# needs stable kde stuff
-sys-auth/polkit kde
-
-# Sebastian Pipping <sping@gentoo.org> (22 Feb 2011)
-# No media-sound/lilypond here, yet (bug #356069)
-app-text/asciidoc test
-
-# Michael Weber <xmw@gentoo.org> (10 Feb 2011)
-# kde-frameworks/kdelibs is not stable for arm
-net-libs/libproxy kde
-
-# Raúl Porcel <armin76@gentoo.org> (28 Mar 2010)
-# Needs kde-frameworks/kwallet and kde-frameworks/kdelibs stable
-dev-vcs/subversion kwallet
-
-# Jim Ramsay <lack@gentoo.org> (5 Nov 2008)
-# app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
-app-admin/gkrellm ntlm
-
-# missing keyword for sys-cluster/openmpi sys-cluster/mpich2
-dev-libs/boost mpi
-
-# missing keywords
-media-sound/sox ladspa
-media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
-
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
-# Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
-# missing keyword for net-libs/zeromq
-app-admin/rsyslog zeromq
diff --git a/profiles/arch/nios2/parent b/profiles/arch/nios2/parent
deleted file mode 100644
index 7663f5297bb4..000000000000
--- a/profiles/arch/nios2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../features/multilib
-../base
diff --git a/profiles/arch/nios2/use.force b/profiles/arch/nios2/use.force
deleted file mode 100644
index fbd63671fd62..000000000000
--- a/profiles/arch/nios2/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Force the flag which corresponds to ARCH.
-nios2
diff --git a/profiles/arch/nios2/use.mask b/profiles/arch/nios2/use.mask
deleted file mode 100644
index ec70bfde6e8b..000000000000
--- a/profiles/arch/nios2/use.mask
+++ /dev/null
@@ -1,175 +0,0 @@
-# Unmask the flag which corresponds to ARCH.
--nios2
-
-# Markus Meier <maekke@gentoo.org> (22 Aug 2010)
-# net-wireless/wimax not tested
-wimax
-
-# Markus Meier <maekke@gentoo.org> (21 Aug 2010)
-# app-antivirus/clamav not tested
-clamav
-
-# Kacper Kowalik <xarthisius@gentoo.org> (9 Aug 2010)
-# cblas-external as virtual/cblas is also masked
-cblas-external
-
-# Samuli Suominen <ssuominen@gentoo.org> (17 Oct 2009)
-# Required package: media-sound/musepack-tools
-musepack
-
-# Raúl Porcel <armin76@gentoo.org>
-# I've been told xfs is broken on ARM
-xfs
-
-# Raúl Porcel <armin76@gentoo.org>
-# Fails to build/work
-openexr
-
-# Samuli Suominen <drac@gentoo.org>
-# media-libs/amrnb and media-libs/amrwb not tested.
-amr
-
-# Samuli Suominen <drac@gentoo.org>
-# media-gfx/gimp not tested.
-gimp
-
-# No hardware to test by the team
-dvb
-ios
-ipod
-
-# Stuff that doesn't make sense on this arch
-3dfx
-dmi
-
-# Stuff we don't want
-fuse
-R
-octave
-tracker
-xindy
-mpi
-lasi
-schroedinger
-hardened
-frei0r
-pdfannotextractor
-prelude
-mssql
-
-# havent tested yet
-ruby
-ctypes-python
-sasl
-libproxy
-pkcs11
-gnutls
-bazaar
-darcs
-mercurial
-kerberos
-gpg
-gnome
-gnome-keyring
-doc
-emacs
-gphoto2
-afs
-mono
-lirc
-lm_sensors
-xemacs
-rpm
-scanner
-zvbi
-ldap
-mysql
-postgres
-dvd
-fluidsynth
-sid
-mms
-mtp
-ieee1394
-sctp
-pm-utils
-darcs
-bs2b
-toolame
-ladspa
-ldns
-ggi
-nut
-dvd
-fits
-tokyocabinet
-vaapi
-rtmp
-vpx
-plotutils
-lpsol
-upnp
-quvi
-bluray
-libtar
-zvbi
-aacplus
-devil
-gts
-anthy
-icu
-gtk
-qt4
-qt5
-R
-sdl
-slang
-tk
-vim-syntax
-X
-
-# 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_glint
-video_cards_mga
-video_cards_nouveau
-video_cards_nv
-video_cards_r128
-video_cards_radeon
-video_cards_tdfx
-video_cards_vesa
-video_cards_via
-video_cards_voodoo
-
-# Matt Turner <mattst88@gentoo.org>
-# Mask more VIDEO_CARDs added with mesa-8.0
-video_cards_amdgpu
-video_cards_r100
-video_cards_r200
-video_cards_r300
-video_cards_r600
-video_cards_radeonsi
-
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 18 Sep 2007
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Dec 2012)
-# media-libs/xine-lib is not keyworded
-xine
-
-# Samuli Suominen <ssuominen@gentoo.org> (18 Jan 2013)
-# libdlm and cman are not keyworded
-cman
-clvm
-
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
-# virtual/opencl is not keyworded
-opencl
-
-# sys-libs/libseccomp has not been ported to this arch yet #524148
-seccomp
-
-# No nios2 java support yet.
-java
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 357aceb881b0..f03d1c27668e 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Feb 2018)
+# Requires not yet keyworded dependencies
+sys-libs/gwenhywfar sensors serialport webkit
+
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Jan 2018)
 # Requires media-libs/libffado, which requires dev-python/PyQt5,
 # which is not keyworded.
diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
deleted file mode 100644
index c25e0e72a40c..000000000000
--- a/profiles/arch/riscv/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Main RISC-V profile; endian/bitsize independent.
-
-ARCH="riscv"
-ACCEPT_KEYWORDS="riscv"
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
deleted file mode 100644
index c456a6fedb42..000000000000
--- a/profiles/arch/riscv/package.use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# libpcre doesn't support jit on RISC-V.
-dev-libs/libpcre jit
diff --git a/profiles/arch/riscv/parent b/profiles/arch/riscv/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/arch/riscv/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
deleted file mode 100644
index 612aced6a1fa..000000000000
--- a/profiles/arch/riscv/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Force the flag which corresponds to ARCH.
-riscv
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 128d367ad42a..ffeb89d7e94e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -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
 
 # This file requires >=portage-2.1.1
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
+# Depends on unreleased media-libs/libaom, and 9999 is currently broken
+media-video/vlc aom
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
 # This feature is not ready yet, see bug 146882 comment 26
 sys-libs/glibc compile-locales
@@ -59,10 +63,6 @@ dev-java/oracle-jre-bin:9 gentoo-vm
 # Requires audacious, which is masked. Bug 632513
 =media-libs/freeverb3-3.1.2_pre20151102-r1 jack
 
-# Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
-# Depends on deprecated x11-libs/qscintilla[qt4]/qt4, bug #634972
-net-analyzer/linkchecker X
-
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Oct 2017)
 # USE=qt4 depends on masked dev-qt/qtwebkit:4, bug #620754
 sci-physics/root qt4
@@ -519,7 +519,6 @@ gnustep-apps/cynthiune flac
 
 # Richard Freeman <rich0@gentoo.org> (24 Mar 2013)
 # Dependency is masked for buffer overflows for now
-app-text/yagf cuneiform
 dev-python/pyocr cuneiform
 
 # Tom Wijsman <TomWij@gentoo.org> (10 Mar 2013)
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index a93f1e7d4b71..456700c16208 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Ilya Tumaykin <itumaykin+gentoo@gmail.com> (13 Feb 2018)
+# Requires >=dev-lang/mujs-1.0.0 stabilized. mpv-0.27.1 is stabilized
+# due to a security bug, so we won't bother with javascript this time.
+~media-video/mpv-0.27.1 javascript
+
 # Andrey Grozin <grozin@gentoo.org> (24 Jan 2018)
 # Depends on unstable dev-python/sphinx-gallery.
 # Bug #643840.
diff --git a/profiles/default/linux/nios2/13.0/eapi b/profiles/default/linux/nios2/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/nios2/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/nios2/13.0/parent b/profiles/default/linux/nios2/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/nios2/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/nios2/17.0/eapi b/profiles/default/linux/nios2/17.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/nios2/17.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/nios2/17.0/parent b/profiles/default/linux/nios2/17.0/parent
deleted file mode 100644
index 4ce24f0217a8..000000000000
--- a/profiles/default/linux/nios2/17.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/17.0
diff --git a/profiles/default/linux/nios2/eapi b/profiles/default/linux/nios2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/nios2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/nios2/parent b/profiles/default/linux/nios2/parent
deleted file mode 100644
index 3cf5cd28b688..000000000000
--- a/profiles/default/linux/nios2/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/nios2
diff --git a/profiles/default/linux/riscv/13.0/desktop/eapi b/profiles/default/linux/riscv/13.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/13.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/13.0/desktop/parent b/profiles/default/linux/riscv/13.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/riscv/13.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/13.0/developer/eapi b/profiles/default/linux/riscv/13.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/13.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/13.0/developer/parent b/profiles/default/linux/riscv/13.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/riscv/13.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/riscv/13.0/eapi b/profiles/default/linux/riscv/13.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/13.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/13.0/parent b/profiles/default/linux/riscv/13.0/parent
deleted file mode 100644
index 7c0377510996..000000000000
--- a/profiles/default/linux/riscv/13.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/13.0
diff --git a/profiles/default/linux/riscv/17.0/desktop/eapi b/profiles/default/linux/riscv/17.0/desktop/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/desktop/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/desktop/parent b/profiles/default/linux/riscv/17.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/default/linux/riscv/17.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/17.0/developer/eapi b/profiles/default/linux/riscv/17.0/developer/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/developer/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/developer/parent b/profiles/default/linux/riscv/17.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/default/linux/riscv/17.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/default/linux/riscv/17.0/eapi b/profiles/default/linux/riscv/17.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/parent b/profiles/default/linux/riscv/17.0/parent
deleted file mode 100644
index 4ce24f0217a8..000000000000
--- a/profiles/default/linux/riscv/17.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/17.0
diff --git a/profiles/default/linux/riscv/eapi b/profiles/default/linux/riscv/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent
deleted file mode 100644
index 1f65d976126f..000000000000
--- a/profiles/default/linux/riscv/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../base
-..
-../../../arch/riscv
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc
index 77be14da04ba..19bcfdebdd93 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -9,6 +9,7 @@ aarch64 - ARM64 system emulation target
 alpha - system emulation target
 arm - system emulation target
 cris - system emulation target
+hppa - system emulation target
 i386 - system emulation target
 lm32 - LatticeMico32 system emulation target
 m68k - system emulation target
diff --git a/profiles/desc/qemu_user_targets.desc b/profiles/desc/qemu_user_targets.desc
index 76c2721cd8cf..721a1f566e20 100644
--- a/profiles/desc/qemu_user_targets.desc
+++ b/profiles/desc/qemu_user_targets.desc
@@ -6,11 +6,12 @@
 # Keep it sorted.
 
 aarch64 - ARM64 userspace emulation target
+aarch64_be - ARM64 big endian userspace emulation target
 alpha - userspace emulation target
 arm - ARM (little endian) userspace emulation target
 armeb - ARM (big endian) userspace emulation target
 cris - userspace emulation target
-hppa - usersparce emulation target
+hppa - userspace emulation target
 i386 - userspace emulation target
 m68k - userspace emulation target
 microblazeel - userspace emulation target
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index b1e80653f29f..23f79922d54a 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -20,7 +20,7 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-chain prefix-guest"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
 USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index fdbb561d5371..a34bb2e68e46 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -11,6 +11,7 @@ www-misc/profile-sync-daemon
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
 app-admin/systemdgenie
 app-eselect/eselect-gnome-shell-extensions
+app-office/wps-office
 sys-apps/systemd
 app-admin/calamares
 dev-python/python-systemd
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index e00abaeb1eb6..085e71a6fffa 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -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
 
 # These are broken as reported by Halcy0n, Aug, 23, 2011
@@ -141,7 +141,6 @@ sci-electronics/eagle
 sci-chemistry/cara-bin
 sci-chemistry/cyana
 sci-chemistry/mars
-sci-chemistry/xdsgui
 sci-chemistry/xdsstat-bin
 sci-libs/ipp
 sys-libs/lib-compat-loki
diff --git a/profiles/package.mask b/profiles/package.mask
index 2819f5b785f9..bf7b0cd284c5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,15 +29,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Sergey Popov <pinkbyte@gentoo.org> (13 Feb 2018)
+# Requires dead Qt4 (bug #645420). Removal in 30 days
+media-gfx/qiviewer
+
+# Kristian Fiskerstrand <k_f@gentoo.org> (11 Feb 2018)
+# Lastrite: app-crypt/monkeysign . Please use caff from 
+# app-crypt/signing-party instead. Removal in 30 days.
+# Bug: #647352
+app-crypt/monkeysign
+
 # Michael Palimamka <kensington@gentoo.org> (11 Feb 2018
 # Fails to build (bug #538400). Requires dead Qt 4 (bug #637014).
 # Dead upstream. Masked for removal in 30 days.
 media-sound/lastfmplayer
 
-# Aaron W. Swenson <titanofold@gentoo.org> (10 Feb 2018)
-# The 9.2 branch of PostgreSQL is past EOL. Removal in 30 days (12 Mar 2018).
-<dev-db/postgresql-9.3
-
 # Lars Wendler <polynomial-c@gentoo.org> (08 Feb 2018)
 # 4.4.0 server does not properly write lease changes to the lease file
 # in some cases:
@@ -210,8 +216,8 @@ net-p2p/primecoind
 sci-physics/geant-python
 
 # Patrice Clement <monsieurp@gentoo.org> (18 Jan 2018)
-# mpv-0.28.0 requires changes currently only available in ffmpeg-9999.
-=media-video/mpv-0.28.0
+# mpv >= 0.28.0 requires changes currently only available in ffmpeg-9999.
+>=media-video/mpv-0.28.0
 
 # Andreas Sturmlechner <asturm@gentoo.org> (18 Jan 2018)
 # Broken by >=kde-apps/kcalcore-17.12.0, but also merged into
@@ -228,133 +234,6 @@ dev-tex/pstplus
 # Masked for removal in 30 days. Bug #634986
 dev-tex/texamator
 
-# Aaron W. Swenson <titanofold@gentoo.org> (14 Jan 2018)
-# Upstream is now Upwork. Use app-office/upwork instead.
-# Masked for removal in 30 days.
-app-office/odeskteam
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-sys-kernel/kccmp
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-app-backup/qt4-fsarchiver
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-media-gfx/pictureflow
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-app-mobilephone/past
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-x11-misc/ptbatterysystemtray
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-x11-misc/launchy
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-x11-misc/wmiface
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-x11-misc/appmenu-qt
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Depends on dead Qt4, needs porting to Qt5.
-# Masked for removal in 30 days.
-sci-chemistry/xdsgui
-sci-visualization/xds-viewer
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-dev-db/dbmodel
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-media-sound/mp3diags
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-x11-misc/touchfreeze
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Use sci-geosciences/gpsbabel[gui] instead.
-# Masked for removal in 30 days.
-sci-geosciences/gebabbel
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-app-editors/lfhex
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-app-text/tuxcards
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-app-text/yagf
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-net-ftp/qshare
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-net-ftp/scythia
-
-# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-app-dicts/qvortaro
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
-# Dead upstream, depends on dead Qt4, no port to Qt5.
-# Masked for removal in 30 days.
-net-dns/cagibi
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-dev-util/beediff
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
-# Dead upstream, depends on dead Qt4.
-# Masked for removal in 30 days.
-net-misc/netfleet
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Jan 2018)
-# Dead upstream, EAPI 2, depends on dead Qt4. kde-apps/filelight
-# is a possible alternative. Masked for removal in 30 days.
-sys-apps/qdiskusage
-
-# Kent Fredric <kentnl@gentoo.org> (10 Jan 2018)
-# Dead upstream, Broken since 2009.
-# Bug #644146. Removal in 30 days
-dev-perl/SVN-Simple
-
 # Michał Górny <mgorny@gentoo.org> (10 Jan 2018)
 # The Fuzzer library is now installed as part of core LLVM. That's
 # sys-devel/llvm in LLVM 5, and sys-libs/compiler-rt-sanitizers
@@ -386,11 +265,6 @@ dev-libs/libFuzzer
 =sys-kernel/gentoo-sources-4.14.11
 
 # Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Nobody bothered to bump it for ages, NPAPI is phased out (#468772).
-# Removal in a month.
-media-plugins/npapi-vlc
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
 # Fails to fetch (#597424). Removal in a month.
 sci-chemistry/platon
 
@@ -425,11 +299,6 @@ dev-db/lib_mysqludf_sys
 dev-db/lib_mysqludf_json
 
 # Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Not properly mirrored, 14 years old and not really useful this days
-# (#629328). Removal in a month.
-x11-themes/lush
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
 # Fails multilib-strict check (#628836). Nothing requires it. Removal in a
 # month.
 dev-libs/dclog
@@ -455,10 +324,6 @@ net-im/mu-conference
 dev-libs/libmcs
 
 # Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
-# Upstream dead, QT4 consumer (#630550). Removal in a month.
-x11-libs/qwtplot3d
-
-# Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
 # No reverse deps, fails to build (#630866). Removal in a month.
 dev-libs/libmowgli-glib
 
@@ -631,6 +496,7 @@ games-kids/crayon-physics
 >=dev-python/thunarx-python-0.4.0
 >=xfce-base/thunar-1.7
 >=xfce-extra/thunar-archive-plugin-0.4.0
+>=xfce-extra/thunar-media-tags-plugin-0.3.0
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
 # Qt4WebKit is ancient and full of security holes.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ecb3607d80c9..b4d21fbae54e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -34,7 +34,7 @@ amd64           default/linux/amd64/13.0/systemd                        stable
 amd64           default/linux/amd64/13.0/x32                            dev
 amd64           default/linux/amd64/17.0                                stable
 amd64           default/linux/amd64/17.0/selinux                        dev
-amd64           default/linux/amd64/17.0/hardened                       dev
+amd64           default/linux/amd64/17.0/hardened                       stable
 amd64           default/linux/amd64/17.0/hardened/selinux               dev
 amd64           default/linux/amd64/17.0/desktop                        stable
 amd64           default/linux/amd64/17.0/desktop/gnome                  stable
@@ -43,7 +43,7 @@ amd64           default/linux/amd64/17.0/desktop/plasma                 stable
 amd64           default/linux/amd64/17.0/desktop/plasma/systemd         stable
 amd64           default/linux/amd64/17.0/developer                      stable
 amd64           default/linux/amd64/17.0/no-multilib                    stable
-amd64           default/linux/amd64/17.0/no-multilib/hardened           dev
+amd64           default/linux/amd64/17.0/no-multilib/hardened           stable
 amd64           default/linux/amd64/17.0/no-multilib/hardened/selinux   dev
 amd64           default/linux/amd64/17.0/systemd                        stable
 amd64           default/linux/amd64/17.0/x32                            dev
@@ -154,11 +154,6 @@ mips            default/linux/mips/13.0/mipsel/multilib/o32     dev
 mips            default/linux/mips/13.0/mipsel/multilib/n32     dev
 mips            default/linux/mips/13.0/mipsel/multilib/n64     exp
 
-# Nios II Profiles
-# @MAINTAINER: ?
-nios2           default/linux/nios2/13.0                        exp
-nios2           default/linux/nios2/17.0                        exp
-
 # PPC32 Profiles
 # @MAINTAINER: ppc@gentoo.org
 ppc             default/linux/powerpc/ppc32/13.0                       stable
@@ -199,11 +194,6 @@ ppc64           default/linux/powerpc/ppc64/17.0/64bit-userland/developer
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian		exp
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	exp
 
-# RISC-V Profiles
-# @MAINTAINER: ?
-riscv           default/linux/riscv/13.0                        exp
-riscv           default/linux/riscv/17.0                        exp
-
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
 s390            default/linux/s390/13.0                         exp
@@ -248,7 +238,7 @@ x86             default/linux/x86/13.0/developer                stable
 x86		default/linux/x86/13.0/systemd			stable
 x86             default/linux/x86/17.0                          stable
 x86             default/linux/x86/17.0/selinux                  dev
-x86             default/linux/x86/17.0/hardened                 dev
+x86             default/linux/x86/17.0/hardened                 stable
 x86             default/linux/x86/17.0/desktop                  stable
 x86             default/linux/x86/17.0/desktop/gnome            stable
 x86             default/linux/x86/17.0/desktop/gnome/systemd    stable
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5ea06223ef89..7c947d6c5c0b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -454,7 +454,6 @@ app-emacs/bbdb:vm - Add support for app-emacs/vm
 app-emacs/calfw:howm - Add support for the app-emacs/howm note-taking tool
 app-emacs/company-mode:ropemacs - Install backend for dev-python/ropemacs
 app-emacs/emacs-common-gentoo:games - Support shared score files for games
-app-emacs/emhacks:jde - Enable support for Java Development Environment
 app-emacs/org-mode:contrib - Install user-contributed files
 app-emacs/org-mode:odt-schema - Install non-free schema files for OpenDocument Text exporter
 app-emacs/remember:bbdb - Include support for app-emacs/bbdb
@@ -530,6 +529,9 @@ app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
 app-emulation/lxc:cgmanager - Enable support for cgroup management using app-admin/cgmanager
 app-emulation/lxd:daemon - Build the system daemon, not just the client tool
 app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS.
+app-emulation/nemu:ovf - Adds support for OVA/OVF import
+app-emulation/nemu:savevm - Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)
+app-emulation/nemu:vnc-client - Adds support for external VNC client
 app-emulation/open-vm-tools:doc - Generate API documentation
 app-emulation/open-vm-tools:grabbitmqproxy - Enable grabbitmqproxy
 app-emulation/open-vm-tools:pic - Force shared libraries to be built as PIC
@@ -1246,8 +1248,6 @@ app-text/writerperfect:wpg - Add support for wpg format using app-text/libwpg
 app-text/writerperfect:wps - Add support for wps format using app-text/libwps
 app-text/wv:tools - Install optional utilities considered deprecated in favor of using AbiWord.
 app-text/xmlto:text - Support conversion from XML to plain text
-app-text/yagf:cuneiform - Enable support for the app-text/cuneiform OCR engine.
-app-text/yagf:tesseract - Enable support for the app-text/tesseract OCR engine.
 app-text/zathura:magic - Use libmagic to determine mimetypes
 app-text/zathura:synctex - Use libsynctex to get latex codeline from pdf
 app-text/zathura-meta:cb - Install plug-in for ComicBook support
@@ -1263,14 +1263,12 @@ dev-ada/aws:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnat_util:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnat_util:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnat_util:shared - Build gnat_util shared library
-dev-ada/gnat_util:static - Build gnat_util static library
 dev-ada/gnat_util:static-pic - Build gnat_util static library with pic code
 dev-ada/gnatcoll:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatcoll:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll:projects - Adds support for projects
 dev-ada/gnatcoll:pygobject - Adds support for pygobject
 dev-ada/gnatcoll:shared - Build shared library
-dev-ada/gnatcoll:static - Build static library
 dev-ada/gnatcoll:tools - Build associated tools
 dev-ada/gnatmem:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatmem:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
@@ -1279,7 +1277,6 @@ dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:shared - Build gtkada as shared library
-dev-ada/gtkada:static - Build gtkada as static library
 dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
@@ -2074,7 +2071,6 @@ dev-libs/kreport:marble - Enable displaying of maps using kde-apps/marble
 dev-libs/kreport:scripting - Support Qml scripting using dev-qt/qtdeclarative
 dev-libs/leveldb:snappy - support the snappy compression library
 dev-libs/libbase58:tools - Build command line base58 tool
-dev-libs/libburn:track-src-odirect - Read track input with O_DIRECT (see man 2 open), this may deliver a better write performance in some situations
 dev-libs/libcdio:minimal - Only build the libcdio library and little more, just to be used to link against from multimedia players. With this USE flag enabled, none of the command-line utilities are built, nor is the CDDA library.
 dev-libs/libcec:cubox - Enable support for enable support for the TDA995x
 dev-libs/libcec:exynos - Enable support for Exynos chipsets
@@ -2517,8 +2513,11 @@ dev-python/kaa-base:tls - SSL/TLS support via dev-python/tlslite
 dev-python/kafka-python:snappy - Install snappy compression/decompression support
 dev-python/kazoo:gevent - Enable support for the gevent based handler
 dev-python/kombu:amqplib - Enable amqplib support
+dev-python/kombu:mongodb - Enables MongoDB backend
 dev-python/kombu:msgpack - Enables MessagePack (de)serializer for Python
+dev-python/kombu:redis - Enables Redis backend
 dev-python/kombu:sqs - Enables Amazon SQS transport module for Kombu
+dev-python/kombu:yaml - Enables yaml backend
 dev-python/markdown:pygments - Enable fancy pygments support
 dev-python/matplotlib:excel - Pull dev-python/xlwt for the exceltools toolkit
 dev-python/matplotlib:gtk2 - Enable x11-libs/gtk+:2 support
@@ -2527,6 +2526,7 @@ dev-python/matplotlib:pyside - Qt support via dev-python/pyside
 dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
 dev-python/netaddr:cli - Enable netaddr shell with dev-python/ipython
+dev-python/networkx:scipy - Enables scipy backend
 dev-python/nltk:numpy - Use numpy for the saved word tokenizer
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
 dev-python/pandas:R - Enable support for R via dev-python/rpy
@@ -2584,6 +2584,7 @@ dev-python/rdflib:redland - enable support for Redland triplestore
 dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython
 dev-python/scrapy:boto - Add support for Amazon S3 via dev-python/boto
 dev-python/scrapy:ibl - Use Instace Based Learning algorithm for automatic extraction
+dev-python/setuptools_scm:mercurial - Enables mercurial backend
 dev-python/simplecv:shell - Enable the iPython SimpleCV shell
 dev-python/sphinx:net - enable internet capabilities
 dev-python/sympy:imaging - Add support for dev-python/pillow
@@ -4883,6 +4884,7 @@ media-video/ffmpeg:gpl - Build GPL code. Should be enabled unless you require LG
 media-video/ffmpeg:hardcoded-tables - Use pre-calculated tables rather than calculating them on the fly.
 media-video/ffmpeg:iec61883 - Support for FireWire DV/HDV input device using media-libs/libiec61883.
 media-video/ffmpeg:kvazaar - Enables media-libs/kvazaar based HEVC encoder.
+media-video/ffmpeg:libdrm - Enables x11-libs/libdrm support for better screen grabbing and hardware accelerated codecs.
 media-video/ffmpeg:libilbc - Enables iLBC de/encoding via media-libs/libilbc.
 media-video/ffmpeg:librtmp - Enables Real Time Messaging Protocol using librtmp (media-video/rtmpdump) in addition to FFmpeg's native implementation.
 media-video/ffmpeg:libsoxr - Enables audio resampling through media-libs/soxr.
@@ -6098,7 +6100,6 @@ net-mail/mailutils:tokyocabinet - Enable Tokyo Cabinet database support
 net-mail/mairix:gnus - Add support for the marks propagation feature in GNUS (provided by app-editors/emacs or app-xemacs/gnus for XEmacs users)
 net-mail/mpop:libsecret - Enable libsecret support to store login credentials
 net-mail/mu:emacs - Install the mu4e mail client.
-net-mail/mu:gui - Build and install the experimental gui 'mug'.
 net-mail/notmuch:crypt - Support decryption and verification of PGP/MIME messages and in Emacs UI - encryption; support also S/MIME signature verification since version 0.22
 net-mail/notmuch:doc - Install API documentation
 net-mail/notmuch:emacs - Install Emacs UI (the main one)
@@ -8124,6 +8125,7 @@ sys-firmware/edk2-ovmf:binary - Use pre-built binaries
 sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
 sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
 sys-firmware/intel-microcode:split-ucode - install the split binary ucode files (used by the kernel directly)
+sys-firmware/ipxe:binary - Use pre-built binaries
 sys-firmware/ipxe:efi - Build an EFI program for using PXE
 sys-firmware/ipxe:iso - Build a bootable ISO for using PXE
 sys-firmware/ipxe:lkrn - Build a linux kernel bootable file for using with grub/etc...
@@ -8133,6 +8135,7 @@ sys-firmware/ipxe:usb - Build a bootable USB image for using PXE
 sys-firmware/ipxe:vmware - Build the PXE ROM images that VMWare uses
 sys-firmware/seabios:binary - Use official upstream pre-built binaries
 sys-firmware/seabios:seavgabios - Include SeaVGABIOS binaries (replacement for vgabios)
+sys-firmware/sgabios:binary - Use pre-built binaries
 sys-firmware/sigrok-firmware-fx2lafw:binary - Use official upstream pre-built binaries
 sys-firmware/vgabios:binary - Use official upstream pre-built binaries (only default and cirrus images)
 sys-freebsd/boot0:tftp - Enable PXE/TFTP boot support.
@@ -8291,7 +8294,12 @@ sys-libs/glibc:nscd - Build, and enable support for, the Name Service Cache Daem
 sys-libs/glibc:rpc - Enable obsolete RPC/NIS layers
 sys-libs/glibc:suid - Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5
 sys-libs/glibc:systemtap - enable systemtap static probe points
+sys-libs/gwenhywfar:designer - Build plugins for dev-qt/designer
 sys-libs/gwenhywfar:fox - Use x11-libs/fox graphical toolkit
+sys-libs/gwenhywfar:qml - Enable support for plugins using QML
+sys-libs/gwenhywfar:sensors - Enable support for dev-qt/qtsensors module
+sys-libs/gwenhywfar:serialport - Enable support for dev-qt/qtserialport module
+sys-libs/gwenhywfar:webkit - Enable support for dev-qt/qtwebkit
 sys-libs/libblockdev:bcache - Enable block device cache support.
 sys-libs/libblockdev:cryptsetup - Enable sys-fs/cryptsetup support
 sys-libs/libblockdev:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index f40d945a6211..e82fe2038fb1 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/gazebo_ros_pkgs/Manifest b/ros-meta/gazebo_ros_pkgs/Manifest
index 9f920b268ae6..4a70910bf3f0 100644
--- a/ros-meta/gazebo_ros_pkgs/Manifest
+++ b/ros-meta/gazebo_ros_pkgs/Manifest
@@ -1,8 +1,10 @@
 DIST gazebo_ros_pkgs-2.6.1.tar.gz 1825040 BLAKE2B ebf12fe16ce2d8ee74bb171bfa1ff15fe93860e09df5e2680047d08f430a4647a8b23aae4cf789d86623f94ec75d8a29daffbfde8170aa174303122d05607122 SHA512 4cc0b2ec5c60e69b9a69d323c2c7cfe53bc1b5108d6cba5d77b571c69d76a7eb6d72a3783dc60fe183057c63279df8d5cded26cd46333e9f21277e9ae1e31c34
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 EBUILD gazebo_ros_pkgs-2.6.1.ebuild 457 BLAKE2B f62b4dc6e86a8c1f6d0459da68d398663e954fc6508cdf4f876ef450bbe9da9dea5189a7f287c0a011ed6f29bb02311ffc243016c780352a710db0ee73e81e5e SHA512 b24783ce061b9089ad545dbf9b2f3b7c02be105afa65f6c252b8714020f6788847f3ab45bb57a1ba6a5ba79a3782b3f0033e5424ede03bf61f872b3c287cd711
 EBUILD gazebo_ros_pkgs-2.6.2.ebuild 457 BLAKE2B 0574045871c0d8611d2a8267b358cac6f8c16c4c6fd6b941747f052d56e089c52f6a202cb7106eb38525f8f6269389d367409fddd0f7cf1a273166c1e130352b SHA512 147db9137c88a3576f1c8177ee21aa0e2f85e882a8bd98dfaaefa82a382dd87eb817303263f1654f6dcd7bb033c83e20ddc47c4ed7d7e54ee0eeb7ca1f6a1980
 EBUILD gazebo_ros_pkgs-2.7.3.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
+EBUILD gazebo_ros_pkgs-2.7.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-9999.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.4.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.4.ebuild
new file mode 100644
index 000000000000..ef31ca273e02
--- /dev/null
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for using ROS with the gazebo simulator"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs
+	dev-ros/gazebo_plugins
+	dev-ros/gazebo_ros
+	dev-ros/gazebo_ros_control
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/Manifest b/ros-meta/pr2_common/Manifest
index ed337b962de7..ae6c2e579996 100644
--- a/ros-meta/pr2_common/Manifest
+++ b/ros-meta/pr2_common/Manifest
@@ -4,11 +4,13 @@ DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd
 DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
 DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
 DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
+DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
 EBUILD pr2_common-1.11.10.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.11.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.13.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.14.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.11.9.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 EBUILD pr2_common-1.12.0.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
+EBUILD pr2_common-1.12.1.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
 EBUILD pr2_common-9999.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/ros-meta/pr2_common/pr2_common-1.12.1.ebuild b/ros-meta/pr2_common/pr2_common-1.12.1.ebuild
new file mode 100644
index 000000000000..6fb5878a99e7
--- /dev/null
+++ b/ros-meta/pr2_common/pr2_common-1.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pr2_msgs
+	dev-ros/pr2_dashboard_aggregator
+	dev-ros/pr2_description
+	dev-ros/pr2_machine
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 99251a6d61cf..0ba2ca7cd5e8 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/xdsgui/Manifest b/sci-chemistry/xdsgui/Manifest
deleted file mode 100644
index 518fee93a6d9..000000000000
--- a/sci-chemistry/xdsgui/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST xdsgui-0_p130530.32 10372936 BLAKE2B 3547a306509071049608c58074fe0acd9414b92a4efd2875ee4a75981e2c05be387d5cbd700126872574e2c15afc61a055eb8e43d98581dc064c96e3a4c2bd05 SHA512 f9ef5d914afb8e6a64f936508fee2e84f4e579898726774dc995e920e5a953341c48022e8078eb60f9a2a288190765949da03f394f221a48916d12dc26a898b1
-DIST xdsgui-0_p130530.64 12220790 BLAKE2B 7d38263b8b47c33f980b1fc566efdb1a94acea0ce411df3cbbdca85540ce357b27c9c56c1a4264c6cb549bf16b87f9bed220c496c7c5b95d16366f13b99d9072 SHA512 bd54ddacf44a9156306354249c5b1b61deb9b1f9ebdad879b98d01354ccb51ab60c183e3c58c2be2bb1a42b55b96cea470ee70538110f0fc1b9e3b46ffce3d40
-EBUILD xdsgui-0_p130530.ebuild 906 BLAKE2B 60ac88a91373e387cd99bcdf3ff5e85f2b0a70d0f52f65b24e33a99ecb202cb90a63ca2d1a72283a4d0ac13d8b1f44d1b94766d2ee0d572f49fede192ccd3a20 SHA512 335a7fd6d15f03e475712738a88fc5554cba9ae5a3589557ddf9afaf4100399946ccd0a4a20a4937cfa10d9e436690cf3113a7b94d8f09a96a12bcd88342d0b0
-MISC metadata.xml 687 BLAKE2B 1255007d1a524ba94a9f9c74390386023a8967a7dc8d5309f76fc191573fa027a01385d6a1e9545b0619c46667e3f616309864ad72a5b673fa501081cd8fa63e SHA512 ea98e543b3b037ab8e94099dc0a6cd69e1423fb622bb87ccd4b44569e1878bfa400f1a0e0c1f8f3325ec12d6c43c2dba3379f24de2734de866a02e595c771c35
diff --git a/sci-chemistry/xdsgui/metadata.xml b/sci-chemistry/xdsgui/metadata.xml
deleted file mode 100644
index 6eab78d31188..000000000000
--- a/sci-chemistry/xdsgui/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <longdescription>
-XDSgui is a GUI (graphical user interface) for XDS that is supposed to help both
-novice and experienced users. It graphically displays the ASCII and cbf files 
-that XDS writes, and can run useful shell commands with a simple mouse click. 
-The design goal of the program is to enable XDS data processing without the 
-commandline, and to supply additional graphical information.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild b/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild
deleted file mode 100644
index 116ce867545b..000000000000
--- a/sci-chemistry/xdsgui/xdsgui-0_p130530.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GUI for XDS that is supposed to help both novice and experienced users"
-HOMEPAGE="http://strucbio.biologie.uni-konstanz.de/xdswiki/index.php/XdsGUI"
-SRC_URI="
-	amd64? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsGUI.rhel6.64 -> ${P}.64 )
-	x86? ( ftp://turn5.biologie.uni-konstanz.de/pub/xdsGUI.rhel6.32 -> ${P}.32 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-util/xxdiff
-	sci-chemistry/xds-bin
-	sci-chemistry/xdsstat-bin
-	sci-visualization/xds-viewer"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/bin/*"
-
-src_unpack() {
-	if use amd64; then
-		cp -rf "${DISTDIR}"/${P}.64 ${PN} || die
-	elif use x86; then
-		cp -rf "${DISTDIR}"/${P}.32 ${PN} || die
-	fi
-}
-
-src_install() {
-	exeinto /opt/bin
-	doexe ${PN}
-}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index da23373c6a8c..42bcacdb4e53 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gebabbel/Manifest b/sci-geosciences/gebabbel/Manifest
deleted file mode 100644
index 3c612bdd57f3..000000000000
--- a/sci-geosciences/gebabbel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gebabbel-0.3-gcc45.patch 427 BLAKE2B 73ac81ef2047f7f50658056a8b6aa2669d39b7c1f6a535f4c9c40c1812f02849a431d2d4767bd9efbd4b6d931f4b1385eb216ed67cfe79ea96f285d857234e6c SHA512 ff98d0bb776dd02c06884d73b08a809a5915d8f43ded34ce28249b9383a91c3b43cac32d1d5b91a69ef96e264c6550023386836e20f818ce2d1cc1e86e4c0d27
-DIST Gebabbel-0.4-Src.tar.gz 9698769 BLAKE2B 36f3f2585c1ecff8bd7a32f3aa44a9f691a724baa5e09510eaa7fd488ebeb0513d8b48006491023a216105c7b60c8d6f5d09f620d8ae412e0e93a1da0ca948d7 SHA512 96750cf1d3e627b8071d1693c7b31a2fb056f533c6e9de09e4de3550d7a923388c6b8f9634695d19708fd509ec9da537a0b1d477554d7249204754b55dd684f2
-EBUILD gebabbel-0.4.ebuild 807 BLAKE2B e508e268b9a23457143bb3a3be8d2d30e82f48e97f6abaa34ca693497c2707adfea294a2e30dd6a89fa1e3862bac29f37c24041493eff883041eee9ab950c4e7 SHA512 acb4db287b00824e92b6ea1501c5ee53ee0971e6d83973df31b6cf68fcb90ea4ac4290ef29f1297a9e729193f16c87c59f2abeb0e0a56e239e79d6cd892d7676
-MISC metadata.xml 347 BLAKE2B 604913f9b617e6f8d1cbafefd32088d50a8243970e1b3f18572b7ce6f527a20164c8f62b7367fd72315b7a59595fb28c7c7d6bb6a5e45a11f5b0d57125c285d6 SHA512 c5570209bced7856e1f4db36d0e976f766010525bd3076c26bcadec76c1935bd58561ca02163042a7e2d58ec1397f96500a5ab896b94165b2099dd76818b705b
diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
deleted file mode 100644
index f8e7b47f338d..000000000000
--- a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318579
-
---- a/src/MyMainWindow.cpp
-+++ b/src/MyMainWindow.cpp
-@@ -219,7 +219,7 @@
- 
- 		// Creating the toolbar
- 		MainToolBar = addToolBar( tr( "Main Toolbar" ) );
--		MainToolBar->setIconSize( QSize::QSize( 16, 16 ) );
-+		MainToolBar->setIconSize( QSize( 16, 16 ) );
- 		MainToolBar->setAllowedAreas( Qt::TopToolBarArea );
- 		MainToolBar->setMovable( false );
- 
diff --git a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
deleted file mode 100644
index 38141acd13ba..000000000000
--- a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/g/G}
-
-inherit qmake-utils
-
-DESCRIPTION="Qt-Frontend to load and convert gps tracks with gpsbabel"
-HOMEPAGE="http://gebabbel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[accessibility]
-"
-RDEPEND="${DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-DOCS=( CHANGELOG CREDITS )
-
-PATCHES=( "${FILESDIR}"/${PN}-0.3-gcc45.patch )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# do not mess with cflags
-	sed \
-		-e "/QMAKE_CXXFLAGS/s:=.*$:= ${CXXFLAGS}:g" \
-		-i *.pro || die
-}
-
-src_configure() {
-	eqmake4 Gebabbel.pro
-}
-
-src_install() {
-	dobin bin/${PN}
-	einstalldocs
-}
diff --git a/sci-geosciences/gebabbel/metadata.xml b/sci-geosciences/gebabbel/metadata.xml
deleted file mode 100644
index e9dd5e2e89a6..000000000000
--- a/sci-geosciences/gebabbel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gebabbel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
new file mode 100644
index 000000000000..d27394b61a11
--- /dev/null
+++ b/sci-geosciences/gpxsee/Manifest
@@ -0,0 +1,3 @@
+DIST GPXSee-5.1.tar.gz 926296 BLAKE2B 77685685229869bf8bb6c7c71e49c2b2a0a93e7b1d2c16912f2ddc2fa5b779e92a650760c726b4f17b0dcc5154783d3f1c6ab69b44b20257549dc0cd13669d8b SHA512 e963228d168822f9796ec1e5244a5eefcf0ca24f424dd579531fe4749f5d946724b4e76f2c2ab028776d87df6e593e06d04963c2e1e338ec0d12d729be646723
+EBUILD gpxsee-5.1.ebuild 1428 BLAKE2B da53af9fb8095bf78c3a709fbbb1cbbf7f7701bd7e7a263b57e220b99123b85bc710acddbe589c303ac8f735843005dbce7fecbe26ab0d33e59deb1c5e314261 SHA512 174fdbd8ca262e8f457bb2618caef2c9b8c26303cd6bfe9fbdf5e58ba52a187bc353a643d7e763b9e27d406b042846597535980c0abf6cf8e65c6982d46aaebf
+MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-5.1.ebuild b/sci-geosciences/gpxsee/gpxsee-5.1.ebuild
new file mode 100644
index 000000000000..adb87d2d7736
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de fi fr ru sv"
+inherit qmake-utils l10n xdg-utils gnome2-utils
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="http://www.gpxsee.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwidgets:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtcore:5"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	l10n_for_each_disabled_locale_do rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	newbin ${MY_PN} ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+	insinto /usr/share/${PN}/translations
+	doins lang/*.qm
+	insinto /usr/share/applications
+	doins pkg/${PN}.desktop
+	insinto /usr/share/mime/packages
+	doins pkg/${PN}.xml
+	insinto /usr/share/pixmaps
+	doins icons/${PN}.png
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/gpxsee/metadata.xml b/sci-geosciences/gpxsee/metadata.xml
new file mode 100644
index 000000000000..9e1420e8d7d2
--- /dev/null
+++ b/sci-geosciences/gpxsee/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    GPXSee is a GPS log file viewer and analyzer that supports GPX, TCX, KML, FIT, IGC and NMEA files.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gpxsee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1332219efdda..7345831473ae 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 379242c8865a..eac5f8b29a66 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,3 +1,3 @@
 DIST liborigin2-20110829.zip 158364 BLAKE2B fb6902142fe20bd29c8f3dd4c6d0c77b6f94e66f082c6950809367a4049adc1092a5e1abc2705670a15a32d1d680c14fc05061d34d422cd55689bb778ee47fde SHA512 d0e4013a686fbc61c58b1f39e98aace91978bcadffbb2ef9d32576a3b2f19cc2443d595da2d3ecc19298ec6e29c20717db94e1fda6a64d71f3763841228a01c0
-EBUILD liborigin-20110829.ebuild 1160 BLAKE2B e1f73bd95a37e7b3b56b1d30eea68844781f58b7ec1835fcb9754fbe32ad3a8298e71642ef604a41b1a83d97d492dff99d42b51806da502adcc39cc05cbea266 SHA512 824731ddab9a30921f862ad847a4ce6519898d884a9662fbe1ed2b7d95d39a8fe79bb0e252c3d80b09558b809884072a314c49d9453b934084af18a1b35d8b49
-MISC metadata.xml 354 BLAKE2B f728026b428a63680f1b2c70479700bb585cdeffe2d55af983d27af3a20b8d328f8f48cd94e166bc5ccef23d7ba6ee5026c936eca12ba573cbd957683b501ca7 SHA512 22f34d89618d743e35976002620217a1b829a038beede5a7467d62b17e0c70c77fcaa93f9a270ca684eecc15c7f3be98d7683c488de24f0ba27660fa4087934a
+EBUILD liborigin-20110829-r1.ebuild 1181 BLAKE2B 4cfd8ff280f87fca3ce4e7694b53e68651350f91146a133378d12c93e3de134b18eb1039f92b1ec4bf7d674b427c358858e1498e7f69233d14018df66c8c7577 SHA512 aad74ef776c84779083810f0a897983409d67f3036e7d2e56f888c1a95ac4e75f02f2a0ff8c72165af57fb700513873114c86ad8b78316043be2cbfc5428f1ba
+MISC metadata.xml 344 BLAKE2B d186e3d34368240a8e4657f548d1c3e75b0d6efd7f6e185bd5dcabf2bbd42dbfdc6c65940cb9174eea3807b5e409018afc9dc4e2822ae880c0bfba70f53c01c8 SHA512 b673614f7818521f487094df5b41a804e9e3b8cce6bfe3166b64efed3230dbdf46ef8a0d3742ccef1039bf04e6ed76b20dfe168d29a620a270b6524b18735807
diff --git a/sci-libs/liborigin/liborigin-20110829-r1.ebuild b/sci-libs/liborigin/liborigin-20110829-r1.ebuild
new file mode 100644
index 000000000000..27e4ccbbe0f9
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-20110829-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library for reading OriginLab OPJ project files"
+HOMEPAGE="http://soft.proindependent.com/liborigin2/"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}2-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/boost
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-cpp/tree
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( readme FORMAT )
+
+S="${WORKDIR}"/${PN}${SLOT}
+
+src_prepare() {
+	default
+
+	cat >> liborigin2.pro <<-EOF
+		INCLUDEPATH += "${EPREFIX}/usr/include/tree"
+		headers.files = \$\$HEADERS
+		headers.path = "${EPREFIX}/usr/include/liborigin2"
+		target.path = "${EPREFIX}/usr/$(get_libdir)"
+		INSTALLS = target headers
+	EOF
+	# use system one
+	rm -f tree.hh || die
+}
+
+src_configure() {
+	eqmake5 liborigin2.pro
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd doc || die
+		doxygen Doxyfile || die "doc generation failed"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/sci-libs/liborigin/liborigin-20110829.ebuild b/sci-libs/liborigin/liborigin-20110829.ebuild
deleted file mode 100644
index 801a874105f3..000000000000
--- a/sci-libs/liborigin/liborigin-20110829.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib qt4-r2
-
-DESCRIPTION="Library for reading OriginLab OPJ project files"
-HOMEPAGE="http://soft.proindependent.com/liborigin2/"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}2-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-cpp/tree
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${PN}${SLOT}
-
-src_prepare() {
-	mv liborigin2.pro liborigin.pro || die
-	qt4-r2_src_prepare
-	cat >> liborigin.pro <<-EOF
-		INCLUDEPATH += "${EPREFIX}/usr/include/tree"
-		headers.files = \$\$HEADERS
-		headers.path = "${EPREFIX}/usr/include/liborigin2"
-		target.path = "${EPREFIX}/usr/$(get_libdir)"
-		INSTALLS = target headers
-	EOF
-	# use system one
-	rm -f tree.hh || die
-}
-
-src_compile() {
-	qt4-r2_src_compile
-	if use doc; then
-		cd doc && \
-			doxygen Doxyfile || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	local DOCS="readme FORMAT"
-	use doc && local HTML_DOCS=( doc/html/. )
-	qt4-r2_src_install
-}
diff --git a/sci-libs/liborigin/metadata.xml b/sci-libs/liborigin/metadata.xml
index 2ad80b902110..c049cd0777bf 100644
--- a/sci-libs/liborigin/metadata.xml
+++ b/sci-libs/liborigin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
-    A library providing IO for Microcal Origin files.
-  </longdescription>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		A library providing IO for Microcal Origin files.
+	</longdescription>
 </pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a46eb2b6a136..ff841521ca3a 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index eaba5b811f36..e86b6e6f15e4 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -9,7 +9,9 @@ DIST p95v294b5.linux32.tar.gz 5455113 BLAKE2B a615ff15a77eaeebd6a1324f59e6b780d8
 DIST p95v294b5.linux64.tar.gz 6244650 BLAKE2B c81623f70c66ec9443c1f4858851525b9064bcfd948bb831f63774e6a09ee2e86eb2e295db4d849ac40e55f1d5166a470e248b5eac0a4b2a4322b7041f1032a9 SHA512 e315ea226649df2135895a1206e5845fd05587ad190b676228e5e1cfca04a11b698f1a7d5b8e7c96b0cd174ce3dbeb6000240b67a3f0f90572f3bf15166020e5
 DIST p95v294b7.linux32.tar.gz 5455201 BLAKE2B 2d542c06fb490f6619884be3cd510fb77e130184d2b7d3bb44fd375fcd7c95e38ef4cf80ed01079c9f395d6e8a526930a07357f20e14277beba4e232f4e2ca27 SHA512 21ee6a8f0a4482bdb22d80093b24a8b9d7e091577628dc797ad01d3a0ab98e946814c70a6313e2624fffa6658454707f88d24608e107048fc6361d15aa5a7fbe
 DIST p95v294b7.linux64.tar.gz 6244730 BLAKE2B ca5d0aad96e9bd5fb1bcb232435a26b7d8c2b9d869a6dc638d883fb892013df7a823abb0dae4545c2191b5f39b9cd29ee83400f452fbe63255f2dca899ad6bce SHA512 0579ea9ca1977884c8c50f8c8655b0fef1d5e2b456adca23d6d93542734727f265dc8f784c27fc9510c89afeec7386d4a9a9e9b5d691a97fed8189bef5577b3d
+DIST p95v294b8.linux64.tar.gz 6244091 BLAKE2B ec02f582296f8959765f97526646f2f4a679a2b61d3c8e8efc971bf765c7f3b5cd4a9e2667661bcc6b0a3a088d095671af9b1f371f0e671de495935d582bf8e7 SHA512 bec8ce2081e9e349317441bbaa724e5d21ddfa1e328ccb6a17af796d41b201d96b2835fc2afcd68e350b22213225812cafdfca7973a7cd2071c1460188b3245d
 EBUILD gimps-28.10-r1.ebuild 1427 BLAKE2B 96df89e289d93e9fb89ad2a21fbc45fa3d2ab7cc1d465f50d50fac4a424a50b2a90cdf6388653564b0191116cadb317762891286e33ccf97ace25d31f51979e0 SHA512 8ea450a833c7b7085cdd1065460a5d53f4e96c236c85bfca1439954898f426b7384dbedda750bb1a0a7806f815d253febfcc31168a3a1d0fd1b3a64098b6b26d
 EBUILD gimps-29.4.5.ebuild 1742 BLAKE2B 89729f28018d5430f6de4a2e85cec4f100e14b25c1a80ae56ff6e02617dcd249e06009a83fac001fd5237bf05cd427451c96131dcdf9ba93779104be8f04393d SHA512 6cdfacb26766255228b29f09f2ba1c11b7c8c83e76a2c9454dce47b91c383505c9cd57399433d198a869f91ea8e85146e36cc872f41071ea72d9cd217645478f
 EBUILD gimps-29.4.7.ebuild 1742 BLAKE2B 57830e98d2c26168e5fea43ea19906b8d48248679a8e9373b1c9992eec55befe5c536c468f6b38867ae37a1763f942ed67a7190ea93b4aad6087308db455804a SHA512 763dd2ba4c730ee396cf4327242a038ec652e52af10b405e46c66fa3dcb930585d661a9eacd8a855f6680f07aae57de6c8acff6a768e24ebd66a5b8539b93c97
+EBUILD gimps-29.4.8.ebuild 1671 BLAKE2B 4f3541729513dfb3a0fe3da078bc82cf0bd0cb21112fc7334e2e612749a970de7f9648e6ec282ffd95e2a16bd10bbdcdbf91927d095039661cd73fc36a93e070 SHA512 f2f25a84d7e7a196002baeb44e0e5c045f3669f38098c10e7cb550e349313dd05983579d17c86297371448feebd5d5e99aef8ac76f83024310c3c508330a2ca3
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-29.4.8.ebuild b/sci-mathematics/gimps/gimps-29.4.8.ebuild
new file mode 100644
index 000000000000..c6c82e67d5b4
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-29.4.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils systemd readme.gentoo-r1 versionator
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="http://mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(replace_version_separator 2 'b' )
+
+SRC_URI="
+	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )"
+
+SLOT="0"
+LICENSE="GIMPS"
+KEYWORDS="-* ~amd64"
+
+# Since there are no statically linked binaries for this version of mprime,
+# and no static binaries for amd64 in general, we use the dynamically linked
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${I} /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${I}" || die
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index a23de2a8cb3a..7e9de791003b 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 9fc48bc70987..0025b86a3972 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -7,5 +7,5 @@ DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c1
 EBUILD bullet-2.83.4.ebuild 1423 BLAKE2B d51d53c96900aa888797c96a9e1b35ebc2cb4b9bf9de54f6277c24edc26504e39987a039a3c7a012595f562bf36c8af017eb386cabbee7cbbbf8ec05a34ed894 SHA512 b1678661e9c88a7322bc3fa3d24f9371a40ed2c2002aa5b2ce957366ed5541df372d0bbcb2ae62a3627554da1b938fd9e2ae080074498489cecc861da1e1dbb9
 EBUILD bullet-2.83.5.ebuild 1425 BLAKE2B 86f0155d9805256cb9105efefb89fa1e978fb7de5cb645366b3ce7e806233c4ac30385ef233fcdecac144ffef562ed5c70b9db775a8f163781c25cbcc978feac SHA512 8e453e02afbb923106ca86d486ff4519f773db990dc06babc5ad804d051e14dd2a59e7507a334adc791ed5203e21d50d98ec1d743c9508a3ec0fb1758ddf5101
 EBUILD bullet-2.85.ebuild 1596 BLAKE2B 2e841c13dbab318cad9fcb1ff0fe6aabff36e2072c826cec2eae16897dab5c3fedc1772629738c426b73f74eb66d4975e4533bbb840334d41686e4fd23dbca2a SHA512 f88b82ed50baea8bba06cd03a469a069b6ce32c3e09c1f048d3a1f02747dfba38f13217bf0dfb92f187321c76901de84ae7958cc713a6cb8be378f811e991d0a
-EBUILD bullet-2.86.ebuild 1560 BLAKE2B db418eda81ed39fde198b98b994abeb23dfe66607b2eb917cd53c1a1019e2f9af46b785efc8765a0e0b650162e091f1ebcd747173c3baefb66af4378433c135c SHA512 3bfaf67eb248f8790a2dac686e75718b09ec5773cd23935fff54585ffc6bb70a83e18d2a55baf70cbf5a5085a2a398e755e318039e39f0185e0f790419c617fa
+EBUILD bullet-2.86.ebuild 1565 BLAKE2B 7f9827c80dd9d0ccf482fe36ae07061960621fd10477c8242343ac7994ec9acc407e0e76b555721b0784fd9722618118a5ffd1cf2279287ff70b2cce110a6f9c SHA512 78e4e8f38f463d499101588df5988c54dfb965494e36430a536c3f421dabdbbafa11fa0f031bf7f0aefc77e402d7102930b5c6e3fc25e6b5851ee67d46a544e4
 MISC metadata.xml 797 BLAKE2B 93cd685b55738775206eb8cf47c0c5d76152faf6c3e535f60d2f38251cbc33c9657ef39f1c9276384d569ab4bba393070f6c52c00ed83cbea5ebc4b7708ef674 SHA512 812a02f3145a9a4b7f73f4549b358af86e698efb9fe17c11aafcdb2fa066171d95cf0eb2992150cf0d1a6b919d8ddba22f483623d3dfb5fbd23d42e8ec39f689
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
index 3a22c4b3a915..5609217804ba 100644
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ b/sci-physics/bullet/bullet-2.86.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://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bullet3 doc double-precision examples extras test"
 
 RDEPEND="
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 55d2af6de8f7..ca87b1c5c15b 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/xds-viewer/Manifest b/sci-visualization/xds-viewer/Manifest
deleted file mode 100644
index c432b1c89266..000000000000
--- a/sci-visualization/xds-viewer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xds-viewer-0.6-fix-c++14.patch 2139 BLAKE2B f866516641eb13c503539157dd71aae58c4d3909a38a088fad28278797e170b05ee9e7af704f7f4f98582a74316a9295f3fffeea911818c969c8e88dd9a51463 SHA512 2b6d1d5598a016c2806bd54a027b1b23bbfa78cca4e7293df9e80eef8fbed3b084f29d1c499670a5d4b83681c7761a13897c7ccbe78599f6a0bc1cb468121444
-DIST xds-viewer-0.6.tar.gz 408315 BLAKE2B e514746ec4936e1ac30bbc4054555a988b9739f0705510be2daffbb9f5d45c5e785ee283055e80f9fb7fe677fba01c88524d183906025cddeae392f86d909be2 SHA512 4a7798997147e569aeeabab958b41198da29d336273e4b16b8d3c8766f2a16256727e9620a91b8f202125c9f5daedbd37e79352bb563fd431475b806deb3629e
-EBUILD xds-viewer-0.6-r1.ebuild 566 BLAKE2B c7da7b79e3194ae710d0fd56b473539fffbe7e0199ea192cb2464e8f081fb5b706920b74f6ef29ca4b521688ffaa037d6b9df5be0237d1b0787ad6f939e652a3 SHA512 f85cc8c389b34a5f58a43b175c44363c1c9f6b3c06598a9a5ad9edc5da6e5745f580f0761981c5872d9da00913556243d442b3ed6fb93a8357bf48586bdff382
-MISC metadata.xml 985 BLAKE2B b87c1650a8a0506d039bfad459826d61503f62db0e20539a2337f5e08d7c16b587e29390deff7dca7b8f9cd18b61911d2615d49516a6f8b71b730d361bbe8a1e SHA512 4daebbf5c5b83c76c77ad12467dbb9a5593f6a693acfdc027da7d3b215f53cacf7d4f2f1cc61f13e152e66a19c62d3715151bd9893495d67915d76b4e9d98b0d
diff --git a/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch b/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
deleted file mode 100644
index 612b5038c845..000000000000
--- a/sci-visualization/xds-viewer/files/xds-viewer-0.6-fix-c++14.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Fix building with C++14, caused by invalid implicit T* -> bool conversions.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=598126
-
---- a/src/CbfReader.cpp
-+++ b/src/CbfReader.cpp
-@@ -315,12 +315,12 @@
- 
- 	for ( int i = 0;i < nx*ny;i++ )
- 	{
--		if ( tapin.get( sc ) == 0 )return -4;
-+		if ( !tapin.get( sc ) )return -4;
- 		diff = sc;
- 		if ( diff == -128 )
- 		{
--			if ( tapin.get( uc0 ) == 0 )return -4;
--			if ( tapin.get( uc1 ) == 0 )return -4;
-+			if ( !tapin.get( uc0 ) )return -4;
-+			if ( !tapin.get( uc1 ) )return -4;
- 			tmp0 = uc0;
- 			if ( uc0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 			diff = uc1;
-@@ -329,15 +329,15 @@
- 			if ( diff > 32767 )diff -= 65536;
- 			if ( diff == -32768 )
- 			{
--				if ( tapin.get( uc0 ) == 0 )return -4;
--				if ( tapin.get( uc1 ) == 0 )return -4;
-+				if ( !tapin.get( uc0 ) )return -4;
-+				if ( !tapin.get( uc1 ) )return -4;
- 				tmp0 = uc0;
- 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 				tmp1 = uc1;
- 				if ( tmp1 < 0 ) tmp1 += 256; // converting signed to unsigned char
- 				diff = tmp0 + 256 * tmp1;
--				if ( tapin.get( uc0 ) == 0 )return -4;
--				if ( tapin.get( uc1 ) == 0 )return -4;
-+				if ( !tapin.get( uc0 ) )return -4;
-+				if ( !tapin.get( uc1 ) )return -4;
- 				tmp0 = uc0;
- 				if ( tmp0 < 0 ) tmp0 += 256; // converting signed to unsigned char
- 				tmp1 = uc1;
-@@ -359,7 +359,7 @@
- {
- 	std::ifstream::pos_type streamPos = tapin.tellg();
- 
--	char binaryMarker[5] = {12, 26, 4, 213, '\0'};
-+	char binaryMarker[5] = {12, 26, 4, (char)213, '\0'};
- 	char buffer[5] = {0, 0, 0, 0, '\0'};
- 
- 	bool equal = true;
-@@ -448,13 +448,13 @@
- 
- int CbfReader::checkImageFormat( std::ifstream& tapin )
- {
--	if ( tapin == 0 )return -2; // Cannot open image file
-+	if ( !tapin )return -2; // Cannot open image file
- 
- 	{ // Check image file format
- 		std::string s( "###CBF: " );
- 		char label[9];
- 		for ( int i = 0;i < 8;i++ )
--			if ( tapin.get( label[i] ) == false )return -4; // Cannot read image file
-+			if ( !tapin.get( label[i] ) )return -4; // Cannot read image file
- 		label[8] = '\0';
- 		std::string sLabel = ( std::string )label;
- 
diff --git a/sci-visualization/xds-viewer/metadata.xml b/sci-visualization/xds-viewer/metadata.xml
deleted file mode 100644
index 0177b9503629..000000000000
--- a/sci-visualization/xds-viewer/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  XDS-Viewer is a program for viewing X-ray diffraction and control
-  images in the context of data processing by the XDS Program Package
-  (external link). Potential users of the software are scientists
-  working in the field of crystallography. The XDS-Viewer is a
-  standalone program which has build-in support for a subset of the
-  Crystallographic Binary File Format CBF (external link). Other file
-  formats are supported through an external convertion program that
-  comes with XDS. XDS-Viewer will automatically invoke the convertion
-  program for images other than CBF. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">xds-viewer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild b/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
deleted file mode 100644
index f331c821dc71..000000000000
--- a/sci-visualization/xds-viewer/xds-viewer-0.6-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="X-ray diffraction/control image viewer in the context of data processing by XDS"
-HOMEPAGE="http://xds-viewer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0=
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( src/doc/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-c++14.patch )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e78a62df03d6..dd00f66970d2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4231a96481ae..e4bac3253ad8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.3.tar.gz 1534438 BLAKE2B b578bc4f8a53bd596f13a2bc45e5229b30a9aacb837fe3ef3b267eaaf5e8e277c21b9c2b915495d5b58a36b386b9b223ff219cfe2082ca6d18fae2cbd37b1ff9 SHA512 4a39c6d2da5ca83f9bf2a6aba9a63cd716622f6bfda4760c7abdc73932d86dc41305cc8780b3292b208c285fddda6edd926d58d2c90847e34130e6f145b5c6b7
 DIST fwupd-1.0.4.tar.gz 1555679 BLAKE2B 75282437169cbb5a0da8d4c296ddd4fe62e32f4bd4d4b6d386b57708869a1dfc591a991c4c17dba5dac80f84e7238181b0beed654da453f72cc8e92f9513d3df SHA512 20f24253c4ee5c90d6d262ebe5c515bea78c6cc3720e78bdcff04c1b02500a79de583886ce0ae6c48d24b9c3d9638c4c5896d57d2efc0b77346317ba53924d2a
-EBUILD fwupd-1.0.3.ebuild 2468 BLAKE2B ae4b1a59eb7e81f6faf75b7df3b1a7bb446df4207dee13f286a86b0783029e9da3b9f34453305b77eacaa96358c24546cd4eb0086505d82192e7a0fd30011da5 SHA512 3fccd7b9c663b765bd07c2eef41a10e4d4a4f8085901f5c3e510e00810a8eb3e52d45c0bf2b63b72abcf1005b883676f2a82f818aede3cf136df8cb1406db612
+DIST fwupd-1.0.5.tar.gz 1564037 BLAKE2B 1b97cf35e2531fc11b901f061dc30ac0c6b745f32f0b2f756e428509121ac3269d8d51c273566290cba2b840c890ce1274a268d46c35bd6486a932454c2d2cfa SHA512 dbbd0ae574c493de5d89f58e0050e44fd3cd1353807131d7e821ae02cffd4da594855df0ed35e9ceb72bdfc9c4b670e022d184c24897bf2ed370ce545c578621
 EBUILD fwupd-1.0.4.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
+EBUILD fwupd-1.0.5.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
 MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
diff --git a/sys-apps/fwupd/fwupd-1.0.3.ebuild b/sys-apps/fwupd/fwupd-1.0.3.ebuild
deleted file mode 100644
index de768b752cdd..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
-REQUIRED_USE="
-	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	app-crypt/gpgme
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	dev-libs/libgudev
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=net-libs/libsoup-2.51.92:2.4
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
-	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
-REQUIRED_USE="dell? ( uefi )"
-
-src_prepare() {
-	default
-	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dplugin_colorhug="$(usex colorhug true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged yet
-		-Dplugin_thunderbolt=false
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.0.5.ebuild b/sys-apps/fwupd/fwupd-1.0.5.ebuild
new file mode 100644
index 000000000000..c5747fe2cd8f
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.0.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit meson python-single-r1 xdg-utils
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-crypt/gpgme
+	dev-db/sqlite
+	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/libgpg-error
+	dev-libs/libgudev
+	>=dev-libs/libgusb-0.2.9[introspection]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	>=net-libs/libsoup-2.51.92:2.4
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.3.3
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	systemd? ( >=sys-apps/systemd-231 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	uefi? ( >=sys-apps/fwupdate-5 )
+	uefi_labels? (
+		x11-libs/pango
+		x11-libs/cairo
+		media-libs/freetype
+		media-libs/fontconfig
+		media-fonts/dejavu
+		media-fonts/source-han-sans
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/gcab
+	app-arch/libarchive
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	test? ( net-libs/gnutls[tools] )
+"
+
+# tests require some ominous "certtool" which has not been packages for Gentoo yet
+RESTRICT="test"
+
+REQUIRED_USE="dell? ( uefi )"
+
+src_prepare() {
+	default
+	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dplugin_colorhug="$(usex colorhug true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		# requires libtbtfwu which is not packaged yet
+		-Dplugin_thunderbolt=false
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 906558da672c..89f492b06d3b 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -2,8 +2,10 @@ DIST nvme-cli-1.1.tar.gz 207679 BLAKE2B 16f442f1896ff6d91301f97948a02a944711f753
 DIST nvme-cli-1.2.tar.gz 228964 BLAKE2B 27fba038bc9deb931d7a3f864f98dbfeb7af41267ca0e6b4127188403977295e08e8ab88f431d1a12f748c0d523f00ae2302ab2e81f2a32a61e9c40cdb350ac1 SHA512 42e31f9c7e5a4e3d5c500844e7a1f599bf52b3d4ea8312b518232ea94940487aa6f191b6711266b6595c8b3bca61f2f269168ca61201fe12e6d47c3a53629b00
 DIST nvme-cli-1.3.tar.gz 236788 BLAKE2B ad8035692b03f7ab988397ddddbbb6ff6b7e8f669628b0bb31401847fa5d0d4e83d5886e1214fed6b7e54bb2677ed84c9856167eecb31b9599c359d283d77d68 SHA512 0794e72124e73af619a71dd01879d178ad48d30155326e854fb5447e0bb5b879049a7a0a2e3b5301a0de1207034fbbdca07ecf647ff7d4085d56dc793271b576
 DIST nvme-cli-1.4.tar.gz 260269 BLAKE2B 00c3878c9bbf3c1f934df3a3bf8a4188b53045dbda0cdfc437c6998f22269f1d5954dcf3fe2176fd66086904331861a8c9fae50b33e9b2f654fb08dff08f4320 SHA512 8d7e2f0717562bfe2306306830983644e4b118bd6705a0386fcae02f6d171faa76a6d594f01fc8ee57dcbf1a41ea0a84cd4527f7a729fddc3431975cf6914955
+DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
 EBUILD nvme-cli-1.1.ebuild 579 BLAKE2B 06020bc5380471ae36104ca1d0f603a1cb2c9e73bf086d11a64dac9b344c54746af0680dccbfe68cea2683c45e747ff8f9e76af84774618f0d79efdb295634a5 SHA512 cfc6f7bd2f6dbc070c604c4e72ca406e29e2e2d240b14559836054039ae71f5f0eda82e808558115e97e4ac19d29d178c9fa584045ecf60458f1dcb743a62358
 EBUILD nvme-cli-1.2.ebuild 595 BLAKE2B 63bbaa12561818fae5ec1bdc49e1589b8b403c21f64c8bb8525cb9bad9425d66eac7d7a5112cb569a30f25e2171a1f0b044d524eb868932c1651dc70f4667c81 SHA512 5cdc918133b831a3c5c8cb78af07107770e60c2aef399834b3c6c17ba0628986d902d90b22149ab8bc23be341653788e708d1a6dd4f8543001ee569262beacbe
 EBUILD nvme-cli-1.3.ebuild 568 BLAKE2B ecf0ba7fadc2aaaf14da03c66ced763dce19e20eacacb9f68617528740a58d2d6862fdd4efe057fd5a9d0ef04b3d14cc1cdec35de7242958aa3e5e4e60f41179 SHA512 db12e2ecfcccab7cadaa134695e5235c98baffe34d76b889e12119a73b49c630fa5a82d6894caacb17dbaadaac4f4536031ef3b4dfeedc01a067999e897c999f
 EBUILD nvme-cli-1.4.ebuild 566 BLAKE2B cb2dd807e6c5328816a527a5ebae478cb323506fde758fd2f47c23e620a195373163b030ef6f57bd4863e90c5099efff0ac76a8486d12e2ae8e01ce70efb7403 SHA512 1bd5660ea24b05ad923106b860c11b1934f78da54c87c9ae5dd2cdfaa4f7a44bb0af9c5170da3a231ea915e6697c5f8e47e67c01d02403885007f726bc64fec3
+EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
 MISC metadata.xml 310 BLAKE2B 08c09b5876534bafc616d925be9898f2679ce3727a430ebcebd265b1a330118f3f14aab98189112e718bd7d6762878d2445b514d85bcf792b92144ba8ce36bd5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616
diff --git a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
new file mode 100644
index 000000000000..66b123fe5141
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+RDEPEND="sys-libs/libcap:=
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2b3a679021a9..0ce05c17dd24 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,12 +1,9 @@
-AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
-AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
 AUX 237-0001-networkctl-display-type.patch 9575 BLAKE2B 17b42e55d7f9eb2452d2826bb62a8b2ee4f6655d686c21a0f6471629aef06f171427baa79a24eff910ff8c3dc0a7612fa48fc6df1f4de2c586852e1eb4498c85 SHA512 8378a1c153e92d3fad084c57badfa9bf13faab5e9e6319ab3be387b1c609cce5fcc481776365da2cfabde7c9f7c9f4fe24e280b53c76d5813eceeec800d173f0
 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
-AUX gentoo-uucp-group-r0.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
 DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
diff --git a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
deleted file mode 100644
index bd2b3364369a..000000000000
--- a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c013a410d0ec5f419ce8d53df19946795849591b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 8 Oct 2017 09:47:05 -0400
-Subject: [PATCH] test: skip hwdb and sysv-generator if the features are
- disabled
-
----
- test/meson.build | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/test/meson.build b/test/meson.build
-index 995a97177..c2df7ec22 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -163,9 +163,11 @@ endif
- 
- ############################################################
- 
--sysv_generator_test_py = find_program('sysv-generator-test.py')
--test('sysv-generator-test',
--     sysv_generator_test_py)
-+if conf.get('HAVE_SYSV_COMPAT') == 1
-+        sysv_generator_test_py = find_program('sysv-generator-test.py')
-+        test('sysv-generator-test',
-+             sysv_generator_test_py)
-+endif
- 
- ############################################################
- 
-@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl')
- test('udev-test',
-      udev_test_pl)
- 
--hwdb_test_sh = find_program('hwdb-test.sh')
--test('hwdb-test',
--     hwdb_test_sh)
-+if conf.get('ENABLE_HWDB') == 1
-+        hwdb_test_sh = find_program('hwdb-test.sh')
-+        test('hwdb-test',
-+             hwdb_test_sh)
-+endif
--- 
-2.14.2
-
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
deleted file mode 100644
index 9c11106f6058..000000000000
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
-From: Susant Sahani <145210+ssahani@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 11:55:57 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
- (#7030)
-
-If FIB Rules are not supported by the kernel then networkd fails to
-start as it retuns error=-EOPNOTSUPP.
-In this case just ignore and let start networkd.
-
-```
-sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48
-```
-
-```
-Oct 08 10:22:24 naomi systemd[1]: Starting Network Service...
-Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: Operation not supported
-Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited, code=exited, status=1/FAILURE
-```
-
-Fixes #7027
----
- src/network/networkd-manager.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
-index 71445d5dd..200d0f622 100644
---- a/src/network/networkd-manager.c
-+++ b/src/network/networkd-manager.c
-@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
-                 return r;
- 
-         r = sd_netlink_call(m->rtnl, req, 0, &reply);
--        if (r < 0)
-+        if (r < 0) {
-+                if (r == -EOPNOTSUPP) {
-+                        log_debug("FIB Rules are not supported by the kernel. Ignoring.");
-+                        return 0;
-+                }
-+
-                 return r;
-+        }
- 
-         for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
-                 int k;
--- 
-2.15.0.rc1
-
diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
deleted file mode 100644
index 89cf552c8295..000000000000
--- a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
- 
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
- 
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 6fcbb652ac14..e57c2539a758 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -17,5 +17,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r17.ebuild 2467 BLAKE2B 6c7e824f9b04f39482eeb87f0bc8dc8b3a92eae7366647b3c06912ca945041fbd963eee67cef8dd9d5aa4fb9d50dde7659e2b0f2dce59ad2040ea259e9d0ef3e SHA512 5691a29591259022e80a6cfbaba6d4755846223b14bce64c7df0e0e7ef08c57877f612b6e2b19da7d90a0c4dc8b3d8d5c8885a1b21eac19bd48bf527739e10d3
-EBUILD ucspi-tcp-0.88-r18.ebuild 2119 BLAKE2B 4b976deb4d3a37061d16d24094192271a1595177cb6f6bb501c6be30ad505ec9fa0230c42783cd1afb132dacf7dc567dd85d65e04618241eb93050e3ca95274d SHA512 956a8c8bca90885dc968974e7538a91b156effc3923a3ecf166073533e437dffb2de7bfcf475f1a2002398078aa894d8be61e81e648d84f32a73577b591a38c3
+EBUILD ucspi-tcp-0.88-r18.ebuild 2115 BLAKE2B 4c7555834596e83e67cf3770804fea99fac3ada917e27845b5a20cf37089adf3013a74c4b7fef3121612b4809b5bd6840b591383163b90ceebb3b3130df6e761 SHA512 80df49862fb804dc5d050a9e3a87d7dbd908434e40e9f735001f56cee6721c5139e04b7e4a6da58101add93f507aa7a71cede854cabf4e77d3b297efdbce3ac8
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 85884df56cf1..1f6e89fce9fa 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index ac1de5060745..048cb7a2b628 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,7 +1,7 @@
 DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64c7272ad599a8cf5f6e21f694524e05da2d8672c4892faa7b744be46bdfff521dbcb4944715d45b24d5925972ac4 SHA512 f8d26d59d5a530aa413fabe2402fbbd9662760453c2b4e83d34f2e5287c188114ea870f15ae1bc910297649986315be965f0d23d0a2b7b0cec2f207fc65d7598
 DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
-DIST usbredir-0.7.tar.bz2 317216 BLAKE2B b1b770ed5e88161e8ccb57367d0f2e2ecd9755b43977085b0227f0f3d7713b508b303f2cb803dfbe6b1c8cad9f51e6fef8ae138d83fcdf48f84109e510e34e6c SHA512 f615fc52f195c7159d16b551f6ecd9426f2aad64222f24b964fbd66fbf59498d80d4d5cf851cc1be9ddd27a9d962afa05970e1379f1ef02e8ac304235e82ad4a
+DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 EBUILD usbredir-0.7.1_p20170503.ebuild 996 BLAKE2B 2763f27eee0d53ba70ce3681f747c03a76ac201e2e469d781c8af634f3a046fed05d6f4f768960c551683449b7198abc153d54aac95808d37537530ba32b38dc SHA512 6eedca169265c5cf0ff262a1b805a8832e95c05d9af297608984709125cc5d972ca504c42118ed907b91edf342fa8c83b6f08fbf9dcb2d1d600801d3a1e128dc
-EBUILD usbredir-0.7.ebuild 840 BLAKE2B 06e9550c39b6370c172ba89630381841868e5282e5ec937c67353f03a59c4edcb2b98844853474ba642370a2c09743bf1211bd6eee23ea5e410ab0e4e0028838 SHA512 f4de5f68250391c49407597459a9b0fb6bf7976ef9275beebba72a390069a380fdf320cb4d1a832bbb066ccb55c6ba35b61bd4c9ba28c159ba6569a13c90c571
+EBUILD usbredir-0.7.1_p20180211.ebuild 1010 BLAKE2B 65a5caa3305485112723f29d3480e25dd67e77ad50bd069a00b8d46b5e5143263ecc2690a5b7b58a0ce81e80040aada4bc5918b52a9b141800edd43dde632319 SHA512 937feaed1957166fe3f6a25f01ae702d0625f42857b28302eb0ab86e7c550b0829169e389d330508875c544d15b65275adc2fa2b7081c792c6d3dbdfe515825e
 EBUILD usbredir-9999.ebuild 847 BLAKE2B b6a67f1e6c2eddae470b8b176315c67de20a8ca0936832a0bef022b3fc22716797964a125dfd8ad10ea6fb6a4ebbcd14f888d20648d4f79e4c2a39967ca73542 SHA512 18c1926ad3c95992bf65530a7e1b852cf177cee063e4f93373c166e70fe088f0dda0d94df99c7071c7e2f6c508ae153c234e4c958a96804815b3da7da57a2865
 MISC metadata.xml 361 BLAKE2B 58ee743a25bff089895528495050dbde3fb7acafac2653762d5eca42fb085e644df689eba522d31d2168e703b04e5748b8907d9df88950cd38de523360dc1883 SHA512 3cf32d1610947c8e1fe9acdcce071a5b5d7ac6711c7d81f0c87f31e7e2d07b13a012312f1380e30c54c95f7371963cde9c76052914b6582507ce964621673cd6
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
new file mode 100644
index 000000000000..511853883be1
--- /dev/null
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+MY_PV=${PV/_p*/}
+
+DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
+HOMEPAGE="https://www.spice-space.org/page/UsbRedir"
+SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="virtual/libusb:1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${S}_p20180211-patches"
+)
+
+DOCS="ChangeLog README* TODO *.txt"
+
+src_configure() {
+	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
+	append-cflags -Wno-error
+
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	# noinst_PROGRAMS
+	dobin usbredirtestclient/.libs/usbredirtestclient
+}
diff --git a/sys-apps/usbredir/usbredir-0.7.ebuild b/sys-apps/usbredir/usbredir-0.7.ebuild
deleted file mode 100644
index 9225004b14b2..000000000000
--- a/sys-apps/usbredir/usbredir-0.7.ebuild
+++ /dev/null
@@ -1,35 +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
-
-DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
-HOMEPAGE="https://www.spice-space.org/page/UsbRedir"
-SRC_URI="https://www.spice-space.org/download/usbredir/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libusb-1.0.19"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="ChangeLog README* TODO *.txt"
-
-src_configure() {
-	# https://bugs.freedesktop.org/show_bug.cgi?id=54643
-	append-cflags -Wno-error
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	# noinst_PROGRAMS
-	dobin usbredirtestclient/.libs/usbredirtestclient
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 130e3ac92ebc..e883da4d28f2 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,10 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
+DIST util-linux-2.32-rc1.tar.xz 4540628 BLAKE2B 2ece393a3ba334cd1e39e38b47330ea588b67034be2fcdd88ff38ac06c8c20099d177119e4e186d207df02d2aefed03470ec2f3538497df3b2cb6fef9c63dbb7 SHA512 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1
 EBUILD util-linux-2.30.2.ebuild 6088 BLAKE2B 90967f2b8c4cf9e5125226fe2bd34a4bf0786e4380316c13ead390daa81165bf39b106a344c0f1de27db1623f65bb0ca17ff285090358d57d68415c66de1c0c2 SHA512 92e96b92c6e6e05b2d828f0f7f41ef99963a9b6fe82dfea85945c7986a67fdb7ba3f8291e5abcd1124fd3973ef415d09f337fdf1828eaf7bba87fb2a2de574aa
 EBUILD util-linux-2.31-r1.ebuild 6200 BLAKE2B ac7a9047da0ba8ca5c3b0d74ffad0279959579573ae921db0e2484ad605b61357cd544762464fddec4a13c30ca71d836ad6c45114b524ef576e15595e6e56464 SHA512 6ac9ff512e5090bce89279e9c91ced5a6d5b654e67827b80041b3998b5ef3641e91cb855fe9a43640b1327c511128c3557a0c5d027add52bdd89720baa04aec0
 EBUILD util-linux-2.31.1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
+EBUILD util-linux-2.32_rc1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
 EBUILD util-linux-9999.ebuild 6090 BLAKE2B 912da0452d851eef8b8d9dfdf014117a4d62e3e4ef3bd6cc27c5fe7251cf8b08fae6aa9fe8ba4caa1de00f2c226c7550dfcf02f9943d63e8b643ac6fe5dda3c1 SHA512 21f6cfe59cce0a8bb08e462011296fe5f2a21ba1a62fb57de74659dde40f432f9b81bacdd7a6bc8422609bbed73b601204d80147f82bf270c643f1928efc37c6
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild b/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
new file mode 100644
index 000000000000..ee5b6efcc218
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
@@ -0,0 +1,202 @@
+# 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 toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-single-r1 multilib-minimal systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1
+	!<sys-apps/s390-tools-1.36.1-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	local myeconfargs=(
+		--disable-chfn-chsh
+		--disable-login
+		--disable-nologin
+		--disable-su
+		--docdir='${datarootdir}'/doc/${PF}
+		--enable-agetty
+		--enable-bash-completion
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--enable-line
+		--enable-partx
+		--enable-raw
+		--enable-rename
+		--enable-rfkill
+		--enable-schedutils
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(multilib_native_use_enable caps setpriv)
+		$(multilib_native_use_enable cramfs)
+		$(multilib_native_use_enable fdformat)
+		$(multilib_native_use_enable nls)
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_enable tty-helpers mesg)
+		$(multilib_native_use_enable tty-helpers wall)
+		$(multilib_native_use_enable tty-helpers write)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable unicode widechar)
+		$(use_enable kill)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(usex ncurses '' '--without-tinfo')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index a06bf617ed93..8d96bb9c541e 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest
index 7ffe5e91fdab..df4356c8ad5e 100644
--- a/sys-auth/google-authenticator/Manifest
+++ b/sys-auth/google-authenticator/Manifest
@@ -1,4 +1,6 @@
 DIST google-authenticator-1.04.tar.gz 54019 BLAKE2B 06afb1be1ceabb68bb7ba94921af415fe1dfd68b3b1ed75b58b3c5a58901ec482ae11063f487db0a7032868e833644022335ad9844f54734c2ad78c514f255a8 SHA512 e4b8ad74301312e17edd0a7f25257086fd805c8d5215b06b71d96e9a64a71b2c87d0c5a532d9eca21d6d67e30c02c2c2c77dbd338a2f49af25c32dcd355ee98e
+DIST google-authenticator-1.05.tar.gz 57778 BLAKE2B c31d7929e2aacffc159ee5384f6f31498585819b848f4f8b026519cf2f2fc566b8533e007844c64d348f1cf423a7175b3221f879c5c1ead360c4f1b3acea57ed SHA512 d97b26c6181dbce0612628484db37b1bf61e984fb2fb3d4974d04038e564404aa17415368dba524f0d17d96ec8d57ae4129b27f0c672d849d16ef03941d87996
 EBUILD google-authenticator-1.04-r1.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
+EBUILD google-authenticator-1.05.ebuild 1262 BLAKE2B 3b27489b8d18d5805611098bbfaf343db4c80a392617b3b902b9a63141fe731e3802378d4817fe8b7aedb522a5b3ada5617cc825d71f169063b77f7942255586 SHA512 c76193bd06000d3eb5b207eec16942eebc5bb096ce5be5fdd72dd5b78fef9e2b07beafd390d94a95933acd504ab49cb177625291ad3ffecaf3702eb3f7a5eb4f
 EBUILD google-authenticator-9999.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
 MISC metadata.xml 262 BLAKE2B 9190d29ce12a5f82e0fc23c1cfb1bbd8642fe74392e1cbfcbac723b93255048ab06bcafc1b94ff52afe63be6dc1856f27b21022aab5357ae1f5b0204fd5df169 SHA512 fe36d12281e055298607afc0209c8bc1d3a3b9d61464b6f0d69b98b2d38b9c25bf6c979392be9427fd1ad4621b49b8e6c4b41a53ef28d4696150d1ee4525d8c3
diff --git a/sys-auth/google-authenticator/google-authenticator-1.05.ebuild b/sys-auth/google-authenticator/google-authenticator-1.05.ebuild
new file mode 100644
index 000000000000..cac4a833a725
--- /dev/null
+++ b/sys-auth/google-authenticator/google-authenticator-1.05.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S="${WORKDIR}/google-authenticator-libpam-${PV}"
+fi
+
+DESCRIPTION="PAM Module for two step verification via mobile platform"
+HOMEPAGE="https://github.com/google/google-authenticator-libpam"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/pam"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# We might want to use getpam_mod_dir from pam eclass,
+	# but the build already appends "/security" for us.
+	econf --libdir="/$(get_libdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "For further information see"
+		elog "https://wiki.gentoo.org/wiki/Google_Authenticator"
+		elog ""
+		elog "If you want support for QR-Codes, install media-gfx/qrencode."
+	fi
+}
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 58d5c566caef..e5178c640320 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -3,7 +3,9 @@ AUX nss-mdns-0.10-avahi-socket.patch 394 BLAKE2B df775332dc37a4f333985688f910b7b
 AUX nss-mdns-0.10-ipv6.patch 15651 BLAKE2B 4fe76fdf2f39295bf6a6084662c396520fedd7fc00e67f5703b69605f5d22b3e74edf56cb8b752665145d5acfd44134b5e17d09533bdb191272e3e0771c68b9a SHA512 8021b5dbb7e484fc29041e54d88a01346ee1dac7840b1bc13caacb4460e7b6baa99d079f34e0b28e9d665e821ccddccc83580f315454c63bf7ba1b2f6ab4c230
 DIST nss-mdns-0.10.tar.gz 353130 BLAKE2B 88cc7cbc908f397bbf52f590946b3bc8bc4c71585c9a0a52648ae3dd23b3f5ca9fbd24f0fc7c34dff08d7a4c8d72fec94a51a65650bed41b07aec6c81220d517 SHA512 7c9f4150648dfab34bc6f8551e5b58b0b7065e4c1472efb8ce1b00b2bd75627e5928b2c199d9dae742abe839968a8774e39c7646f8ce855d342b4d90252efc0e
 DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 5523c76d6f7364efde54b9bf303dfdf34c11b96c9348bfd4a62d095215e7d6f32e0d44e22d21677d51700d458a10f9c36f7ccecb7b4add04fcba629ee19abc21 SHA512 9dceb0f244c4cd27b04ca2014637873a0d137464c26780dfdb228502b06b310991494b115e42e1057c45478361d0e441ec73099fbf56a13a5933618b72390af4
+DIST nss-mdns-0.13.tar.gz 380261 BLAKE2B 555b7b9df8ff15da423712fac04ccbc303395d38a07121906cf31871a8684c71e43809b80674a489d87397902a33f4d19b0ae49a4c384290bad227a24880476f SHA512 f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b
 EBUILD nss-mdns-0.10-r3.ebuild 1840 BLAKE2B dd41dd364d82e918747bf8876953e763d8fd9886cccf9706bd67aa4a4e637f369039fc0148f33bd2db893d3c66a2a92c2dddbc767ec668af62382fde61cdc93d SHA512 50265452786edd3ac7b554904a57fdf38b9a121641363bc14587633efada2017d7b36c7f131740ce69e2a5389fc4be2d4a6b5c52bb6193dd0320891748f3ce5a
 EBUILD nss-mdns-0.11.ebuild 1667 BLAKE2B 35aea7515b9117cacc47f8680886d5d60e63752515712ba654655e127f40e4fdf40fc8ac6967e85d01e8b32e6894b84358d344faf95b5eb199c9fb7dcd9b6fa7 SHA512 4b4f9c48ea0bb498061b98f3add9b06b148e524140b798f3ac0b3a60e830a084506231118cbf3cfd3f7d3795b7c43e9e3dfe036713a03f45b4d8dd694549eace
-EBUILD nss-mdns-9999.ebuild 1596 BLAKE2B 5eac3ed93c9d9d291090b767c6d8c9193e6d0d749cc4d36a7e00fa8dd3bfed6fc99b7c9f6f0ca433f39b3d0257f8d71b02e6897fa039ceec6d181c8246621c65 SHA512 bdb772d5fcb650405dff7baa52049d1cc1943489b65ba0f786c8fb6ab22ea3ab14425a259e04515879b354db918efbc14cb32dbd22d9d628d18eb2fa7a7a1c21
+EBUILD nss-mdns-0.13.ebuild 1627 BLAKE2B 13c272a84c846067c33bffd9090ee3a8be79099b9b9e475a89f14dac54d6e760e0d85f32a243a9f7329d7f54aa07db534bc370f39bbb8d821e173405fdeca66c SHA512 975119757f391b43f8293602a45ebcc32f6eb535ff8c6e0b6efc830046a4449e89b973dda187451dfd948c0db21c4fcd4d9ec7647bae59ee58e84331cc61a242
+EBUILD nss-mdns-9999.ebuild 1633 BLAKE2B de0554c2f1c3ad64a4e258dbc1b07511caca5e706e03391ba5841fc8931a51b97ca1d85d55a38811198d28ebbf131ffce3a05f76b6b1fb64bbb1fc0a32277432 SHA512 b5363a99b05a31f1c5679f3f0b8200d3763f05f81795da3eb51b451f33edae95564ac45001e59e9afb2a311f4b13d856aafe67ea3b7213e172169854b3733ca8
 MISC metadata.xml 795 BLAKE2B 9237e6e6cc772633d1e45db608880c8bf112a361a2914ccc8f413020d31905d10e5822c922659bd500072f47580c63c94a68f54171a259ae3dc28b0b17499387 SHA512 912e8a154a0672a58bd89ee1f52efd8d43cfbeff1f1c40def47d6bd7600fb9b74e1b11dd633ea1ad6f75ef9ae9979ac5b741cfd5df97ea6b0055b060df33c977
diff --git a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
new file mode 100644
index 000000000000..fea085203e9a
--- /dev/null
+++ b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="Name Service Switch module for Multicast DNS"
+HOMEPAGE="https://github.com/lathiat/nss-mdns"
+SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.11 )"
+
+multilib_src_configure() {
+	local myconf=(
+		# $(localstatedir)/run/... is used to locate avahi-daemon socket
+		--localstatedir=/var
+	)
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc *.md
+
+	insinto /etc
+	doins "${FILESDIR}"/mdns.allow
+}
+
+pkg_postinst() {
+	ewarn "You have to modify your name service switch look up file to enable"
+	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
+	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
+	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
+	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
+	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
+	ewarn "and 169.254.x.x addresses."
+	ewarn
+	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf."
+	ewarn "An example line looks like:"
+	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
+	ewarn
+	ewarn "If you want to perform mDNS lookups for domains other than the ones"
+	ewarn "ending in .local, add them to /etc/mdns.allow."
+}
diff --git a/sys-auth/nss-mdns/nss-mdns-9999.ebuild b/sys-auth/nss-mdns/nss-mdns-9999.ebuild
index 22527697c7c8..4734cc555a17 100644
--- a/sys-auth/nss-mdns/nss-mdns-9999.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-9999.ebuild
@@ -13,10 +13,11 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.11 )"
 
 src_prepare() {
 	default
diff --git a/sys-auth/polkit-pkla-compat/Manifest b/sys-auth/polkit-pkla-compat/Manifest
index fd5463e4d2d2..6f1756aecbd4 100644
--- a/sys-auth/polkit-pkla-compat/Manifest
+++ b/sys-auth/polkit-pkla-compat/Manifest
@@ -1,3 +1,3 @@
 DIST polkit-pkla-compat-0.1.tar.xz 291148 BLAKE2B b993a17dc9f16e622f59ed5e716f36857a3196567a426f81fac75f1a0a774c9d6e608d36433e2b39a4d50dbd1699b5b686835fde7cbae6260c5a226c90ebe7b3 SHA512 968cf547db977731a6c6bb292fa86ef46a2ce8f74d008da62f219c20da8cdde94f6309dccba3be33d0111bfa34609799bdeee4d2464395c8837370d022d425c5
-EBUILD polkit-pkla-compat-0.1.ebuild 732 BLAKE2B bdd6c0d1129e5f8c80cfcb733701edce5e05bd20eb739e4980406a842f767299d371932612540d77233bd36605b6c85448e6a3f90e0ff55d725dc1685b8bbe0b SHA512 cdce406f34aaa262791686e945ba0ad43d7e6c8108bcefd09e18920eb8bad4baf6e9f79ef1a5619b2f31b467440d33d4fc7e8e762a962d4a4859205effdeff29
+EBUILD polkit-pkla-compat-0.1.ebuild 700 BLAKE2B 49f2b799e1ba3b87dedc849a5ff579324f03d86a9ec7c26c811cf7a99c72104ac43d60de8e789882818c8838daa2b13ed71ffb921132598440d5b08d68add162 SHA512 c3cea2ad1ae42bffd62fbce4c55c4b11396afabb1ad7bac52a22d3e01a64c1ae22698eaa5827df90cd5c91435db8d09d4e9bfb0805e1c535d46b3c0f7ce29403
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild b/sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
index 20fb5c74f07c..ff1865e975e8 100644
--- a/sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
+++ b/sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Rules for polkit to add compatibility with pklocalauthority"
-HOMEPAGE="http://fedorahosted.org/polkit-pkla-compat/"
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.xz"
+HOMEPAGE="https://pagure.io/polkit-pkla-compat"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 4966c036f2f8..082fa332ba48 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 10eb4dba38fb..683776f0b56d 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,5 +1,6 @@
 AUX silo-1.4.14_p20120819-gnu90-inline.patch 544 BLAKE2B 6336a6713a706b8181cbb5d60f542f47fa4009347546bdb812369fb3fb054818e6230af239244ee9628a315df5c1bbdf0085be92448c9f2fca3f1ec7323f51dd SHA512 a3ac9e1226de694063bce8edcd0160ab7340a2821ec243ea45a79885da81eaf3a8af2bbe19350edaa45654a2d13ef070682ea7eca80e12f982e8a05ef49abcd7
 AUX silo-e2fsprogs-1.4.14.patch 1349 BLAKE2B ad11dbaac011fa4f006f1cfd5cfb5a9e5b45af99d663295a02bd5473833ed3c4337c32e86d12cc16db25ce65573ca4223fbd3380c5b9a889cab17e6541f7fe69 SHA512 f914e1ddfbdbac71fc1b67ebf188a66f1f55a1d5b19654e77d1f6e614f9adc4f1848c90754be60bdc4a9b4a4750d66cf5ef4db13db08719dc0877e4b1205ef6b
+DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1 SHA512 bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo_1.4.14+git20100228-1.diff.gz 10143 BLAKE2B 4282de2900dfa670164ab9c7d64c7793cb5a132fda015750355bad9d94269c223f850d23fe048c215df9653689774dadd8f9cbbdd2919751e574f00b10053e08 SHA512 7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0
 DIST silo_1.4.14+git20100228.orig.tar.gz 738325 BLAKE2B 5e5e221a9df91b94523c366a9f6ab2d195567e9f2938f141d93750a2fd15ec3cf657ca48155ea1113c7b6db011953fa15c1c6fd05759d7bc47cfc274c43424da SHA512 aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77
 DIST silo_1.4.14+git20120226-1.diff.gz 10389 BLAKE2B ad2f6dfdb468a81b71f1f9b43668d162ca946278b03ce115527712beb49c5319e1e285df7e0fa45bc126264b6c35cb2e950184c0647da3a990e087c6dc28fbca SHA512 0dd39461357f862bc0eb7d0b4db8e3e9acadb30f70c8c638b1adef6f6c306d0c475bf59e29c72a91594fcbf544c80e05e5293b857265d4cd579696f10993483b
@@ -10,4 +11,5 @@ EBUILD silo-1.4.14_p20100228.ebuild 1719 BLAKE2B 758a07bd95c74f0f0e1c2ef7a80b76b
 EBUILD silo-1.4.14_p20120226.ebuild 1735 BLAKE2B d5852234c99b0df9253a85e61e33adb9f48f2ae76baee9fa4ce3ffee67461c7a3dd60bd65cc2a1bb90733756965502f5508ee2b76935a358e60c99bbf3038c7c SHA512 93f02430b14ccd2ab7d64d32cf3edd7cb5b4824c61327e06cb04ef5f5c050058f13a9de3aaae21d789095af71efad6d79c0470e338950b21d576640eae8307d4
 EBUILD silo-1.4.14_p20120819-r1.ebuild 1566 BLAKE2B 888b6973d1320461d6f304577c143302077d375551a92d4c13e1c7e07191eae12cc5b4ffbefcb2ed5e9350c4f9c89848052be21085327274bd224eb54f20da97 SHA512 cd9758ed3e273c0ecc796f90b26bab81cf88719d5575f3e51b250c510ce5a7f00f6ab796d2ce9f84c873b370933f44ea5b3c07bffd7050978a4958babe1cf958
 EBUILD silo-1.4.14_p20120819.ebuild 1569 BLAKE2B 7c51160a48da6db1fa827f9e1f73afb72b3067f24a0f7f1804c66a7a644fb37566aad013505d500322dd6effea5dd07b2bfd194fe871e423a83d671bc4937109 SHA512 39d1ce19e0ffbd5743abc2e4141f8ede3877b0f438728be8c9913d06b2931080dc3503cd89ec8e1813e611a15751b522afa16d9229bfc0790c4df288cde03c13
+EBUILD silo-1.4.14_p20170829.ebuild 1613 BLAKE2B cc6dd35696d8eea18ea27cb702a6baff0e2458ced042e4b3e2ad2f3995c6c64b75c0145bcdf1da91b7b79c002e6dc8bae4601702973575b8c09cc78b0cdfe47f SHA512 6c1a1bca4ee295f3d64b883843307ecee5371e6a4272fbe42a065ee96dca70be586a2e2cd87c17fab8a56877ee671828f8bd92377cb3215303d96ed82bd07f42
 MISC metadata.xml 383 BLAKE2B 30e20990d4d208db4d45f19aaab45fad2afdb238415163399d2665d1327f6932dbf420ecc455ad03ba69492a1ec9c18397362164873016427a624e8fb3e41844 SHA512 4d4c999f52f1dfb269edc79e10df3fe667273d895eceaa4db695e9bcfe5ba781a0f9f7367411fb4be71ecedc679ce792c2359801e28b2c164fd7f44b971ced5a
diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
new file mode 100644
index 000000000000..dde2b3c9a733
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
+
+MY_SNAPSHOT="${PN}-2506051d55dd5cb9fe10b4e978e22fa00363044b"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs
+	sys-apps/sparc-utils"
+RDEPEND=""
+
+ABI_ALLOW="sparc32"
+
+src_prepare() {
+	default
+
+	# Set the correct version
+	sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
+
+	# Fix build failure
+	sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+
+	# Don't strip ieee32.b during compile
+	sed -i -e '/^	$(STRIP) ieee32.b/d' first/Makefile || die
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	emake CC="$(tc-getCC)" \
+		STRIP="$(tc-getSTRIP)" \
+		NM="$(tc-getNM)" \
+		LD="$(tc-getLD)"
+}
+
+src_install() {
+	default
+
+	dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+	# Fix maketilo manpage
+	rm "${D}"/usr/share/man/man1/maketilo.1
+	dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+	ewarn "      you will need to re-run silo as the /boot/second.b"
+	ewarn "      file has changed, else the system will fail to load"
+	ewarn "      SILO at the next boot."
+	ewarn
+}
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 41887ac11728..b1a0fd520b63 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,7 +1,10 @@
 AUX 233-Force-libsystemd-shared-to-be-static.patch 601 BLAKE2B 2473eb2d2a355e468a7d994637ae10f22f08001b57e5e05ccef7636754ca448f46513fc33a54e8349b7444676bad6c0f03f5f7943f37a65e914efbb27f4ed321 SHA512 05e666114764a97d20bf115e1b114035fc882b101ad01bde8864a31385886e0711e4b37e03d713052aa985503cf7a94eeb5d28c33cc4a504cbb4fc263998d4e1
 AUX 235-libshared-static.patch 968 BLAKE2B 8979c8fa294d1dc3a0356e32ff1a6d15bd3b3a93d5f9bacbbd137bbc38931ae5ec383ecc9ca237e62b80353ac36cd1c0b8df96ff1afd86e1a43c2601574fae01 SHA512 b37a097a14a455f91e1f1f2b00782aa5f1af4e201bbc9c2ebd69b4bb426cabc9d169733f70e09caf8fa36ae62f3eb44d5f7b805bb242310d18c94230f18835ee
+AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1ebd4008e0929f1362ef0c2e854a67c8786c0b4ce9b29aee2b4409c54c668429f61e3c4ab85844d72c3d060b41925 SHA512 79cd97a176c91c76b512bce5f30605d673fb5480921cc76e221da9e78a8f7caec802efb481f8811c7aefba2901d007e340ba032a07a53e907f77e4bbd52169a7
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8
 EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d
+EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/files/237-libshared-static.patch b/sys-boot/systemd-boot/files/237-libshared-static.patch
new file mode 100644
index 000000000000..9966a5f79162
--- /dev/null
+++ b/sys-boot/systemd-boot/files/237-libshared-static.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 36a62d280..87f8da29b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1662,9 +1662,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
+         exe = executable('bootctl',
+                          'src/boot/bootctl.c',
+                          include_directories : includes,
+-                         link_with : [libshared],
++                         link_with : [libshared_static, libsystemd_static],
+                          dependencies : [libblkid],
+-                         install_rpath : rootlibexecdir,
+                          install : true)
+         public_programs += [exe]
+ endif
diff --git a/sys-boot/systemd-boot/systemd-boot-237.ebuild b/sys-boot/systemd-boot/systemd-boot-237.ebuild
new file mode 100644
index 000000000000..48d61ac38b29
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-237.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	>=dev-util/intltool-0.50
+	dev-util/gperf
+	>=sys-boot/gnu-efi-3.0.2
+	sys-libs/libcap
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-D blkid=true
+		-D efi=true
+		-D gnu-efi=true
+		-D efi-cc="$(tc-getCC)"
+		-D efi-ld="$(tc-getLD)"
+		-D split-usr=true
+		-D rootprefix="${EPREFIX:-/}"
+
+		-D acl=false
+		-D apparmor=false
+		-D audit=false
+		-D bzip2=false
+		-D elfutils=false
+		-D gcrypt=false
+		-D gnutls=false
+		-D kmod=false
+		-D libcryptsetup=false
+		-D libcurl=false
+		-D libidn=false
+		-D libidn2=false
+		-D libiptc=false
+		-D lz4=false
+		-D microhttpd=false
+		-D myhostname=false
+		-D pam=false
+		-D qrencode=false
+		-D seccomp=false
+		-D selinux=false
+		-D xkbcommon=false
+		-D xz=false
+	)
+	meson_src_configure
+}
+
+set_efi_arch() {
+	case "$(tc-arch)" in
+		amd64) efi_arch=x64 ;;
+		arm)   efi_arch=arm ;;
+		arm64) efi_arch=aa64 ;;
+		x86)   efi_arch=x86 ;;
+	esac
+}
+
+src_compile() {
+	local efi_arch
+	set_efi_arch
+	local targets=(
+		bootctl
+		man/bootctl.1
+		man/kernel-install.8
+		src/boot/efi/linux${efi_arch}.efi.stub
+		src/boot/efi/systemd-boot${efi_arch}.efi
+	)
+	eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+}
+
+src_install() {
+	local efi_arch
+	set_efi_arch
+	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+	exeinto usr/lib/kernel/install.d
+	doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+	insinto usr/lib/systemd/boot/efi
+	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
+	einstalldocs
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index f5765787203e..3cd69579cf73 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index e0ee03b942cb..39353953e730 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,7 +1,10 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
 DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
+DIST heat-9.0.3.tar.gz 2364843 BLAKE2B 4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713 SHA512 5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-EBUILD heat-2017.2.9999.ebuild 6454 BLAKE2B 5ef108f6fbed87fcdf0ccabaf3f9d7101027a1d7e906eb07e58a6eb9828b3656c7f497c629b63e380e5fdc83659de8431508df1aa93aa70f10c16606191d6020 SHA512 12e7337c9eb4749b558513b3ccdccf1c9a248151ef14865d63830b2787c4565ba1ded26444f7132a020eda5dc23c1b791a2a7632fba6fe2a8a96efcbf49a0600
+DIST heat.conf.sample-9.0.3 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
+EBUILD heat-2017.2.9999.ebuild 6631 BLAKE2B 697e6e82a1ca39a9585dc66f3ed2d3882d268deaf977842ceddec44135d2e0d354cc575c3fa2d3ccb42b0f68b452c967cf8b2ef500d5c08249acbd4414b20c35 SHA512 b063d4c92bf245da67a09416db1ba7825d8f852247b00a9f6a0d0b5dc77aa6ceea3e60afb7709e35574018281370e2b5aec82fdd57bc8d9792df61c701f6735e
 EBUILD heat-9.0.2.ebuild 6372 BLAKE2B a0682068a8ffea4911523ecee326819392b0570df172b380f8102b96702fbbf744b12c7f31e24672460d65fad7a42602e724572750ca77fe856182ad943e97da SHA512 03d0284b311abb2eaebbfa92c86914bbede58ad34f3d8498cf2d3dc8fbdb0d9a531247dfdfded6b824f9c538c4d2fdb109a5515b46d59242b1bed812174393a5
+EBUILD heat-9.0.3.ebuild 6631 BLAKE2B 697e6e82a1ca39a9585dc66f3ed2d3882d268deaf977842ceddec44135d2e0d354cc575c3fa2d3ccb42b0f68b452c967cf8b2ef500d5c08249acbd4414b20c35 SHA512 b063d4c92bf245da67a09416db1ba7825d8f852247b00a9f6a0d0b5dc77aa6ceea3e60afb7709e35574018281370e2b5aec82fdd57bc8d9792df61c701f6735e
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild
index 08a656c38a7a..472f8a0a47db 100644
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.2.9999.ebuild
@@ -4,17 +4,24 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
-inherit distutils-r1 eutils git-r3 linux-info user
+inherit distutils-r1 eutils linux-info user
 
 DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
 HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
-EGIT_REPO_URI="https://github.com/openstack/heat.git"
-EGIT_BRANCH="stable/pike"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
@@ -81,8 +88,7 @@ RDEPEND="
 	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
 	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/heat/heat-9.0.3.ebuild b/sys-cluster/heat/heat-9.0.3.ebuild
new file mode 100644
index 000000000000..472f8a0a47db
--- /dev/null
+++ b/sys-cluster/heat/heat-9.0.3.ebuild
@@ -0,0 +1,169 @@
+# 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} )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
+HOMEPAGE="https://launchpad.net/heat"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/heat.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
+		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${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-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.7.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/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	doins "etc/heat/policy.json"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index a3e63f5eddef..f803d7b93c9e 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,12 +1,10 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kube-apiserver-1.8.6.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kube-apiserver-1.8.7.ebuild 1289 BLAKE2B 501e9f48b5a60d3dd1c2379c357a16c910b2e2bcbec744d5aa5cfad7ed3a0e887c3022e889e6a1871f613f79208a6c97ca7b8abc03bf5bd9346d5b804d46f06e SHA512 f066b123d33aca4da52c4e9518fcd86754445d0e3f99105ad3cf20e9bcc3fe88d7f7d57f825881cb3c03d45bc07b81d09ed367130b1b0e66c50a5513fd348c92
-EBUILD kube-apiserver-1.9.1.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 EBUILD kube-apiserver-1.9.2.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
+EBUILD kube-apiserver-1.9.3.ebuild 1208 BLAKE2B 836e21b3513e7cc03dcddac3792fbf1d1247faca83da3d71deabbfb6cebc8cc85189e459558b3b7baa73e8bf876ae30105ae9ec3871b806e08b256e808d4b0e9 SHA512 104b15950bd93e8e791f21b7b7402df60c3c751a6b834e2d5071790cb3d38030512e5c7c01b1883ad3599f30304e76eb27212033aa18c3ce623eb592572e6550
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.8.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.8.6.ebuild
deleted file mode 100644
index 8855f7be7117..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.8.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.9.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.9.3.ebuild
index 2cef73774731..2cef73774731 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.9.1.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.9.3.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index d510e5ed42f0..129cd78255fd 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,12 +1,10 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kube-controller-manager-1.8.6.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kube-controller-manager-1.8.7.ebuild 1297 BLAKE2B 114a3171dc88b283b7adb97751502b18c1f414379b6dfc649dd1bbe74ae3bf4cd67daa2944e22271d72d81c043e28d82b294cbc3202191d8b957531f40932fc0 SHA512 299acc2a8f6821200dbddcdabcbec512e44a758fa3f14d0ec3c897782af5e30f6441ba0b28af8089f0d31433aa8931217c0e261b7d282fd7ef774e21a8a9d3ef
-EBUILD kube-controller-manager-1.9.1.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 EBUILD kube-controller-manager-1.9.2.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
+EBUILD kube-controller-manager-1.9.3.ebuild 1216 BLAKE2B e16cd08be6fd07106a8c68ba8aa79260eb13aa702853916b22cd9b72408d5f24de211bb29f1eabe5ae71fb430941106b12b7e97abfabf503a9e4d41550e8dd38 SHA512 28557478e958a07a30035edf942282c4582ddb329ef9777d1de929a95be5909af8d8e1345364fc996c5fbb5a689d40ec0de573b89a85756fc5a63690606e0c17
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.6.ebuild
deleted file mode 100644
index c1076001c2cd..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.8.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.3.ebuild
index 3a0b835d0991..3a0b835d0991 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.1.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.9.3.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index c5b2981a721b..b52c8d1101ca 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,12 +1,10 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kube-proxy-1.8.6.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kube-proxy-1.8.7.ebuild 1201 BLAKE2B 25635f1829b35a5cc9f5e75a6ebbd61b20ece9a74d0319b685e11a8c788a2b89c27c07b33b664cda8a7d83f502394649675fec317fd7e1037701b63fe99a6146 SHA512 fcd7cff5c621f53e4d85f38b3131a030584a82fcdea056d483e3e50fd85c15f37dab907bc730092f3281067a502f95f6fbe3fb4e906ce3f41b731dd32f38eb98
-EBUILD kube-proxy-1.9.1.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 EBUILD kube-proxy-1.9.2.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
+EBUILD kube-proxy-1.9.3.ebuild 1120 BLAKE2B 76ba7a2f75f735b1263c32096ab4a08989326fd43b54ceeaf06ea1e67d9a1571c31e41b2a902eeead7004f98f5398d28441f3c67f97df80a41006c5c73fdef00 SHA512 ac30ccd4f440c6edb48b3510935590189c7a3322f0160b0ec48454cf98b553c3040dbbd2d851bc7198415446cf9a540d2ccbfd6b80a4f7bea72a341f554c904d
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.8.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.8.6.ebuild
deleted file mode 100644
index b8b9ae3ea7fc..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.8.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.9.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.9.3.ebuild
index 882a7f40ebcc..882a7f40ebcc 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.9.1.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.9.3.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 575687a6ca94..d06069613e6a 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,12 +1,10 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kube-scheduler-1.8.6.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kube-scheduler-1.8.7.ebuild 1304 BLAKE2B 92c60fd4b1f8e38a8c2bbb17f6407a1bdcb1b49c42b81364950f54f52f26b2c96dc2c676e7201447923f63ee2f98f72d0d0de06b98a33a3c3e98fe5a563965a1 SHA512 f48fad46a2697caf4776d33f69cc05b750aafeeafc0ffc2558d00fa765da6d1d73233822aeb8b92b2ba8c20ca7328e2fadb645ebe2c4bbec77d728ea584062d6
-EBUILD kube-scheduler-1.9.1.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 EBUILD kube-scheduler-1.9.2.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
+EBUILD kube-scheduler-1.9.3.ebuild 1223 BLAKE2B 4b4d084ab1c0bde0ba6c2f969d2851bedbb32c489c13ebe9e6087c7ea2bb9290819f24043f5a09d1a8f15a19b5959e33c239e9521728fdd9d298b29775eb293d SHA512 0e6fe77b9e9f411b398e61dc8a6213a254cffd154c8e19fe986f76f22a06c3b60aa672f26b13ce86016ca63af4e8be7669d1f0e519acc9cdbecc1e24d504faa4
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild
deleted file mode 100644
index 739becc5ded7..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.8.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=plugin/cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.9.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.9.3.ebuild
index 170c510184ff..170c510184ff 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.9.1.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.9.3.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 09a139828525..f18d0ef1ec56 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,9 +1,7 @@
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kubectl-1.8.6.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kubectl-1.8.7.ebuild 1302 BLAKE2B 4f0ef54e33367ec2ad0ad4094de1ce2b5906605654dfa254e73529f430300f7b95191a78b068fbd03ed8b7748f5eff8292f60271a51eb554d373573dc1c38e23 SHA512 e441a14aa47be23dd788539a63f50ca804333be7776c40ec50ce20710d3a1739dd544ca3070dc5648da3f372b58325b76be1152bbc4b01785441b5eec9b50b0d
-EBUILD kubectl-1.9.1.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 EBUILD kubectl-1.9.2.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
+EBUILD kubectl-1.9.3.ebuild 1221 BLAKE2B 657220b247d9262b3a92bf0085bb4380ce02d4a332e7f2cd467dd075566e3a2a5c93bf42997ca8f78dfa18a9fc1312a62252419191c22d6f478ab55b57530507 SHA512 4b32ef0f3b584faa986b6c32eb00b2f1e7aa06aeba50979a472f74b709065903ecf3ec4ab6e1a05ba3247a9589062b82e21007cb9f9eac76b4defacaaff79770
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.8.6.ebuild b/sys-cluster/kubectl/kubectl-1.8.6.ebuild
deleted file mode 100644
index 101174d5c0e5..000000000000
--- a/sys-cluster/kubectl/kubectl-1.8.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to run commands against Kubernetes clusters"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubectl/kubectl-1.9.1.ebuild b/sys-cluster/kubectl/kubectl-1.9.3.ebuild
index 14674478c43c..14674478c43c 100644
--- a/sys-cluster/kubectl/kubectl-1.9.1.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.9.3.ebuild
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 71aad049b4bd..958d8018ec0a 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,12 +1,10 @@
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
-DIST kubernetes-1.8.6.tar.gz 23244485 BLAKE2B 2f7fd993f8720d47ac0335ff8ba393f39ad20bb075a546ff7b4f99b4132e0988a3f9ac1c3e5e234bad0895d6bc951ae390e8e09e5630bf49834c5ef4ead23f19 SHA512 20af7157d1df035bb39e0ec57e8887166b34097daa71f57dc94166ae4b1a0379d51baaf268be35fbdd81cf4fdf78abe88f37b505c6428ad1b8d4ef237a1ef4ee
 DIST kubernetes-1.8.7.tar.gz 23246803 BLAKE2B b7fb8919462359f0fa211cf0cad834a7f09c893dd7da2ea9ca4564cc9f65e374ae6e036f12c182a42cd0f3b52f80b366d1e662bdf7967a066cacc9e6b8018ad4 SHA512 ea1be8a1cdc78d818a393da7ef7629405b08cf9a6fd2426d891912082b2230a148be49465b415cef9494476694715779a90429660ad1bb815bf258f3978c9707
-DIST kubernetes-1.9.1.tar.gz 23377786 BLAKE2B 348368a73d69441130494bdc2fa4c8e1074c698d9784c335cae7b594f9e9b9f982800d40f1c8a666517cb72ba75862cce9ceb68955c319320347792f2c60312f SHA512 43913dd94fee27058ee131bfda49961339b130633769a95716533b865e1d62996110aacdf5d04d61512ce7be458602a73dfed39dad763d130c9e4baf950e7dce
 DIST kubernetes-1.9.2.tar.gz 23390279 BLAKE2B de9782209236d04fddefe83e074f1c41b37bc052ac45472cd75b30b0d5ba6a358ccf3db67fdb621627b483a59fa78b4fefdc78693287a138b18154f0e8f782fc SHA512 8dd20ad6b2e77f1adc5ef37bdb319be472c5afa47c83c64e4496bb7ee3517bcca0aba398c16283dfda981915878dbd3685a61af65912d4d3fd14a77346edbe13
-EBUILD kubelet-1.8.6.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
+DIST kubernetes-1.9.3.tar.gz 23396346 BLAKE2B e65a68e27f479dfedbfa17dd770dbeee9d56cd439abe3537a928bed15e054a12f7f8445c35e89957665b74a831135240d0e12af10ef14bd4e5938bca1781e0e5 SHA512 73a20c0f28cc04728bdaac36d08a2b78c7f203bc61a80c4716a1cb8447547f56e7ae76cbe77b3b03c704b6224392c4d0aa88ede3ce116c8aa2c15cb8a9bd4840
 EBUILD kubelet-1.8.7.ebuild 1298 BLAKE2B f455c1205f0a728f0cb79f729b90525446f51eaac9ac21d5761d43af9e3d517f408009a1a9e9dc8d5f9fa8703cc2d002ccfdfc9d2b4a92d6bc47a742cbac5c3e SHA512 e29b674d7ea27d067264b68bc327d9810ea543733635206e725e14279819e61db0f6d86c4d8fb129a5c44b2293a638eb6b5a0ac784b01a6feb89bfb6bf89643f
-EBUILD kubelet-1.9.1.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 EBUILD kubelet-1.9.2.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
+EBUILD kubelet-1.9.3.ebuild 1217 BLAKE2B b79361e11d72cd8d24a573a5e3b071c6533224c9ebeab0f1b95db623b55bfe5df5ee5dca1f61001c6f406ce27c32763906de7649e5cf3cb54f6d100f90b530e6 SHA512 83392d785d0484c9ae3a84e556f38cbfafd5ac6b5131fe5bd4764948e57e70c17f668004927d33d79ea5d1cc4b341cd3b542943d21960dd648d7bd312393e454
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.8.6.ebuild b/sys-cluster/kubelet/kubelet-1.8.6.ebuild
deleted file mode 100644
index 075fea2e83f6..000000000000
--- a/sys-cluster/kubelet/kubelet-1.8.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git archive/git-archive/" src/${EGO_PN}/hack/lib/version.sh || die
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kubelet/kubelet-1.9.1.ebuild b/sys-cluster/kubelet/kubelet-1.9.3.ebuild
index e1a41e8ec6bc..e1a41e8ec6bc 100644
--- a/sys-cluster/kubelet/kubelet-1.9.1.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.9.3.ebuild
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 626a11b091d0..0af6ad1a8932 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,6 +1,5 @@
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
-AUX ping 10389 BLAKE2B 7291fd63b478dd73b90f2303b4ccd4f3ecd2f561de2aad3e55ba9368af231902a81788f712b149b7be3f5d7f28f86f5dcc86fae8dcc1c4429651d6d71b96a15c SHA512 832cd68dab0844b9cee1d1b1453314d42497bc497e97a5cbb78aafbd43b696aa97786b71d1b4d175c1aa8c5f7f240432f1fd4421d16a40ceecdc008d911c0288
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
 MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
diff --git a/sys-cluster/pacemaker/files/ping b/sys-cluster/pacemaker/files/ping
deleted file mode 100644
index 52c4c3d4cad8..000000000000
--- a/sys-cluster/pacemaker/files/ping
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/bin/sh
-#
-#
-#	Ping OCF RA that utilizes the system ping 
-#
-# Copyright (c) 2009 Andrew Beekhof
-#                    All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-
-#######################################################################
-# Initialization:
-
-: ${OCF_FUNCTIONS=${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs}
-. ${OCF_FUNCTIONS}
-: ${__OCF_ACTION=$1}
-
-#######################################################################
-
-meta_data() {
-	cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="ping">
-<version>1.0</version>
-
-<longdesc lang="en">
-Every time the monitor action is run, this resource agent records (in the CIB) the current number of ping nodes the host can connect to.
-It is essentially the same as pingd except that it uses the system ping tool to obtain the results.
-</longdesc>
-<shortdesc lang="en">node connectivity</shortdesc>
-
-<parameters>
-
-<parameter name="pidfile" unique="0">
-<longdesc lang="en">PID file</longdesc>
-<shortdesc lang="en">PID file</shortdesc>
-<content type="string" default="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}" />
-</parameter>
-
-<parameter name="dampen" unique="0">
-<longdesc lang="en">
-The time to wait (dampening) further changes occur
-</longdesc>
-<shortdesc lang="en">Dampening interval</shortdesc>
-<content type="integer" default="5s"/>
-</parameter>
-
-<parameter name="name" unique="0">
-<longdesc lang="en">
-The name of the attributes to set.  This is the name to be used in the constraints.
-</longdesc>
-<shortdesc lang="en">Attribute name</shortdesc>
-<content type="string" default="pingd"/>
-</parameter>
-
-<parameter name="multiplier" unique="0">
-<longdesc lang="en">
-The number by which to multiply the number of connected ping nodes by
-</longdesc>
-<shortdesc lang="en">Value multiplier</shortdesc>
-<content type="integer" default=""/>
-</parameter>
-
-<parameter name="host_list" unique="0" required="1">
-<longdesc lang="en">
-The list of ping nodes to count.
-</longdesc>
-<shortdesc lang="en">Host list</shortdesc>
-<content type="string" default=""/>
-</parameter>
-
-<parameter name="attempts" unique="0">
-<longdesc lang="en">
-Number of ping attempts, per host, before declaring it dead
-</longdesc>
-<shortdesc lang="en">no. of ping attempts</shortdesc>
-<content type="integer" default="2"/>
-</parameter>
-
-<parameter name="timeout" unique="0">
-<longdesc lang="en">
-How long, in seconds, to wait before declaring a ping lost
-</longdesc>
-<shortdesc lang="en">ping timeout in seconds</shortdesc>
-<content type="integer" default="2"/>
-</parameter>
-
-<parameter name="options" unique="0">
-<longdesc lang="en">
-A catch all for any other options that need to be passed to ping.
-</longdesc>
-<shortdesc lang="en">Extra Options</shortdesc>
-<content type="string" default=""/>
-</parameter>
-
-<parameter name="failure_score" unique="0">
-<longdesc lang="en">
-Resource is failed if the score is less than failure_score.
-Default never fails.
-</longdesc>
-<shortdesc lang="en">failure_score</shortdesc>
-<content type="integer" default=""/>
-</parameter>
-
-<parameter name="debug" unique="0">
-<longdesc lang="en">
-Enables to use default attrd_updater verbose logging on every call.
-</longdesc>
-<shortdesc lang="en">Verbose logging</shortdesc>
-<content type="string" default="false"/>
-</parameter>
-
-</parameters>
-
-<actions>
-<action name="start"   timeout="60" />
-<action name="stop"    timeout="20" />
-<action name="reload"  timeout="100" />
-<action name="monitor" depth="0"  timeout="60" interval="10"/>
-<action name="meta-data"  timeout="5" />
-<action name="validate-all"  timeout="30" />
-</actions>
-</resource-agent>
-END
-}
-
-#######################################################################
-
-ping_conditional_log() {
-    level=$1; shift 
-    if [ ${OCF_RESKEY_debug} = "true" ]; then
-	ocf_log $level "$*"
-    fi
-}
-
-ping_usage() {
-	cat <<END
-usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate-all|meta-data}
-
-Expects to have a fully populated OCF RA-compliant environment set.
-END
-}
-
-ping_start() {
-    ping_monitor
-    if [ $? =  $OCF_SUCCESS ]; then
-	return $OCF_SUCCESS
-    fi
-    touch ${OCF_RESKEY_pidfile}
-    ping_update
-}
-
-ping_stop() {
-
-	rm -f ${OCF_RESKEY_pidfile}
-    
-    attrd_updater -D -n $OCF_RESKEY_name -d $OCF_RESKEY_dampen $attrd_options
-    
-    return $OCF_SUCCESS
-}
-
-ping_monitor() {
-    if [ -f ${OCF_RESKEY_pidfile} ]; then
-	ping_update
-        if [ $? -eq 0 ]; then
-            return $OCF_SUCCESS
-        fi
-        return $OCF_ERR_GENERIC
-    fi
-    return $OCF_NOT_RUNNING
-}
-
-ping_validate() {
-    # Is the state directory writable? 
-    state_dir=`dirname "$OCF_RESKEY_pidfile"`
-    touch "$state_dir/$$"
-    if [ $? != 0 ]; then
-	ocf_log err "Invalid location for 'state': $state_dir is not writable"
-	return $OCF_ERR_ARGS
-    fi
-    rm "$state_dir/$$"
-
-# Pidfile better be an absolute path
-    case $OCF_RESKEY_pidfile in
-	/*) ;;
-	*) ocf_log warn "You should use an absolute path for pidfile not: $OCF_RESKEY_pidfile" ;;
-    esac
-    
-# Check the host list
-    if [ "x" = "x$OCF_RESKEY_host_list" ]; then 
-	ocf_log err "Empty host_list.  Please specify some nodes to ping"
-	exit $OCF_ERR_CONFIGURED
-    fi
-
-    check_binary ping
-
-    return $OCF_SUCCESS
-}
-
-
-fping_check() {
-    active=0
-    f_out=`mktemp`
-    f_err=`mktemp`
-
-    n=$OCF_RESKEY_attempts
-    timeout=`expr $OCF_RESKEY_timeout \* 1000 / $OCF_RESKEY_attempts`
-
-    cmd="fping -r $OCF_RESKEY_attempts -t $timeout -B 1.0 $OCF_RESKEY_host_list"
-    $cmd>$f_out 2>$f_err; rc=$?
-    active=`grep alive $f_out|wc -l`
-
-    case $rc in
- 	0) 
-	    ;;
- 	1) 
-	    for h in `grep unreachable $f_out | awk '{print $1}'`; do
-		ping_conditional_log warn "$h is inactive"
-	    done
-	    ;;
- 	*) 
-	    ocf_log err "Unexpected result for '$cmd' $rc: `tr '\n' ';' < $f_err`"
-	    ;;
-    esac
-    rm -f $f_out $f_err
-
-    return $active
-}
-
-ping_check() {
-    active=0
-    for host in $OCF_RESKEY_host_list; do
-	p_exe=ping
-
-	case `uname` in
-	    Linux) p_args="-n -q -W $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts";;
-	    Darwin) p_args="-n -q -t $OCF_RESKEY_timeout -c $OCF_RESKEY_attempts -o";;
-	    *) ocf_log err "Unknown host type: `uname`"; exit $OCF_ERR_INSTALLED;;
-	esac
-
-	case $host in
-	    *:*) p_exe=ping6
-	esac
-	
-	p_out=`$p_exe $p_args $OCF_RESKEY_options $host 2>&1`; rc=$?
-
-	case $rc in
-	    0) active=`expr $active + 1`;;
-	    1) ping_conditional_log warn "$host is inactive: $p_out";;
-	    *) ocf_log err "Unexpected result for '$p_exe $p_args $OCF_RESKEY_options $host' $rc: $p_out";;
-	esac
-    done
-    return $active
-}
-
-ping_update() {
-    
-    if have_binary fping; then
-	fping_check
-	active=$?
-    else
-	ping_check
-	active=$?
-    fi
-
-    score=`expr $active \* $OCF_RESKEY_multiplier`
-    attrd_updater -n $OCF_RESKEY_name -v $score -d $OCF_RESKEY_dampen $attrd_options
-    rc=$?
-    case $rc in 
-	0) ping_conditional_log debug "Updated $OCF_RESKEY_name = $score" ;;
-	*) ocf_log warn "Could not update $OCF_RESKEY_name = $score: rc=$rc";;
-    esac
-    if [ $rc -ne 0 ]; then
-        return $rc
-    fi
-
-    if [ -n "$OCF_RESKEY_failure_score" -a "$score" -lt "$OCF_RESKEY_failure_score" ]; then
-        ocf_log warn "$OCF_RESKEY_name is less than failure_score($OCF_RESKEY_failure_score)"
-        return 1
-    fi
-    return 0
-}
-
-: ${OCF_RESKEY_name:="pingd"}
-: ${OCF_RESKEY_dampen:="5s"}
-: ${OCF_RESKEY_attempts:="3"}
-: ${OCF_RESKEY_multiplier:="1"}
-: ${OCF_RESKEY_debug:="false"}
-: ${OCF_RESKEY_failure_score:="0"}
-
-: ${OCF_RESKEY_CRM_meta_timeout:="20000"}
-: ${OCF_RESKEY_CRM_meta_globally_unique:="true"}
-
-integer=`echo ${OCF_RESKEY_timeout} | egrep -o '[0-9]*'`
-case ${OCF_RESKEY_timeout} in
-    *[0-9]ms|*[0-9]msec) OCF_RESKEY_timeout=`expr $integer / 1000`;;
-    *[0-9]m|*[0-9]min) OCF_RESKEY_timeout=`expr $integer \* 60`;;
-    *[0-9]h|*[0-9]hr)  OCF_RESKEY_timeout=`expr $integer \* 60 \* 60`;;
-    *) OCF_RESKEY_timeout=$integer;;
-esac
-
-if [ -z ${OCF_RESKEY_timeout} ]; then
-    if [ x"$OCF_RESKEY_host_list" != x ]; then
-	host_count=`echo $OCF_RESKEY_host_list | awk '{print NF}'`
-	OCF_RESKEY_timeout=`expr $OCF_RESKEY_CRM_meta_timeout / $host_count / $OCF_RESKEY_attempts`
-	OCF_RESKEY_timeout=`expr $OCF_RESKEY_timeout / 1100` # Convert to seconds and finish 10% early
-    else
-	OCF_RESKEY_timeout=5
-    fi
-fi
-
-if [ ${OCF_RESKEY_timeout} -lt 1 ]; then
-    OCF_RESKEY_timeout=5
-elif [ ${OCF_RESKEY_timeout} -gt 1000 ]; then
-    # ping actually complains if this value is too high, 5 minutes is plenty
-    OCF_RESKEY_timeout=300
-fi
-
-if [ ${OCF_RESKEY_CRM_meta_globally_unique} = "false" ]; then
-    : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESKEY_name}"}
-else 
-    : ${OCF_RESKEY_pidfile:="$HA_VARRUN/ping-${OCF_RESOURCE_INSTANCE}"}
-fi
-
-case $__OCF_ACTION in
-    meta-data)
-        meta_data
-        exit $OCF_SUCCESS
-        ;;
-    usage|help)
-        ping_usage
-        exit $OCF_SUCCESS
-        ;;
-esac
-
-attrd_options='-q'
-if ocf_is_true ${OCF_RESKEY_debug} ; then
-    attrd_options=''
-fi
-
-# Check the debug option    
-    case "${OCF_RESKEY_debug}" in
-	true|True|TRUE|1)    OCF_RESKEY_debug=true;;
-	false|False|FALSE|0) OCF_RESKEY_debug=false;;
-	*)
-            ocf_log warn "Value for 'debug' is incorrect. Please specify 'true' or 'false' not: ${OCF_RESKEY_debug}"
-	    OCF_RESKEY_debug=false
-	    ;;
-    esac
-
-case $__OCF_ACTION in
-start)		ping_start;;
-stop)		ping_stop;;
-monitor)	ping_monitor;;
-reload)		ping_start;;
-validate-all)	ping_validate;;
-*)		ping_usage
-		exit $OCF_ERR_UNIMPLEMENTED
-		;;
-esac
-exit $?
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a107cc43625a..e4f7d7dd2a12 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 20587cd99e31..674ac5c87998 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -6,6 +6,6 @@ DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32d
 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
 EBUILD autogen-5.18.10.ebuild 1155 BLAKE2B 5247ebdb86d1a049087ed0bb2b2ac0efef3d3a07e26943d035971c2bb55fc554d7dccd9c45b98355ae5a234a254c7744e29907e2e3467b7aeec878eed5991efb SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa
 EBUILD autogen-5.18.12.ebuild 1214 BLAKE2B 8ac64ad2743bcd3a3392adbc7dbbd40edb9f30ef0e721699fb5995b2688ef47ae7eca72bec7da59a546ad80f4fe6f1d02b5586a427b8ef804f668ed7c5b0cdc5 SHA512 5a58610c10865a0b73d0b5a347fd58d6f12a6cb2941a33920ef0be73f4b0b76938c8aaa62296ac948a73acaa9d4b82d6b4dd5061bccf18f2164846724739544c
-EBUILD autogen-5.18.4-r1.ebuild 1005 BLAKE2B dfeaef4b16c1f5d595f1de1bd45f708396b989bbe758572d44e3ca31ecda300c593c44402ccaba478f9469af9b186c1dc3e5a3ee09f2a1ee0837142bcd9597cd SHA512 753f60ae9aec07e18d7aff99579760b046e0009d2a98c330aba1333263c70a063b78b2187395cc15988430829616036f4548d44a4c31bb9ab0ab6235acd06ab6
+EBUILD autogen-5.18.4-r1.ebuild 1004 BLAKE2B d34792d63b7006fe750917af01043c57e44c4e2a52e8d37df5a42501c5ba1a3101d0cbc34766fbcdb3bb6ee38319a843d61c47dbf8100aa470cd0bea6751e035 SHA512 9e5e9db6af651b4ac29e579a9bd528d9e7d960c5dffd80544b9bdbd378c1fea642be6d4237301b2dc0e62ea18aa0418817619d56f57fbdc6b4d2e3669c299074
 EBUILD autogen-5.18.4.ebuild 988 BLAKE2B 33c9989c980c49e9831243f11711b8f056b1ad761859d35ca8e7a2591074cee3d52be9706ac7909b3af4d95dc411be153ff91d430bb4d6d6a0173645597457bf SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index 1b71af5b0771..ba2709a78820 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+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 ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index efcca640fd4f..a8fd847ce73d 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -40,5 +40,5 @@ EBUILD binutils-hppa64-2.28.ebuild 650 BLAKE2B 6b0cf836068c33cbcb5a14a1e03e43cc8
 EBUILD binutils-hppa64-2.29.1-r1.ebuild 647 BLAKE2B c17820e537f67c2a26af197ee7ebb75176b82db1aeab7d4f43325cee6a535760953ed365d11e30dec733c6364e035c96f07620e5aa8ab980be043473db759ba8 SHA512 7076225bc7f9dcd90b69459acd42d06b592225bceb967e9f1a9058cc35080ecf3201116520fdac8a4a063aff6c4eb42bd0185ccbdcbc3c6017e1e34af51da993
 EBUILD binutils-hppa64-2.29.1.ebuild 676 BLAKE2B bf9da84ae57d3756e147bd875941758139551f3c0a61bc011109d33a26364a9e9d02ec4307679c849be2441864c8bad09463cee247f99f58a437f98dbf720f38 SHA512 435494d643ec9d50aa584df181a44bb386a993c78e34152d931f435fb60df9868c5c87a16cdcd24d5556056351d114375cc0d8e2d46e1d1fac9b3b81da7a3db8
 EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa
-EBUILD binutils-hppa64-2.30.ebuild 10684 BLAKE2B 72d9a1cbddb0c7720137d9f91fb8a6c113422bbd05c908de21baacf290f424cfba33d7df1462c620163f2fcb491c68fd5d760443c2e67a9b0baf79f1848d0586 SHA512 b38f1460886fe203d0551d580ae438ce541346883b30a01cb02d6baf1c7b7883e2282fb92b38f9dd7c087ae25fe3cd7266be16204867688bfd2e8d5180a586a2
+EBUILD binutils-hppa64-2.30.ebuild 10711 BLAKE2B d91a6fc2d813d54c6db206df19bb35b191fc7d1e5de8082b989436f88f1d99cc96a1140ab056f6bc7aac7ba4848d479cbd93d86269bd33e079a535d3b4218bbf SHA512 08b44c429c6d6dca8d75f39419a320fba335142e9fc9ae2a54c1fdd48f1d087e87a3dffc235314e1c2f36f38addb7230babd76a5aac6904a1cbe96767ac13ca0
 MISC metadata.xml 445 BLAKE2B 38db0981b080e996e57421a2c75b2ebb2172ef38c0cfadf4b6105901985e9d46b5ba1c939641747be35cfacb4e1928a9f711465b2e17909a282d0acf244b8be3 SHA512 dd2ce9defb3a005665ad2f495513c40b5420629e31a336f6640ef91c9effc6f062bd338a87fe70de8a6a2993dda9e141396b602a1e2b7445f15e6f33473d29ef
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
index 36883ada0ff4..2d7dd1ef3938 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.30.ebuild
@@ -81,6 +81,7 @@ if is_cross ; then
 fi
 
 MY_BUILDDIR=${WORKDIR}/build
+S=${WORKDIR}/${P/-hppa64/}
 
 src_unpack() {
 	case ${PV} in
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index b045e5cc6399..50f26741bb24 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,9 +1,6 @@
 AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696
-AUX dev86-0.16.19-memmove.patch 401 BLAKE2B 7d0a4fbc2a31ba764e52af652b698770a46657028addcd340e364b4e80d7c6e00965b13cd981dc2437179746a0a22652096eec7a271cc3811a38cec851a1c4c5 SHA512 4fa5ee815636048db2a0f5faeeb48b06e559639fb21be1db3319495bfe5f5e1ee1afcfc920d496845cf4bb3eae7ff4bf9aa77124638788f918ae27599d153a6a
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
-DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
-EBUILD dev86-0.16.21-r2.ebuild 1871 BLAKE2B 3046eb3fe8f3896bb4ed3ba3fb12a2e3beab636d6ffd2bfc968933b7f4a09b5dfd85456fb00a48b4a07fd9c3d296b8761f81eaff9887ac8c75aa8152630dbdcd SHA512 2df3325a2aed9ea2a9051c8a8e3e28c71c268a726188a25a0bff078d89f8981f27051625b16e887f0e4eee2128921fe8772e1e1f78ae3c8eba65f1ba3cd5dce2
+EBUILD dev86-0.16.21-r2.ebuild 1870 BLAKE2B e6da95b4a65b98d1215e109519c3400ed7b5189cacb1cda4cb0186bdb348134fd22b58b6e25ed2426c784e8a5e3ff0f11dc378ef642a361d200ff3323e9096d5 SHA512 5edc82cfd68a9e08bc5ef95b0fabfeca13bdf63a209ea3dfcb0730203bb7ca804c5c91aa60776668d6195c771f2ee38f55845f16b061b63a4ccc9a2bb561d9c3
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild
deleted file mode 100644
index 835423c7e4d1..000000000000
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
-SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-
-src_prepare() {
-	# elksemu doesn't compile under amd64
-	if use amd64; then
-		einfo "Not compiling elksemu on amd64"
-		sed -i \
-			-e 's,alt-libs elksemu,alt-libs,' \
-			-e 's,install-lib install-emu,install-lib,' \
-			makefile.in || die
-	fi
-
-	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-memmove.patch #354351
-	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
-		-e '/INEXE=/s:-s::' \
-		makefile.in || die
-	sed -i \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		bcc/bcc.c || die
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
-}
-
-src_compile() {
-	# Don't mess with CPPFLAGS as they tend to break compilation
-	# (bug #343655).
-	CPPFLAGS=""
-
-	# First `make` is also a config, so set all the path vars here
-	emake -j1 \
-		DIST="${D}" \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/bcc" \
-		INCLDIR="/usr/$(get_libdir)/bcc"
-
-	export PATH=${S}/bin:${PATH}
-	cd bin
-	ln -s ncc bcc
-	cd ..
-	cd bootblocks
-	ln -s ../bcc/version.h .
-	emake DIST="${D}"
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}"
-	dobin bootblocks/makeboot
-	# remove all the stuff supplied by bin86
-	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm usr/man/man1/{as,ld}86.1 || die
-	dodir /usr/share/man
-	mv usr/man usr/share/
-}
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 832575fed108..0e731cc95637 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-devel/bin86"
diff --git a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch b/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
deleted file mode 100644
index 12df3f672624..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/354351
-
-fix sniped from Debian:
-* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
-  by memmove (closes: #591133).
-
---- copt/copt.c
-+++ copt/copt.c
-@@ -174,7 +174,7 @@
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index a5af64b910f0..cd52e53fc380 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -1,5 +1,6 @@
+AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 EBUILD patch-2.7.5.ebuild 911 BLAKE2B 3eda3342754fb82470d8abbd3a9b9e3ee24b6e8ed62f8d0629fa3b6c3e248a4b522aa1a0074011108d8a74ddf4a94d00aa8d8423efd1b7755b4895438fbe3180 SHA512 f15e1b045b40506b1390a98bcf71834e153bc99d03fac764fea092ada307ac9f36444919052ff4c3a13ba3d5cb9b2afb089f0694f95a19f2636cef43cf149698
-EBUILD patch-2.7.6.ebuild 957 BLAKE2B 0fa435619e2068fbd100ca5947c52291b53b18755d7d19e45a8fa26c828e6b2f9e2d032296864ee8fe4e741a3b90b8eba41f5602475d22db2f453c172d06c696 SHA512 aec57551782124eef9727a693638a7a9965f5fedb417fa99dbb64377f4d4501d1d6ff1e2ca4b243f1a27cca25124edcb0ea784dea8744b1885e1be55365cafe3
+EBUILD patch-2.7.6-r1.ebuild 1006 BLAKE2B 65226ffe1d36be3f10d1ebb973295159f0cd64e6048a2773a95b2e748994466e127fba261a79d2d8a506dd31290ade69639821ae63c8457cfe41401657f05e74 SHA512 b23c82be5193c1f1b353db8534f6dbebdf20db0d83854a08daa0791789f97d96103ebfdfe69e80153dec58d55b79281f95e2c126d718e1cf0ce637df77e47c2e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
new file mode 100644
index 000000000000..3aff5c0f77ba
--- /dev/null
+++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch
@@ -0,0 +1,120 @@
+http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288
+http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5
+
+--- a/tests/crlf-handling
++++ b/tests/crlf-handling
+@@ -14,7 +14,7 @@ use_local_patch
+ use_tmpdir
+ 
+ lf2crlf() {
+-    while read l; do echo -e "$l\r"; done
++    while read l; do printf "%s\r\n" "$l"; done
+ }
+ 
+ echo 1 > a
+--- a/tests/git-cleanup
++++ b/tests/git-cleanup
+@@ -36,8 +36,8 @@ BAD PATCH
+ EOF
+ 
+ echo 1 > f
+-echo -n '' > g
+-echo -n '' > h
++printf '' > g
++printf '' > h
+ 
+ check 'patch -f -i 1.diff || echo status: $?' <<EOF
+ patching file f
+--- a/tests/merge
++++ b/tests/merge
+@@ -30,30 +30,28 @@ x2() {
+     while test $# -gt 0 && test "$1" != -- ; do
+ 	echo "$1"
+ 	shift
+-    done > a.sed
+-    echo "$body" | sed -f a.sed > b
++    done > b.sed
++    echo "$body" | sed -f b.sed > b
+     shift
+     while test $# -gt 0 ; do
+ 	echo "$1"
+ 	shift
+-    done > b.sed
+-    echo "$body" | sed -f b.sed > c
+-    rm -f a.sed b.sed
++    done > c.sed
++    echo "$body" | sed -f c.sed > c
++    rm -f b.sed c.sed
+     output=`diff -u a b | patch $ARGS -f c`
+     status=$?
+     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
+     cat c
+-    test $status == 0 || echo "Status: $status"
++    test $status = 0 || echo "Status: $status"
+ }
+ 
+ x() {
+-    ARGS="$ARGS --merge" x2 "$@"
++    ARGS="--merge" x2 "$@"
+     echo
+-    ARGS="$ARGS --merge=diff3" x2 "$@"
++    ARGS="--merge=diff3" x2 "$@"
+ }
+ 
+-unset ARGS
+-
+ # ==============================================================
+ 
+ check 'x 3' <<EOF
+--- a/tests/test-lib.sh
++++ b/tests/test-lib.sh
+@@ -41,7 +41,7 @@ use_local_patch() {
+ 
+     eval 'patch() {
+ 	if test -n "$GDB" ; then
+-	  echo -e "\n" >&3
++	  printf "\n\n" >&3
+ 	  gdbserver localhost:53153 $PATCH "$@" 2>&3
+ 	else
+           $PATCH "$@"
+@@ -113,22 +113,15 @@ cleanup() {
+     exit $status
+ }
+ 
+-if test -z "`echo -n`"; then
+-    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
+-	eval '
+-	    _start_test() {
+-		echo -n "[${BASH_LINENO[2]}] $* -- "
+-	    }'
+-    else
+-	eval '
+-	    _start_test() {
+-		echo -n "* $* -- "
+-	    }'
+-    fi
++if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
++    eval '
++	_start_test() {
++	    printf "[${BASH_LINENO[2]}] %s -- " "$*"
++	}'
+ else
+     eval '
+ 	_start_test() {
+-	    echo "* $*"
++	    printf "* %s -- " "$*"
+ 	}'
+ fi
+ 
+--- a/tests/merge
++++ b/tests/merge
+@@ -32,7 +32,7 @@ x2() {
+ 	shift
+     done > b.sed
+     echo "$body" | sed -f b.sed > b
+-    shift
++    test $# -eq 0 || shift
+     while test $# -gt 0 ; do
+ 	echo "$1"
+ 	shift
+-- 
diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild
new file mode 100644
index 000000000000..6da5e76b6d65
--- /dev/null
+++ b/sys-devel/patch/patch-2.7.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Utility to apply diffs to files"
+HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
+SRC_URI="mirror://gnu/patch/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static test xattr"
+
+RDEPEND="xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/ed )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch )
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		$(use_enable xattr)
+		--program-prefix="$(use userland_BSD && echo g)"
+	)
+	# Do not let $ED mess up the search for `ed` 470210.
+	ac_cv_path_ED=$(type -P ed) \
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6.ebuild
deleted file mode 100644
index b16c1511b888..000000000000
--- a/sys-devel/patch/patch-2.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-		--program-prefix="$(use userland_BSD && echo g)"
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 970882008ac9..0af735bc7ba3 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,9 +1,5 @@
-AUX sparse-0.4.3-gentoo.patch 1446 BLAKE2B 432086bedcb87765f350abcfa367aec73193d27034915372667845e8d3d4bf16187f20e8b0a6f61d31f7ceab6fae5604d975fbf84fb320fd55258e958b86dc8e SHA512 a270266af0ce1728b114092271e627f63f8e55339b06c67634825a7c89a7cf7e1af17cdd47b5dab7475ef7eca39b95026264c870dee2c3a228c63af0bbdec461
-DIST sparse-0.4.3.tar.bz2 172431 BLAKE2B 06864e372e676a5f0426612774f1df2d224e8e6a12b8f7edf7056225b19725e876196c12e4c92a9a2b64eb410c8a840f777b4df2ffb9945079f4903562fb0633 SHA512 ff3dbd3e28b1a95dc9d6abf9a4ffdfaa0f470047b8232bd50930839432ae66a2249adb861c880e8eef1a906b007fd7d1c1ef8683c48c763eb523aedc9e1df631
-DIST sparse-0.4.4.tar.bz2 174074 BLAKE2B d57c5ec6f837ef1fa8992b5ec21f467583888d9ac3b7699a73e6b8fa80046253cdc554a4c685c2d98474a18fee6fca26fa004d3afa74b18c8f58b05a2900d589 SHA512 5cd5e660ea863170e86f1abaa040434c43a5cc7e92560f1bcbcce9ce906ae7355c066168bfc1dcc551e41e4c0f864122be288ed69eb1c4cda8b7c0825b5b647f
-DIST sparse-0.5.0.tar.xz 187576 BLAKE2B c525ce2a11143cd2dbeaff3e8cb1eb66b1792a678946ce001f76ac9882cd54cce4d4c5ff740c12e0e54ca91a6a2dc57bc7682ff8653333014fcc382e662ba596 SHA512 0cb70a74034c4bc4d5340ab7d19288a438f4b6d0c4c63ac95d1f4cc3c5fdfe1370a27a607605a6f0c85ea6f371141c55abfdb4438d9e87b2d544fff5674f7ce4
-EBUILD sparse-0.4.3.ebuild 1322 BLAKE2B 749e70acabe5932b09851d5b51aabeb05cc0de325cc153f4fc5966df9047e6d14fbba8d81de1798397121a3836be45768beffe9e28a2bd3b98eb3988066deacb SHA512 6fd02eeb079aa4d042dbb541943c3a7b3e2c53dca0f06230fa627bb89558259a9bd78c7b54f4f5f87a4fc9318db0894aa7d3e6fa924d5d841099ab95913d8d83
-EBUILD sparse-0.4.4.ebuild 1167 BLAKE2B 1f82b207002f728ac590fa648edfd56b1175110e8d00a73c212f2a163a06ca9fc87c1423035625da6dc455349cbcbfa44a74d63650c738af0eb7366078562240 SHA512 02606f9f9925a0c10b40512dc292a16d9ef98a8cb40194bb5a00950e1f3efe68074d1b00b438b38e7bb2a61f4b076b05dbad68f2eeaa8d4506fbb45070ab1cdc
-EBUILD sparse-0.5.0.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e
-EBUILD sparse-9999.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e
-MISC metadata.xml 525 BLAKE2B 956633b76bd4f8edde355ea0cec33cc8b3724eeb74bb14f8d2e21a50c0463d5edcc98d2d254f1c87bd246c7148827cdc977d532c847e4bc0ada7395d0b13baa6 SHA512 13276deb8b8de0457f74caaeef8cb268af9489f66b6714e376cf78927890b011f5523f284cc069ff5f955d78ddcf83d21db035d24ea3b7c4b670350e17f9aaa5
+AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7
+DIST sparse-0.5.1.tar.gz 278241 BLAKE2B 6004631c97e2a126d1e239aa1d8fcc540a92b3f63a6a2615f2f63b79a001495e8b27ffa7377c57b43227f3b50288be24cb4657c7801806f7c6d1d11b0f8c8ee9 SHA512 04a26e2b44d99e7402b5e8a8f61ecbd62adbc9c481a0c3c8e0ab2f9599d99f50679ce3f3d0c1ccfd6204c6ec5d9fa272f9fc4c4d21173897ebd592d14c6ee852
+EBUILD sparse-0.5.1.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d
+EBUILD sparse-9999.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d
+MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859
diff --git a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch b/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
deleted file mode 100644
index 6f46687d78b3..000000000000
--- a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 74905df..1f2b2b6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@ OS = linux
- 
- 
- CC = gcc
--CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g
-+CFLAGS ?= -O2 -finline-functions -fno-strict-aliasing -g
- CFLAGS += -Wall -Wwrite-strings
- LDFLAGS += -g
- AR = ar
-@@ -21,7 +21,8 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && 				\
- 		echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c)
- HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes')
- 
--CFLAGS += -DGCC_BASE=\"$(shell $(CC) --print-file-name=)\"
-+GCC_BASE = $(shell $(CC) --print-file-name=)
-+CFLAGS += -DGCC_BASE=\"$(GCC_BASE)\"
- 
- ifeq ($(HAVE_GCC_DEP),yes)
- CFLAGS += -Wp,-MD,$(@D)/.$(@F).d
-@@ -113,7 +114,9 @@ SED_PC_CMD = 's|@version@|$(VERSION)|g;		\
- 
- all: $(PROGRAMS) sparse.pc
- 
--install: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
-+all-installable: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc
-+
-+install: all-installable
- 	$(Q)install -d $(DESTDIR)$(BINDIR)
- 	$(Q)install -d $(DESTDIR)$(LIBDIR)
- 	$(Q)install -d $(DESTDIR)$(MAN1DIR)
-diff --git a/parse.h b/parse.h
-index 6b21e23..b26bd03 100644
---- a/parse.h
-+++ b/parse.h
-@@ -35,10 +35,6 @@ struct statement {
- 		struct /* declaration */ {
- 			struct symbol_list *declaration;
- 		};
--		struct /* label_arg */ {
--			struct symbol *label;
--			struct statement *label_statement;
--		};
- 		struct {
- 			struct expression *expression;
- 			struct expression *context;
diff --git a/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch
new file mode 100644
index 000000000000..5ea763001a05
--- /dev/null
+++ b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch
@@ -0,0 +1,66 @@
+diff --git a/validation/include-eval.c b/validation/include-eval.c
+new file mode 100644
+index 000000000..bf9bf63fe
+--- /dev/null
++++ b/validation/include-eval.c
+@@ -0,0 +1,7 @@
++/* nothing */
++
++/*
++ * check-name: include-eval.c
++ * check-command: sparse -include ./include-eval.inc $file
++ * check-known-to-fail
++ */
+diff --git a/validation/include-eval.inc b/validation/include-eval.inc
+new file mode 100644
+index 000000000..e2561ca41
+--- /dev/null
++++ b/validation/include-eval.inc
+@@ -0,0 +1,12 @@
++typedef unsigned long long_t;
++
++inline
++static unsigned int ok(void)
++{
++	return sizeof(long_t);
++}
++
++static unsigned int ko(void)
++{
++	return sizeof(long_t);
++}
+diff --git a/lib.c b/lib.c
+index 4602cf85d..b255fec14 100644
+--- a/lib.c
++++ b/lib.c
+@@ -1351,6 +1351,20 @@ struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list
+ 		 */
+ 		protect_token_alloc();
+ 	}
++	/*
++	 * Evaluate the complete symbol list
++	 * Note: This is not needed for normal cases.
++	 *	 These symbols should only be predefined defines and
++	 *	 declaratons which will be evaluated later, when needed.
++	 *	 This is also the case when a file is directly included via
++	 *	 '-include <file>' on the command line *AND* the file only
++	 *	 contains defines, declarations and inline definitions.
++	 *	 However, in the rare cases where the given file should
++	 *	 contain some definitions, these will never be evaluated
++	 *	 and thus won't be able to be linearized correctly.
++	 *	 Hence the evaluate_symbol_list() here under.
++	 */
++	evaluate_symbol_list(list);
+ 	return list;
+ }
+ 
+diff --git a/validation/include-eval.c b/validation/include-eval.c
+index bf9bf63fe..1a91dab84 100644
+--- a/validation/include-eval.c
++++ b/validation/include-eval.c
+@@ -3,5 +3,4 @@
+ /*
+  * check-name: include-eval.c
+  * check-command: sparse -include ./include-eval.inc $file
+- * check-known-to-fail
+  */
diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index 58fef00ea442..ee8e0692a0ca 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
diff --git a/sys-devel/sparse/sparse-0.4.3.ebuild b/sys-devel/sparse/sparse-0.4.3.ebuild
deleted file mode 100644
index c351211de29d..000000000000
--- a/sys-devel/sparse/sparse-0.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib flag-o-matic toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git
-fi
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
-	KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE="gtk xml test"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-src_prepare() {
-	# https://cgit.gentoo.org/proj/sparse.git
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-mymake() {
-	usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
-
-	emake \
-		V=1 \
-		CC="$(tc-getCC)" \
-		GCC_BASE="$(gcc-config -L | cut -d : -f1)" \
-		HAVE_LIBXML=$(usex xml) \
-		HAVE_GTK2=$(usex gtk) \
-		PREFIX=/usr \
-		LIBDIR="/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		"$@" \
-		|| die
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	mymake \
-		$(use test && echo all) all-installable
-}
-
-src_install() {
-	mymake install
-	dodoc FAQ README
-}
diff --git a/sys-devel/sparse/sparse-0.4.4.ebuild b/sys-devel/sparse/sparse-0.4.4.ebuild
deleted file mode 100644
index 51173588d3c2..000000000000
--- a/sys-devel/sparse/sparse-0.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE="gtk test xml"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LIBXML=$(usex xml)"
-}
-
-src_compile() {
-	emake $(usex test all all-installable)
-}
diff --git a/sys-devel/sparse/sparse-0.5.0.ebuild b/sys-devel/sparse/sparse-0.5.0.ebuild
deleted file mode 100644
index 8771de72828a..000000000000
--- a/sys-devel/sparse/sparse-0.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
-
-DESCRIPTION="C semantic parser"
-HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE="gtk llvm test xml"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	llvm? ( >=sys-devel/llvm-3.0 )
-	xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	xml? ( virtual/pkgconfig )"
-
-src_prepare() {
-	tc-export AR CC PKG_CONFIG
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
-		-e "s:pkg-config:${PKG_CONFIG}:" \
-		Makefile || die
-	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
-}
-
-src_compile() {
-	emake $(usex test all all-installable)
-}
diff --git a/sys-devel/sparse/sparse-0.5.1.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild
new file mode 100644
index 000000000000..aad07d85db73
--- /dev/null
+++ b/sys-devel/sparse/sparse-0.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="C semantic parser"
+HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gtk llvm test xml"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	llvm? ( >=sys-devel/llvm-3.0 )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )
+	xml? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" )
+
+src_prepare() {
+	tc-export AR CC PKG_CONFIG
+	sed -i \
+		-e '/^PREFIX=/s:=.*:=/usr:' \
+		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
+		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
+		-e "s:pkg-config:${PKG_CONFIG}:" \
+		Makefile || die
+	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
+	default
+}
+
+src_compile() {
+	emake $(usex test all all-installable)
+}
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 8771de72828a..aad07d85db73 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit eutils multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	inherit git-2
-fi
 
 DESCRIPTION="C semantic parser"
 HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page"
 
 if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git"
+	KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz"
+	SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-LICENSE="OSL-1.1"
+LICENSE="MIT"
 SLOT="0"
 IUSE="gtk llvm test xml"
 
@@ -31,15 +28,18 @@ DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	xml? ( virtual/pkgconfig )"
 
+PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" )
+
 src_prepare() {
 	tc-export AR CC PKG_CONFIG
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
-		-e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \
+		-e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \
 		-e "s:pkg-config:${PKG_CONFIG}:" \
 		Makefile || die
 	export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)"
+	default
 }
 
 src_compile() {
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 44cb696dfb23..07fadaacb7bc 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 0cf3ceab80f1..0830448fa597 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,7 +1,10 @@
+AUX edk2-ovmf-2017_p20180211-build_system_fixes.patch 11790 BLAKE2B 0df5e575f344867a02b8923b891180b2ba8884301988246bed83cc6090a627871e68a0e2a15738f52ba9e5492d496edfef72eb535638fc10dab5899b26866adf SHA512 8406f65f1c595c0a2057b15302cd87e3be722a9151589163b828cac3109d9b98f7573ffb45436e17362ca1bee44f3158c13c4327bfaebdf6fd856d5a6c4cfc05
 AUX edk2-ovmf-2017_pre20170505-build_system_fixes.patch 20014 BLAKE2B e2dc20057ef58698e88a9b971eea921f0e5833fb24605f99bb109527283762893bb0271eaa16200c1d26c58024d72dfe1bd1636b55522c8147a69796ba1fa0d4 SHA512 3db1adcabd1e2446c601a52da7e52b4b89323e329dc852c568320e9fb3e8a4619ad8aeda1b529022cd20c7af77894221cca5c34c7acd73115dcb083991216150
+DIST edk2-ovmf-2017_p20180211-bin.tar.xz 910896 BLAKE2B 2d2ead282cebc1254cae2b10042f809e887a17a83fe67998ddcadf86cdf07e615594b243ab35d3fa8a6d6ce218f8f0bad758ee1db2ab4ff6c08d65419f4078b0 SHA512 88c3c4d7cecc2af1cc4dfa06686f34cc3a5facfb24750c766b47f53dec7267b95b58b391d23038e6a589d1687d2c117f1912d10118e26f99c0906c3d8e90deed
+DIST edk2-ovmf-2017_p20180211.tar.xz 22977736 BLAKE2B 4d95eaf3017668197632ab7e035ad6c9f1490bde3d27e575170541fd64773fef8676406c88451b8dc996d9d7dd625fa389279105951f02e08f6de025075bd172 SHA512 ee3d70da562ed7dc4647576da8605d25fd9f991b4a96c2ed106e0d1b697af9e0624ad161750ccba7ab3db553ab1c6177780dd9c29a70073eb17729e9ae24c5a7
 DIST edk2-ovmf-2017_pre20170505-bin.tar.xz 874904 BLAKE2B a381d3ca20cf0e1f3aff74335c1d783bb80f0b5c7a8716d8154f2e0a19255780e5b08fae37cab9fa484fc1cbe3bc3b5d40339634ee3b0808bd2b3a8b2849730a SHA512 c7a7d83758214b6ab63c6cefe827a601aaa7656b7f01e03413c84d913078a2b0d8037f70de34d42d8e1614aee794e0ffd7d9e62314eb4e04c21256b70338af5c
 DIST edk2-ovmf-2017_pre20170505.tar.xz 22952060 BLAKE2B 7d4da1fed8e76f643e2856be2485f6c398896d61b7ad8fb013e891fd73f69c4acfd9980e7f95aec002cee647719a622711100f8cb6829edecae35ed31b3ef563 SHA512 6da859360448fd6d04d1492c88a7e935f7108c524f7ccfe6aa4c13bf9af9695dbc4a5b8efa274adc86d3105946aaa1ba80bcd9713facdca153f1a3d873797b63
-EBUILD edk2-ovmf-2017_pre20170505-r1.ebuild 2627 BLAKE2B 0dfddc2ae12ff8bd393665de077922173a6f2d21e746cf02dd242d664d2b0a5b17f06f44f4b2724bc576fd233ea3365b1a587ef245a947e01138fce7db4e48d4 SHA512 e6963311f3223368dbc8a8031c1ac002fd5398433720d48e1e6179534cfae476a3365b9f498c3e134947e2b6e89b818ae0b31c8f6c111970fa548a0e0a3eabdb
-EBUILD edk2-ovmf-2017_pre20170505.ebuild 2447 BLAKE2B 736d34ddd458b35b88da04ed202213061c6a7e82b095aeb7dc3c7a159ad021ea9f6deb3e5f927ce40acfec4268462db898e4f4b4a2824b8bc2f3875bda3acf1a SHA512 d78c894492931070e55cfd92eec95450ea619ea734da2bc63f3f106aacf437d020359acda9902a7abb83526c87ca7270f11aac48be6c8f142a4a9ba96d473707
+EBUILD edk2-ovmf-2017_p20180211.ebuild 2600 BLAKE2B 237718b2df279666d96095e04985c72efe0c0c3e782f4789f7e51561ea676395a1fc54a4e950f5017950219bb717c16c47fef38d8eb4cafa88c39b246ec8d23e SHA512 d94f0ef7c087031d87d56c72ef238eefba0bc3bc69f0f8aed890532a215b2a9878f518cf9824651a17593487cc2746070fcd38ebda0d26a86b91d4f0d5d19516
+EBUILD edk2-ovmf-2017_pre20170505-r1.ebuild 2625 BLAKE2B cdddc73cba36ab73eaf251dadfff03984d2d8b5b25ee621dc58be70440581d1e6c534736fe0baba4b242673d3ea95d0694b44b91095772255a534f0de64798f2 SHA512 c10da9241e09c6b2594ba90764849f52f0c8cf12b4d150634a9a587d1f5088af5302209a4304e3be5bf39eb2616ed4e0ee4b27b37341c8afad023e7813f3486e
 EBUILD edk2-ovmf-9999.ebuild 2623 BLAKE2B d45f009e190c4b3509f0e964b0b543b7b1cd151f16d36c15521c20f4eae706222817feaa938d9f6f09bbb53273f3eb4c08a63626c5b1e388a9c081ca7de7b9c9 SHA512 ea78ca3f82f628372886736f596b768982a192dd78397ab085ac0b985a00c3452b2b33c5aa17b0e162e2f470d968ff2714ec12f8a7572a10e4857a095da2b9b3
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
new file mode 100644
index 000000000000..ff5c5d8fabdc
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+SOURCE_DEPEND="
+	>=dev-lang/nasm-2.0.7
+	>=sys-power/iasl-20160729
+	${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tianocore/edk2"
+	DEPEND+="
+		${SOURCE_DEPEND}"
+else
+	SRC_URI="
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
+		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	IUSE="+binary"
+	REQUIRED_USE+="
+		!amd64? ( binary )
+	"
+	DEPEND+="
+		!binary? ( amd64? ( ${SOURCE_DEPEND} ) )"
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+	/usr/share/edk2-ovmf/OVMF.fd
+	/usr/share/edk2-ovmf/OVMF_CODE.fd
+	/usr/share/edk2-ovmf/OVMF_VARS.fd
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+	OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+	$ qemu-system-x86_64 \
+		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+		...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+	nvram = [
+		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+	]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build_system_fixes.patch
+)
+
+pkg_setup() {
+	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if  [[ ${PV} != "9999" ]] && use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	TARGET_ARCH=X64
+	TARGET_NAME=RELEASE
+	TARGET_TOOLS=GCC49
+
+	[[ ${PV} != "9999" ]] && use binary && return
+
+	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
+
+	. ./edksetup.sh
+
+	./OvmfPkg/build.sh \
+		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+		-D FD_SIZE_2MB \
+		|| die "OvmfPkg/build.sh failed"
+}
+
+src_install() {
+	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
+
+	insinto /usr/share/${PN}
+	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
index 5dc75dbd084c..502a513b8bd2 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-r1.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505-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
@@ -31,7 +31,7 @@ else
 	SRC_URI="
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
deleted file mode 100644
index a8c0062de017..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_pre20170505.ebuild
+++ /dev/null
@@ -1,108 +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 eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-# inherit git-r3
-# EGIT_REPO_URI="https://github.com/tianocore/edk2"
-# EGIT_BRANCH="UDK2017"
-# EGIT_COMMIT="f30c40618b1f3537705b450a91ce00b9e587badb"
-
-SRC_URI="
-	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-	!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="+binary"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	!amd64? ( binary )"
-
-DEPEND="
-	!binary? (
-		amd64? (
-			>=dev-lang/nasm-2.0.7
-			>=sys-power/iasl-20160729
-			${PYTHON_DEPS}
-		)
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build_system_fixes.patch
-)
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
new file mode 100644
index 000000000000..cdb465336e14
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
@@ -0,0 +1,91 @@
+diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
+index 427ad60..c2b6d83 100755
+--- a/BaseTools/Conf/tools_def.template
++++ b/BaseTools/Conf/tools_def.template
+@@ -4500,7 +4500,7 @@ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
+ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

+ *_*_*_DTC_FLAGS                    = -H epapr

+ 

+-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

++DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common

+ DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe

+ DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe

+ DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency

+@@ -4535,7 +4535,7 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little   -B ia64
+ DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii

+ DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii

+ 

+-DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

++DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

+ DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables

+ DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables

+ DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20

+@@ -6139,7 +6139,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
+ *_ELFGCC_X64_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc

+ *_ELFGCC_X64_RC_PATH               = DEF(ELFGCC_BIN)/objcopy

+ 

+-*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

++*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

+ *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

+ *_ELFGCC_X64_SLINK_FLAGS           =

+ *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

+@@ -6162,7 +6162,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
+ *_ELFGCC_IPF_VFRPP_PATH           = DEF(ELFGCC_BIN)/gcc

+ *_ELFGCC_IPF_RC_PATH              = DEF(ELFGCC_BIN)/objcopy

+ 

+-*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include AutoGen.h -D_EFI_P64

++*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -include AutoGen.h -D_EFI_P64

+ *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

+ *_ELFGCC_IPF_SLINK_FLAGS          =

+ *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

+@@ -7553,7 +7553,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
+ ##################

+ # ASL definitions

+ ##################

+-*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h

++*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h

+ *_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

+ *_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h

+ *_XCODE5_*_ASL_FLAGS        =

+@@ -7581,9 +7581,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386
+       *_XCODE5_IA32_NASM_FLAGS = -f macho32

+ 

+ 

+-  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

+-RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

+-  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

++  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

++RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

++  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

+ 

+ ##################

+ # X64 definitions

+@@ -7600,9 +7600,9 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
+ *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h 

+ *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 

+ 

+-  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

+-  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

+-RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

++  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

++  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

++RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

+ 

+ ####################################################################################

+ #

+diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
+index 0976973..d9ee70e 100644
+--- a/BaseTools/Source/C/Makefiles/header.makefile
++++ b/BaseTools/Source/C/Makefiles/header.makefile
+@@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
+ BUILD_CPPFLAGS = $(INCLUDE) -O2

+ ifeq ($(DARWIN),Darwin)

+ # assume clang or clang compatible flags on OS X

+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

+ else

+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

++BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

+ endif

+ BUILD_LFLAGS =

+ BUILD_CXXFLAGS = -Wno-unused-result

diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 6ea6c2cf3f72..0c6b17ce46f8 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -3,6 +3,9 @@ AUX ipxe-1.0.0_p20130925-no-pie.patch 1059 BLAKE2B a7c28d556db0fae9acb8c3ba83dc0
 AUX ipxe-1.0.0_p20160620-no-pie.patch 1053 BLAKE2B 20c091982e0e2d4bb8838df56c89d1eb2e6bafd6336a2f1d84b5b19568a7e97f0d038336184f873249957faa36c53e5f6a3dacafd45456885b4b0284d8ba51f1 SHA512 baace4f9b0d3a2b280beacf742c9bbbe8b276c79f13e46c3e6d1d63727da28816bb4bbc19f83306a5939ba7a22c29dca0ba4d80e47ace9b0c151db524076afe9
 DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 BLAKE2B 58717ca43ece4ffbe8f68cae2f409c4cd8f1d3c2149521c28db017d4fcd31b6122fa35b9a476d3dc865baba0d2768744f4977420fb6410f1b09dad9170c32497 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd
 DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 BLAKE2B ec6999f3bcaf198f4b73464ee34456b923d0be26f11980e3020dd66012ddbf1b721aebb1c74c4289a0012e2ffae96a54a25821a4c7c621f727e090d13de58213 SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5
+DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cbef6e263abd230b9831c945a8edb33a29d408bd4262e370a2f73c8d2eb3cb20e08c61ece83af1fb1bb4c5694098cb29c44628dbd18def8 SHA512 af2778c925a6e4c374ddae85f3db983c83e7a4e5bb2cf35e356d277b87d4c89bf63cc2c061ec31d608ff2160c13297232fa131da2b9dd0b580d93e1b0efd6532
+DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
 EBUILD ipxe-1.0.0_p20130925.ebuild 2532 BLAKE2B 99bd848b672ede6a8d3d3cb4cd55ea5e5c3afd32d8ad56996edceff18ba10f4440640c2c91ec8a99ec3fdbb37f28705c0408733023c4b0aad977642c67850835 SHA512 d58eb5fc8dd50c2822474f07a7060f0bbff77c3ad815a0358503db365ee7c5e1d0b5f45da42a6a6653acd24537872ecfe3060e344681e6e65f3098ef409ad937
 EBUILD ipxe-1.0.0_p20160620.ebuild 2658 BLAKE2B 4757557957cfd0bdaed6dcf76b5c4dc89632881e51912ff824133806610b4e74551524ac0ef99115f381b043870d1f2cf0e38201f81994fdfc3d93195f4be12d SHA512 582abace1b57854b49d326fc88ec9e066d7ca287964f16c2f65f3a4b853ae65fd63aaf8f47d85adab4a71cf39be794eedb8452cc5380850dd4a19808bdf908d8
-MISC metadata.xml 787 BLAKE2B 676a756c14f6f84f5dc35f8e089ad705f05919a96006830997df328e62fe63acd8fa5be3b0bf3c046494ba0b12c93d297f40867724e7e1720b55f84fa94d1a0b SHA512 3fed11d48c302d4800b20f4b7fb6a232bfc388b950b88357f35a33792063f1c143eb7f97e16cfb35ddb893688fc1efeac47a40dd56f97c18ebbd3ad690393b34
+EBUILD ipxe-1.0.0_p20180211.ebuild 2806 BLAKE2B eadb782d89ff5bca27ff4df29a18b899b6f97bc6ddf39453b2552ce7599a938d8c7b4570a2155cbdb0ee613d0dbed950ca08ac052b8adb5aeaf1e40b3085bd73 SHA512 87b8ff0e0acaf9673e81302cdda9a570925de66e11ff2272cb7024b8c213a2f66f3e12b1c19427ebd481c5a231e092e9eba7ef53e4e5d010ef855b12ac718f86
+MISC metadata.xml 838 BLAKE2B bacad3c1d9cbe5877e16d1709873f571543afdb66241afe5e520b8d980eaaa7896407eecaf8226e9b73135dfcd2dc1078351126b1c00c07c7d8f2b72a8818ae0 SHA512 604ae9fc9d7d8e85fe093638b9d18f27e0a018a4da99d5d5b1bfe31748c3e9624717db056929e1b81db2f944b623043cc088ef7e2d2cb483159e9521d091ccd5
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
new file mode 100644
index 000000000000..1794162081a7
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils savedconfig
+
+GIT_REV="546dd51de8459d4d09958891f426fa2c73ff090d"
+GIT_SHORT=${GIT_REV:0:7}
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="http://ipxe.org/"
+SRC_URI="
+	!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
+
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+SOURCE_DEPEND="app-arch/xz-utils
+	dev-lang/perl
+	sys-libs/zlib
+	iso? (
+		sys-boot/syslinux
+		virtual/cdrtools
+	)"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
+
+src_configure() {
+	use binary && return
+
+	cat <<-EOF > "${S}"/config/local/general.h
+#undef BANNER_TIMEOUT
+#define BANNER_TIMEOUT 0
+EOF
+
+	use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
+
+	if use vmware; then
+		cat <<-EOF >> "${S}"/config/local/general.h
+#define VMWARE_SETTINGS
+#define CONSOLE_VMWARE
+EOF
+	fi
+
+	restore_config config/local/general.h
+
+	tc-ld-disable-gold
+}
+
+ipxemake() {
+	# Q='' makes the build verbose since that's what everyone loves now
+	emake Q='' \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AS="$(tc-getAS)" \
+		AR="$(tc-getAR)" \
+		NM="$(tc-getNM)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	export NO_WERROR=1
+	if use qemu; then
+		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
+		ipxemake bin/8086100e.rom # pxe-e1000.rom
+		ipxemake bin/80861209.rom # pxe-eepro100.rom
+		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
+		ipxemake bin/10222000.rom # pxe-pcnet.rom
+		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
+		ipxemake bin/1af41000.rom # pxe-virtio.rom
+	fi
+
+	if use vmware; then
+		ipxemake bin/8086100f.mrom # e1000
+		ipxemake bin/808610d3.mrom # e1000e
+		ipxemake bin/10222000.mrom # vlance
+		ipxemake bin/15ad07b0.rom # vmxnet3
+	fi
+
+	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
+	use iso && ipxemake bin/ipxe.iso
+	use undi && ipxemake bin/undionly.kpxe
+	use usb && ipxemake bin/ipxe.usb
+	use lkrn && ipxemake bin/ipxe.lkrn
+}
+
+src_install() {
+	insinto /usr/share/ipxe/
+
+	if use qemu || use vmware; then
+		doins bin/*.rom
+	fi
+	use vmware && doins bin/*.mrom
+	use efi && doins bin-efi/*.efi
+	use iso && doins bin/*.iso
+	use undi && doins bin/*.kpxe
+	use usb && doins bin/*.usb
+	use lkrn && doins bin/*.lkrn
+
+	save_config config/local/general.h
+}
diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
index 79e3a615e175..2dad71b85b76 100644
--- a/sys-firmware/ipxe/metadata.xml
+++ b/sys-firmware/ipxe/metadata.xml
@@ -5,6 +5,7 @@
 	<email>qemu@gentoo.org</email>
 </maintainer>
 <use>
+	<flag name="binary">Use pre-built binaries</flag>
 	<flag name="efi">Build an EFI program for using PXE</flag>
 	<flag name="iso">Build a bootable ISO for using PXE</flag>
 	<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 9a96f36db941..e1464b9d5065 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -8,11 +8,10 @@ AUX seavgabios/config.vga-qxl 128 BLAKE2B f627711caa7dfbb236b4e9e83104d3d5c7d07a
 AUX seavgabios/config.vga-stdvga 59 BLAKE2B 7c10706c7d261f64e181d85c268375aa3b6b362bf3e5f1f391c52a6a3644a498a44c9627f60b6c47893c4fad24cc4667e816ab98e6bdcdb97b7d8f7463a8bf10 SHA512 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448
 AUX seavgabios/config.vga-virtio 128 BLAKE2B 98237322784b56cdff2c7d7298a419b18ab77031dfad9da743af73c3073a5b766be3940694a320c82ffda65c8a48e028eccd974d37ccd44f9ba0720b5787b53e SHA512 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a
 AUX seavgabios/config.vga-vmware 128 BLAKE2B 8ab374ee7b0ad5cd8f732ccc4983f2251a8ba4843bab358cb3e84e12a572e4e348094e762ecfaa94f704ad05d718bfebd34048b1db3076dae2309d7963794437 SHA512 2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0
-DIST bios.bin-1.10.1.xz 63668 BLAKE2B 82b055acc851305a2f9d54419da846a3ed1924038cdf1c97665c3953ddb9a404a373478a8f655a1ccc5b978a638c48604b2d77a2aa8989c177ece402be971d27 SHA512 9e3ba9c7dac3f03f9c57898a993eab34f8f3fecb0ac4718f6d4d6b1a825651a255e48fb7dc29a339249f42668469946f238674cb1f8308cf9b4a3e1e82c346d3
-DIST seabios-1.10.1.tar.gz 588092 BLAKE2B d27d16e5d02e00695dd8790ef63bc5d99815580d6d6d5bcbbb70b36a9cc7984cca6d1c4c274a20a992e11460b52583ec9e77f8e2b22066349f2915cbf6fb9e2f SHA512 b2f1c2b15853b1cc949f741ae13f32fd133efb0d0917e1cdfb253f9cd0bc9bb0b42c592cdd87bc74ccbb12a4301c102ae723ccdb490ea4716e0c9dca3dd3fead
 DIST seabios-1.10.2-bin.tar.xz 121172 BLAKE2B 9d4ff624b638773e59bbf6674fb8630bd815d75af1a81db4de7f9740c37485330e6d054448f2301a97455ff0d3190d988ce0348eac78bd978982b6ce5146e4f6 SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69
 DIST seabios-1.10.2.tar.gz 589283 BLAKE2B 08fdbecf7fb06629db472adb05a780249dbf0e0a44d04dcced5480d631c133f74ecd04b04486db3bb817b8e119e783c4b09c3ade15b9a6cc956537e9f7204514 SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc
-DIST seavgabios-bin-1.10.1.tar.xz 20408 BLAKE2B e8678a5e1b7cf5c36017c3f3dec1996103304394215ce52e9fc23bb0581d253a87be0592eb5b2f1ef7bbfb03e80cd937d82b04a46c76e41fa5b95063782075b2 SHA512 7fe97efaf61c2d1e72c8df27b5108c80f6a51f5a7370de68720b0f71abe05ae5765dd867d127df2fa6182b5d4702a9ef7549e7170fec5071b31a6066db20c219
-EBUILD seabios-1.10.1.ebuild 3444 BLAKE2B 899b2f0c7804c76a4ec30796dbc242fc6d89f7686291073a351eaf5ad4f5e6685d3ec81a184ca4436aff36737ebff370d487799a4001f05f71d1a5fe02749b77 SHA512 6344ad74bebcb1752221d26fd22905a37ed3e4e70836f2916677088dc3add02546a423f4e97b49d9a837de9882d888dfb3dd5b49f249c2e0e0f9bff62fda7b69
+DIST seabios-1.11.0-bin.tar.xz 158552 BLAKE2B 44c42b9eea70a090ad51296949fe79e5360b569bae791fe84f447061f8dbcdb6b601501e2cc1607b62308f3118087386d15ba32c8495202f62f9f9a1e3cf27c3 SHA512 03a1523dc99dbf6e353e7844a4f12020d88bf8d5cbfd187007663ab1b02447b02694f27ee93aa46a18a5ab161f13b1ffe62f2d0f678cd86975a3d53295a6eb1e
+DIST seabios-1.11.0.tar.gz 607746 BLAKE2B 9f688be6b8f7c0fcbd72b59ac649a9c763fdd9e2971a4d85636c9972efc0ad42082a1622a8c41156ad1e2063907349c2e02cff9aeb444844dc445b5f7d6062bb SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77
 EBUILD seabios-1.10.2.ebuild 3411 BLAKE2B 60be808fdaa681aad580615c077896eb32cc0138207f56bf474fa93dfef80bdcda875e7757f242d5f01a3796857a036b8f81c2f71ee97fc3b7081101e4a6fcb6 SHA512 c1dd401ea38f1c4479d7c0c7436e13ac83288f0fa21b3ea368389b5b9dbda14d63ce319d92c6ea7a03c6efef9dd0d126691efa4d79f36c9d730f52cba85befb7
+EBUILD seabios-1.11.0.ebuild 3329 BLAKE2B 6ba1dff2ecb43431c85cc7f6a7678e003488ac415174b0de0e1e1a4df8fd4d7aed1b5c8e9800e2f70181f56b6e4665d94ddbaab791c2860f4d8a8b57a4c08813 SHA512 6b9d7c30535eaee2dec02151e132aef07016f272b175b651241b081e1847e049d1428d4c58414ea7da43a916047954dc85ad0ca7193972877facf52589ae064b
 MISC metadata.xml 663 BLAKE2B 54437b23d3d5ac74acee9b057e094c67db93d6b593367401d56e1b60a126a67ad9481ce15ffef0c004e2b554e90806e69bb7838594557fd36e461fb7c6a7cd09 SHA512 a3b306f0cfc8d0c2f31757b3b141c532dc5ee1fea7c01b7d23e6643977e63aee90a007875f1e34fb3f212c2dc1e23e4400f092b1d288f325abead33a9cfa66fa
diff --git a/sys-firmware/seabios/seabios-1.10.1.ebuild b/sys-firmware/seabios/seabios-1.10.1.ebuild
deleted file mode 100644
index c430395a16f8..000000000000
--- a/sys-firmware/seabios/seabios-1.10.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit eutils toolchain-funcs python-any-r1
-
-# SeaBIOS maintainers sometimes don't release stable tarballs or stable
-# binaries to generate the stable tarball the following is necessary:
-# git clone git://git.seabios.org/seabios.git && cd seabios
-# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
-
-if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
-	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-2
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
-	# https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
-	# http://fedora.mirror.lstn.net/
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.10.1-1.fc26.noarch.rpm
-	#   seavgabios-bin-1.10.1-1.fc26.noarch.rpm
-	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? (
-			mirror://gentoo/bios.bin-${PV}.xz
-			seavgabios? ( mirror://gentoo/seavgabios-bin-${PV}.tar.xz )
-		)"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="https://www.seabios.org/"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE="+binary debug +seavgabios"
-
-REQUIRED_USE="debug? ( !binary )
-	!amd64? ( !x86? ( binary ) )"
-
-# The amd64/x86 check is needed to workaround #570892.
-SOURCE_DEPEND="
-	>=sys-power/iasl-20060912
-	${PYTHON_DEPS}"
-DEPEND="
-	!binary? (
-		amd64? ( ${SOURCE_DEPEND} )
-		x86? ( ${SOURCE_DEPEND} )
-	)"
-RDEPEND=""
-
-pkg_pretend() {
-	if ! use binary; then
-		ewarn "You have decided to compile your own SeaBIOS. This is not"
-		ewarn "supported by upstream unless you use their recommended"
-		ewarn "toolchain (which you are not)."
-		elog
-		ewarn "If you are intending to use this build with QEMU, realize"
-		ewarn "you will not receive any support if you have compiled your"
-		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
-		ewarn "in SeaBIOS."
-	fi
-}
-
-pkg_setup() {
-	use binary || python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	# This simplifies the logic between binary & source builds.
-	mkdir -p "${S}"
-}
-
-src_prepare() {
-	use binary && return
-
-	epatch_user
-}
-
-src_configure() {
-	use binary && return
-
-	tc-ld-disable-gold #438058
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_LEVEL=8" >.config
-	fi
-	_emake config
-}
-
-_emake() {
-	LANG=C \
-	emake V=1 \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
-		"$@"
-}
-
-src_compile() {
-	use binary && return
-
-	_emake out/bios.bin
-	mv out/bios.bin ../bios.bin
-
-	if use seavgabios ; then
-		local config t targets=(
-			cirrus
-			isavga
-			qxl
-			stdvga
-			virtio
-			vmware
-		)
-		for t in "${targets[@]}" ; do
-			emake clean distclean
-			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
-			_emake oldnoconfig
-			_emake out/vgabios.bin
-			cp out/vgabios.bin ../vgabios-${t}.bin || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/seabios
-	newins ../bios.bin* bios.bin
-
-	if use seavgabios ; then
-		insinto /usr/share/seavgabios
-		doins ../vgabios*.bin
-	fi
-}
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
new file mode 100644
index 000000000000..699fca3bfa7a
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -0,0 +1,137 @@
+# 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,5,6}} )
+
+inherit eutils toolchain-funcs python-any-r1
+
+# SeaBIOS maintainers sometimes don't release stable tarballs or stable
+# binaries to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
+	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+	# Binary versions taken from fedora:
+	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
+	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
+	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
+	SRC_URI="
+		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="https://www.seabios.org/"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary debug +seavgabios"
+
+REQUIRED_USE="debug? ( !binary )
+	!amd64? ( !x86? ( binary ) )"
+
+# The amd64/x86 check is needed to workaround #570892.
+SOURCE_DEPEND="
+	>=sys-power/iasl-20060912
+	${PYTHON_DEPS}"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
+RDEPEND=""
+
+pkg_pretend() {
+	if ! use binary; then
+		ewarn "You have decided to compile your own SeaBIOS. This is not"
+		ewarn "supported by upstream unless you use their recommended"
+		ewarn "toolchain (which you are not)."
+		elog
+		ewarn "If you are intending to use this build with QEMU, realize"
+		ewarn "you will not receive any support if you have compiled your"
+		ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+		ewarn "in SeaBIOS."
+	fi
+}
+
+pkg_setup() {
+	use binary || python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	# This simplifies the logic between binary & source builds.
+	mkdir -p "${S}"
+}
+
+src_configure() {
+	use binary && return
+
+	tc-ld-disable-gold #438058
+
+	if use debug ; then
+		echo "CONFIG_DEBUG_LEVEL=8" >.config
+	fi
+	_emake config
+}
+
+_emake() {
+	LANG=C \
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
+	_emake oldnoconfig
+	_emake out/bios.bin
+	mv out/bios.bin ../bios-256k.bin || die
+
+	if use seavgabios ; then
+		local config t targets=(
+			cirrus
+			isavga
+			qxl
+			stdvga
+			virtio
+			vmware
+		)
+		for t in "${targets[@]}" ; do
+			emake clean distclean
+			cp "${FILESDIR}/seavgabios/config.vga-${t}" .config || die
+			_emake oldnoconfig
+			_emake out/vgabios.bin
+			cp out/vgabios.bin ../vgabios-${t}.bin || die
+		done
+	fi
+}
+
+src_install() {
+
+	insinto /usr/share/seabios
+	use binary && doins ../bios.bin
+	doins ../bios-256k.bin
+
+	if use seavgabios ; then
+		insinto /usr/share/seavgabios
+		doins ../vgabios*.bin
+	fi
+}
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index e1ce3f337903..482fcf8315dd 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -2,5 +2,6 @@ AUX sgabios-0.1_pre8-build-cc.patch 467 BLAKE2B 5d1963f2f9c74fa1503b81ebfce8ae9c
 AUX sgabios-0.1_pre8-makefile.patch 395 BLAKE2B 0d6a9eff239e3881bb6dc674e62b98eb48b7b9c422dd77ee6c0e0f807f213fbc38a4e7a730d329123d947540c9f4bcb60019c85c3b1b1041be353028d77c4ab4 SHA512 7c111af2fff59b0ca6d4b39d04715d404bffa0f71a337b43f7dd091af6e40e85b790ed8b560039d5702d07e1ae47f2c204e891373f11d2ee4aa1541cb471c566
 DIST sgabios-0.1_pre8-bins.tar.xz 2704 BLAKE2B 8efcf613a4857467cc3cfbc3f6402bca091892f0b2137ff65caf2b444610c86c1db0e61505bfe48ed8d6ccc9e8928190c2a38693aeddd523e27d22a29e777044 SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d
 DIST sgabios-0.1_pre8.tar.xz 27200 BLAKE2B 8ea535f2fcc8f7105a278202648e06722e7463e66ff3ccf824cd3a672a7908e7223f27678ebd4ca73eb19abaff75e082ea7b9bc222332436f31a8840443d7b44 SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e
+EBUILD sgabios-0.1_pre8-r1.ebuild 1242 BLAKE2B cf372dc80df6f3b0d40c4b8be196a821bd62b1fa961381e8df3d8bfadd80fa43bf6913e53a73fac2b8ae80c0d1c98054b0518878e0808e9d6813e6c9bb354191 SHA512 47c53c3f47d65f0a4694d99b63242cb964b6e5b67fa59f1bd89f47f7ff8ff20e8740284326dc61bab804afc6ddb13756c81bd986f89b4afee601bf0e2a6e53cc
 EBUILD sgabios-0.1_pre8.ebuild 1153 BLAKE2B 157cd06ccd73ea45bee40d23cb5657efcf399f824fb4d6344869f08c575585978445d8c5d7d1c38164bc81604fc6aedeb4fa653a434754e43ca0db3ca2cad01f SHA512 ffbd86b27008e068716712cc605990d1c230d3a347a589cc9595763d798dc991ac1984376dd0813711d2833b99cd0689fa7bb11547248372f5645214d6d8ddcf
-MISC metadata.xml 360 BLAKE2B 21641a1ffe242fb4f18324889e3857c9491bf2f0baa96da28560e46fed1b6a0f1f370e6d41f4ffde5033f097b508eb06ca419e5b49411ec37494ab105fa156e6 SHA512 e11d9866b6743687df4e32cd3079b6c086b77fe8544a342a16152ad9a2f6ce42b79aadd47aa9a3270b17a09f4137fa6eb1fa3990518231b7f546b3557f9ed067
+MISC metadata.xml 426 BLAKE2B d613c3ca4369df0fff4e5a8650588335adc20000377051088cf79fa4e20385702c96b3bb6a5b110621bc3bba62e5f587ec183c967cb5e7c8f36fc1e9344a0750 SHA512 6167bd881760557be4d884e62002befdb4ed96c25de9a22cc285a81df8bf158dc5b74411370bf02c250cc63aa55eecfff0efa1e7bfe205fe9bcbeda88ee299f8
diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
index 0d341c6a91bb..a1bc76dbe5ef 100644
--- a/sys-firmware/sgabios/metadata.xml
+++ b/sys-firmware/sgabios/metadata.xml
@@ -9,4 +9,7 @@
 		<email>qemu@gentoo.org</email>
 		<name>Gentoo QEMU Project</name>
 	</maintainer>
-	</pkgmetadata>
+	<use>
+		<flag name="binary">Use pre-built binaries</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
new file mode 100644
index 000000000000..bbf4403ff4a8
--- /dev/null
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="serial graphics adapter bios option rom for x86"
+HOMEPAGE="https://code.google.com/p/sgabios/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	!binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz )
+	binary? ( https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+binary"
+
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-build-cc.patch #552280
+)
+
+src_prepare() {
+	if  use binary; then
+		eapply_user
+		return
+	fi
+	default
+}
+
+src_compile() {
+	use binary && return
+
+	tc-ld-disable-gold
+	tc-export_build_env BUILD_CC
+	emake \
+		BUILD_CC="${BUILD_CC}" \
+		BUILD_CFLAGS="${BUILD_CFLAGS}" \
+		BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
+		BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJCOPY="$(tc-getOBJCOPY)"
+}
+
+src_install() {
+	insinto /usr/share/sgabios
+
+	if use binary ; then
+		doins bins/sgabios.bin
+	else
+		doins sgabios.bin
+	fi
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5fd1feee585e..d7d9ecd57dcd 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index ad279072bcec..a67d2b45bfea 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -5,5 +5,5 @@ DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d
 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 650 BLAKE2B 75b1dc208db581de747f691b4e89c2eec775da1a9121d16194998dccd1c684c643a241a2db05528f54f1c5db34404ebe5dbc8f934eb0d70783dc3eb5f77758d2 SHA512 cc1e4ca7c6128c3638c6e98577a18f7e667bf62c521a8f7bde3a16f0edbb4b316c6ea925347dfd7dcd659df5ce04121ce05d3a790366a815d0abee5f7ee0dd33
+EBUILD exfat-utils-1.2.8.ebuild 649 BLAKE2B d1e85531d5c76bf8cac89ecd0bed9ad656880f5821f9819d9777317408ac4defda124e6a3e3755450e420d914d5ede6edc0b0312a1cfb75249c4c4ef8a46e569 SHA512 61442860cc5a317a9818d52dbdb9c12cd8b8157b176a4860a9bc5bdac478c26da1deacec77d92a2fc858cbe0715c53e2974a95a3f47cdd08b9aaf584452d3fa5
 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
index 8477a98fcf9c..3eefa5a511c8 100644
--- a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
+++ b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 
 DOCS=( ChangeLog )
 
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 73d83dd86b02..cb1645a9b61d 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -5,5 +5,5 @@ DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e
 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 672 BLAKE2B 6e03f4fb5f12e855a9fcacc8ba2d6c3cb746f1a6f3657bb4457769a99fbb7d8767dd3192de3e7ac14821808dd1cb15b8bb9a407e222c003242fbd66eb6cae964 SHA512 6482551b1cff01d7c60e3405c94535ba08b90fe065d75180d543a4c8fbd4a967f28413edd2f31e62600a6c7d001e1e16f40a7d95ace3c2e8c188b065da174836
+EBUILD fuse-exfat-1.2.8.ebuild 671 BLAKE2B 9e4875e949740aeaecbf4b38ce421f439db19d9da5eb277b6de3129ead497a1638825710851fbe5e7c646821837308e2fb37dbd4c09ab94120aecc320d2f858c SHA512 6c730ed920af0567044feb6ab2794028a1d3e12c71dfdc192d568a1ab95aea76f48acce2dbb7f4991e8a89ec719d51c6b8def628bbd97b24488c2681422e1396
 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
index 4f3b399983b7..11c81243deb6 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
@@ -10,7 +10,7 @@ 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"
+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}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 47835e62fb67..6812687bba89 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,3 +1,3 @@
 DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
-EBUILD ncdu-1.12.ebuild 430 BLAKE2B 6569643a4ba87621927198e81dceea0d9178bcb2bff134976b7c3b89e916f71bfe6b7b95d90328ac268c692aa43d2708397e6c930918446a600928912aebe5e2 SHA512 d5191be8c3966c275fd1754914203d74f8a3fbfab13d0d1b266ac80f0d6aacf548e5e23e2a3ff60ad72ecfa82905b0392413f7ca964228f8b6b3d121cf91c026
+EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
 MISC metadata.xml 696 BLAKE2B 0cc9c34adb28ccaef9b9d4ec199bca3d69af1cc3623e12d84a39f0aa814613e044538e454315b99cdb8351c964c7735d78da0df99ba45645a309ee8ead06f3e5 SHA512 0ddc1f26fbaf2cf9e618bf5b607e11d100f197e98b9e13185173e7a00c5e0312e6b9753797eba8191d2c67f4006e442b210b8962f1c75055d1bc41ca556fcee7
diff --git a/sys-fs/ncdu/ncdu-1.12.ebuild b/sys-fs/ncdu/ncdu-1.12.ebuild
index b4022e6a19de..43abe04d5aef 100644
--- a/sys-fs/ncdu/ncdu-1.12.ebuild
+++ b/sys-fs/ncdu/ncdu-1.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="http://dev.yorhel.nl/ncdu/"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
+HOMEPAGE="https://dev.yorhel.nl/ncdu/"
+SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index 46d05aeeb590..2b397b1ffe49 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,5 +1,5 @@
 DIST simple-mtpfs-0.1.tar.gz 116145 BLAKE2B 9a29b31ad754ed009653aa6b5516aca20827b85368fa537e0c6b8f8a9d56bac10cb26f12f0b599c54942466ddc293999428816646e7071ca8637dcade80011b9 SHA512 5c4b390c43ede521061c677b496d47376304a4625414853a2183a41cb4a2c67361ecd7e26d0b6197cc78e84d0a9c99ec92e85bd1c179784b5a7c06ae05ede308
 DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
 EBUILD simple-mtpfs-0.1.ebuild 491 BLAKE2B ce878b1cd6028871b42cb691d44ec17e94de443c4f79b6de02f6ca2ea0bf0a15dfa6fa8784741c4aed1303ad48d31832a50e2da064545d39c69f390f8b79fbfb SHA512 2884514b1f118abbe2dcf6aa53f849452a378504d734e3b326e5d1d6460d5f333082a31abd97a6f9d16023947478189b8915faaacaf6c35c8e67bda3d60ba032
-EBUILD simple-mtpfs-0.3.0.ebuild 567 BLAKE2B a16f0efef46d3b6325713a1f8010103ecbf796688e21467cb929bed8f43cf9a67b9ad15013adea2c07a4d41234dc13c3429e65569b06e0600b5ea8f6859227f1 SHA512 774971217b5fce6ed29415ae750e11eb5ce10b1bc12ad9b55642a707e215198f75c8319e649f0d8e84ecbe41c7b6755b8552589425475fa245cd8fdbfa082d40
+EBUILD simple-mtpfs-0.3.0.ebuild 565 BLAKE2B 0240a0e68c96934b1db597609eb3589c886f93e26eba9b23f7a4b17d43f2d9485ff0e7aa67011897990568e1503a88227e57435dca1a1c20910903b8d1562abb SHA512 c1fa45fa3c6dc0db336c11710e8f454084b6afd6e203c6bca11fd680346c5b229aecf163a93a9dc6d8e964a05303a41bd48e3b86fa49f94488e522491f89474f
 MISC metadata.xml 773 BLAKE2B 1b3bfd72c09a0ac9b421ff81fb424fc6936f58d5b02e271d62327881bd5120d7ab32d13b064fd59e4c1986b78e60ff8b4d02750887f87ed1492512dd3b9c418c SHA512 7173333c51707c87eb22a79ea5cf0d0b06313555472f12a3b591148e14e12ddb45c97bcb8bfee6ceac708ff0fabf7787a1892419ba4f1cc27a5cee75f990b67c
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
index 91269a3c30f3..5e46a628ca75 100644
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.3.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
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/libmtp
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index fdfccc516366..bb8241f888e8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -8,6 +8,7 @@ DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2
 DIST systemd-234.tar.gz 4800186 BLAKE2B 398ed8869da98909d1374ef5e549ca3e26b02ece577d94dec53e98431de0c6441e50762a3bc2c93fa1c14c236a8f0dca8e3f4102fd276ec977dfb3e77a789165 SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
+DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68
 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d
@@ -15,5 +16,6 @@ EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e10
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
 EBUILD udev-236-r1.ebuild 10187 BLAKE2B 67015754fdbaf239bf4fc04c71bd9c6186eab00d9dbd6549646fa8947f9b82dc8a26b2b7e4c27b54bfa025997f6dbeb0d76aa33e5cfcc82c5153aa434ee80bd1 SHA512 2ca66a3d3afdefe55b0948cd046f0cc337fe33b6eaa99be244c60e462f9af3130ddddfce9e250ec63106a6ba10858df3d05b36674212c4d8c04a94909f039c25
-EBUILD udev-9999.ebuild 10191 BLAKE2B 245b79d5ea1af56980bdd62ff7a103a0107d8236bb9b295ef02f837ec469404bf2a4df500614e52a5ca6e6820f53266f08c59ff5b4aeda76c29e5221f4971ded SHA512 ed2f79f3d1a517114f19f1b3068280329c18dd591df9748a415df446f615de63e58677f73ed6a42b8ee597c6cdfa68291d013e2887b09fa82a8ee2dc0982deaf
+EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
+EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-237.ebuild b/sys-fs/udev/udev-237.ebuild
new file mode 100644
index 000000000000..3b794e7c3ded
--- /dev/null
+++ b/sys-fs/udev/udev-237.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.40.0
+	dev-util/ninja
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+EGIT_CHECKOUT_DIR=${S}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	local PATCHES=(
+		"${FILESDIR}/236-uucp-group.patch"
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/collect
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	into /
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
+
+		rm rules/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 5992ed3480b6..3b794e7c3ded 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -78,14 +78,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if ! [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 27 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-	fi
-
 	cat <<-EOF > "${T}"/40-gentoo.rules
 	# Gentoo specific floppy and usb groups
 	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
@@ -97,11 +89,6 @@ src_prepare() {
 	)
 
 	default
-
-	if ! use elibc_glibc; then #443030
-		echo '#define secure_getenv(x) NULL' >> config.h.in
-		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
-	fi
 }
 
 meson_multilib_native_use() {
@@ -142,10 +129,10 @@ src_configure() {
 
 multilib_src_compile() {
 	# meson creates this link
-	local libudev=$(readlink src/libudev/libudev.so.1)
+	local libudev=$(readlink src/udev/libudev.so.1)
 
 	local targets=(
-		src/libudev/${libudev}
+		src/udev/${libudev}
 	)
 	if multilib_is_native_abi; then
 		targets+=(
@@ -169,10 +156,10 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
-	local libudev=$(readlink src/libudev/libudev.so.1)
+	local libudev=$(readlink src/udev/libudev.so.1)
 
 	into /
-	dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so}
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index c5d5ec62fb6c..2cbda8d3164f 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -7,9 +7,11 @@ DIST udisks-2.1.8.tar.bz2 931110 BLAKE2B f4aae539f3e4cd9548558eaeb417bf9c5ffd83d
 DIST udisks-2.6.5.tar.gz 1251008 BLAKE2B 0d94b35ba7bb4cf6f07951d46679da52f6510a5ddf8c070a9da67915637ab4fa13a898b561670fecda37fcf3db540faa85df3b611467d455b9cfe5d8b746a984 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
 DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e2b28e825c55e8da2263f1f7f09845403a2f3434a060ff2d7fefe7d0277c22eaa25650c71393016a620edc0d041 SHA512 3af72b87acb8e540b229e58e2176ac87de831ef402f4825b6e9ee163a8d34e921a38909f45e685cd2a9931d08aaa22285ba2f6a811cb8265237201f0b5e36310
+DIST udisks-2.7.6.tar.bz2 1315047 BLAKE2B 48ad99512068a1ea863f2c4474cd77953c9c69b9d03cae2905f8e07589a3822e666938f9eaa5b291c55589c10b676644627f678491edc06af60e55b6df15f024 SHA512 29df238c6648700e8a18659ecb099baf4cdd811540856a5298439a88cffeee40ae8deb2fc312375913333dbe92fbc55131389f958a8b80efd5b2fdb5b3f11ec7
 EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
 EBUILD udisks-2.1.8.ebuild 2920 BLAKE2B 66910a00b8b01456188ca325218b048c2634ee5385d894d24c01361e52733553f73bdda35aaa0556a10579aea947994f45b3f6d2fd01b8818e75f196472cddbc SHA512 0ba34f7f3d951911da1f2904638ca98d10ea3203cb7766610a5e7c03c8dcb01c22157f9099878cdc3ada0193ba82bc73c37777a8b9336474a1a65f77250e1832
 EBUILD udisks-2.6.5.ebuild 3271 BLAKE2B 3541f6e93c01380fd9617cffc9c829cad537fb085eccf222ad012aefc2c577bd83c197137b782aed6c358e9d089e476e325e964af1a3815df5de17c6c2db4ec0 SHA512 236af3f68f0767b409dd8a8033c80c74ed66f321761f77bbb199c3158de65dedbd52eedaa44dd2378734cdddb265b5337db63ffc2c8f7c23d9563ca947da383e
 EBUILD udisks-2.7.4-r1.ebuild 3373 BLAKE2B 4134e22bd884445c2e7604d5aafba21e4dc01513994e40d0dde75b51215088cc87fe00aa532c81b4d81554720889507b052ccb6f5a404ee21737b5eb65a95c17 SHA512 ef6eb51367bac3a0afac23ba5db08c8ebbb32a7a3ce1b49b8ee32d41207cb566667f2b7e51e1dcf779ed2fa7d6037d6429d57251167e909e46b0d1b64eb7514f
 EBUILD udisks-2.7.5-r1.ebuild 3426 BLAKE2B 2caff1f64e746a5b7c01347c51d537d2098387e56a01b3b0f6cd8ae6a6b6a2222cfcf75bd794492ff89848338a8ff7092e1125a52b75b00dc03343fb7e810098 SHA512 9327596f6f2bd95d69dc54b69fb8df2ce5a0ecc30fca8e7e742271188f1cf238ec32fd56d6aeea236aaa4064a6d869dea5e4bba0fd8aa62dc91dd38624ad186a
+EBUILD udisks-2.7.6.ebuild 3218 BLAKE2B 505e96f3a4e2269158b1772ff7bfd8d920a64ee650948bab797066fe32324968f0081706b661bbd6b9b0f12b6240b1cf183d4b8bef8df0dcbaeb45936ac74452 SHA512 f3f664934b0ebf88e0a5328dd5b2652e08e01fa789483c79eb919700ee61370306c8ed90dfa95fe92d9e0af5b65be4de173332e9037474e935c9cc8218026535
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.7.6.ebuild b/sys-fs/udisks/udisks-2.7.6.ebuild
new file mode 100644
index 000000000000..a536e7cb4985
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.7.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug elogind +introspection lvm nls selinux systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libatasmart-0.19
+	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
+	>=virtual/libgudev-165:=
+	virtual/udev
+	acl? ( virtual/acl )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.30
+	>=sys-block/parted-3
+	virtual/eject
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	>=sys-kernel/linux-headers-3.1
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# gnome-base/gnome-common:3
+# sys-devel/autoconf-archive
+
+QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX%/}"/var
+		--with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED%/}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/run #415987
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 8f7f4c772015..72792cb80444 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -7,5 +7,6 @@ EBUILD zfs-kmod-0.6.5.11.ebuild 4075 BLAKE2B a1b642691217beee71f20c29932e2de6b65
 EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4401 BLAKE2B a4648117230b7351ad427a7d93d704162eab8561b048730e28224594f2653e2a975da34e66a59de007c61187beb504cc8e263942602f141c7afee75cb670a43f SHA512 589e0c952efe6bc9d2fe0b1a85c0309eefa64a3c632f5030112b613d3c2d2c177a8fd7b501b0296ed74e040e3a574296c5acf86701925154377bf479b8d3aaad
 EBUILD zfs-kmod-0.7.5.ebuild 4075 BLAKE2B 0b96f439ca7245cac88595998a3781f54a1651e4352ec71e61ad9292a771cf642a056294492b12f9a2fd6a77a4ff1ea589713e2b83e03660691dda894f66f5df SHA512 376b3c08104d7722c240617c377cb9c87c6e0cacf401107b26fdd54c121d36d53fded91c2279a4471eb4629429133a550ba6beb990805ba9e109d765a33d8215
 EBUILD zfs-kmod-0.7.6.ebuild 4054 BLAKE2B d9696df2d2a3612b42d426afb40f588f47a53e7d821ea14cd71c3a0edcdb2663195bdfd8e2a5d18b05d230e78194bef2a459be912f8e5327bf589a35cd548e89 SHA512 ac7ea69f470ab7b8749abd815069f600aa045f45f634166f65edc76849e05a6ceff014d50df860991de7a7bae3386fd42fa3765f3e0e94939550260386df2b9c
+EBUILD zfs-kmod-0.7.9999.ebuild 4133 BLAKE2B e4863fb198b74a1ba2417caca7d1d817d23423b8d8c1da2d65d422bb9c25e59ed6aff0fc15f7037529e491dee71f06b05252cc7305a9ae4b7383969692977f80 SHA512 2ae7acae2a3f4f8836dcbbe2e30773f966204e568bf4754fd0d7225052508ab9b0f90c8eab0974b1436472642cacf652da6e1db2216771f58c962a0f9a6a06a7
 EBUILD zfs-kmod-9999.ebuild 4092 BLAKE2B 9aff1a1edb78f8c445ae022c153cf8c8afd524c97e47542f74b11f6248642a638f81c03a6403376b6d92c51512abd9238806c81eec33acc52dc682706fd5191e SHA512 f8d8674dd7ff3692735f242c3634671a617ae0e2de6530dc380ea58292f9a6c9d5829f4b0548e677471224b2fe9796ba11ee069d2bf66bb5f9611a3acbcd4b2e
 MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
new file mode 100644
index 000000000000..8a1354857fe4
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} == *"9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+	EGIT_BRANCH="zfs-0.7-release"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
+	S="${WORKDIR}/zfs-${PV}"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="debug? ( strip ) test"
+
+DEPEND="
+	=sys-kernel/spl-${PV}*
+	dev-lang/perl
+	virtual/awk
+"
+
+RDEPEND="${DEPEND}
+	!sys-fs/zfs-fuse
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		!CONFIG_REISER4_FS
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[[ ${PV} != *"9999" ]] && \
+		{ kernel_is le 4 15 || die "Linux 4.15 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+
+	# Set module revision number
+	[[ ${PV} != *"9999" ]] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(${myeconfargs}
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-spl="${EROOT}usr/src/${SPL_PATH}"
+		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+		$(use_enable debug)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm
+	then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of ZFSOnLinux includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c1c2ad9f73d4..94fa10c2331a 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,6 +1,6 @@
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
-AUX zfs.service.in 334 BLAKE2B 2fee44b71e9fd1b36171fafe9d47c8c1c738923e4127c35cbee6224bfbe122669165f1142d9eea46985ef0c02edf5652e8cb0abc6fbb8c3c5e3a41c33e626b3c SHA512 f1066c8b06d2501be9c080a78bfd28ac7566a05bac5ddff7915836d083f8e791bbb2fd5e70a7633a0407762f12fd240d2ef049ed5244c4c4727e42f2332117e2
+AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 BLAKE2B f8bd5d0cd2b6170b45cf40a78b484d9a73017b20a77c603f4bcec63b6c77347b07df74c9d53288b5b2b984135d651d3d3ef830395ff2625576b13d8ce433fbcb SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9
 DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01
@@ -10,5 +10,6 @@ EBUILD zfs-0.6.5.11-r1.ebuild 5663 BLAKE2B ddc84f8dd2b453f9a6aa9365cd3b051b481b2
 EBUILD zfs-0.6.5.4-r3.ebuild 6720 BLAKE2B 910b85a433450e962ddd0e15d97cd03315a22f6c49b6bc7f197804dc31e9da653f44ad0ded0a4b0ad5bb0b6b4d418a52c9f11222ac155ed857ac699784acc6db SHA512 77fd3be6ff8c85025c24e337f4ada686e5cd3f56ce30fe2b898db32c87bf71022910e8e8fa3ea256484e3a52adead57a682b16fb6745c8cd1f2e8ff16df5d20c
 EBUILD zfs-0.7.5-r1.ebuild 5682 BLAKE2B 09b0f304e1d0147aa4f1fd6cf1bd0ad9293cd036117aa8d9001c9b94d036ed53529dc77e1088861d9c8f0a86eb3e66e5c6e62a811b30f1fb698e8e808125fdec SHA512 aa5b8430e60c794ea9e7c44e13f218ad2e6d76515960134199a613968627daf58fef75bf54286dfa15137f0bb50ddae724b8d14da50724cca4a9eb3c4955e94e
 EBUILD zfs-0.7.6.ebuild 5682 BLAKE2B 09b0f304e1d0147aa4f1fd6cf1bd0ad9293cd036117aa8d9001c9b94d036ed53529dc77e1088861d9c8f0a86eb3e66e5c6e62a811b30f1fb698e8e808125fdec SHA512 aa5b8430e60c794ea9e7c44e13f218ad2e6d76515960134199a613968627daf58fef75bf54286dfa15137f0bb50ddae724b8d14da50724cca4a9eb3c4955e94e
+EBUILD zfs-0.7.9999.ebuild 5583 BLAKE2B cda58dae33798e0e2155557f16f7d080d285de28f36136333158f82edeed512027ab9e8200de02433900f240f9d9895a507a6af2ad7c36060d917a4650c93cf7 SHA512 76b727515339c0c9b5c287ae5587c30a14927377f9f8eeb2f106787b84097c65cdde640570346749b2176e9272e3e378acad6fc914be99c4a63bd5c988cc40c1
 EBUILD zfs-9999.ebuild 5824 BLAKE2B 14ae69a0209f47bff9f3103dc97c5d41101b22aae3484dc28e59127db687001a3fc3805115de033c907f3cb2aa8f0c84e96663cab5dcd4d6ddd467a94de63b26 SHA512 adb99700a151f0e887de2376394fe4a29a0e79a268dbeb6f99867a27796b60e96848753384de4a5fe4c3fcb5864e03a91d854f867f54ce99d8b348bed9df660a
 MISC metadata.xml 754 BLAKE2B 7fc8a5badf77174cc9d31bb1e83da53d910a18884897287bc3666066edcfc03ec6331c09cb7ff02767e14b17df03eddba74549feea61dd044c21a4133f4aa763 SHA512 647ffa3857be38b2aed7462d26bbb1d3ea50fc53068b6d973514fdbadf7164421dd2025165a592855b86a03754d968d36e503dcfafc99e3ed75ee7db3f62df3a
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in
index c390a480708e..ae2eff170a72 100644
--- a/sys-fs/zfs/files/zfs.service.in
+++ b/sys-fs/zfs/files/zfs.service.in
@@ -6,7 +6,7 @@ After=systemd-udev-settle.target local-fs.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStartPre=/sbin/modprobe zfs
+ExecStartPre=-/sbin/modprobe zfs
 ExecStartPre=/usr/bin/test -c /dev/zfs
 ExecStart=/usr/libexec/zfs-init.sh
 ExecStop=@sbindir@/zfs umount -a
diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.7.9999.ebuild
new file mode 100644
index 000000000000..da5f1597be5a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.7.9999.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+if [[ ${PV} == *"9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	EGIT_BRANCH="zfs-0.7-release"
+	inherit git-r3 linux-mod
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	net-libs/libtirpc
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!=sys-apps/grep-2.13*
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!sys-fs/zfs-fuse
+	!prefix? ( virtual/udev )
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		)
+"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [ ] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+
+}
+
+src_prepare() {
+	# Update paths
+	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+		-e "s|/sbin/parted|/usr/sbin/parted|" \
+		-i scripts/common.sh.in
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="/usr/$(get_libdir)/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-blkid
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+	autotools-utils_src_install
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
+
+	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	bashcomp_alias zfs zpool
+
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+	if ! use kernel-builtin && [[ ${PV} = *"9999" ]]
+	then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
+		einfo 'The zfs boot script has been split into the zfs-import,'
+		einfo 'zfs-mount and zfs-share scripts.'
+		einfo
+		einfo 'You had the zfs script in your boot runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the three'
+		einfo 'scripts that replace it have been configured to start.'
+		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+		einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
+	else
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+			einfo "You should add zfs-share to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
+		einfo 'The downstream OpenRC zed script has replaced by the upstream'
+		einfo 'OpenRC zfs-zed script.'
+		einfo
+		einfo 'You had the zed script in your default runlevel. For your'
+		einfo 'convenience, it has been automatically removed and the zfs-zed'
+		einfo 'script that replaced it has been configured to start.'
+
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
+	else
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+	fi
+
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} = *"9999" ]]
+	then
+		remove_moduledb
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1a69a6b61185..c66d54e54762 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 04b2c5bd1945..db67706f8e95 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -69,6 +69,9 @@ DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a9
 DIST genpatches-4.9-80.base.tar.xz 1472296 BLAKE2B 3d5a961e2b84d71df250078e223ebe7a7c3cd05093d22219813454664d3c7bd85fb332d26c0d212144a6d50607256ce4e739f35faf935b323d533de452e46ca5 SHA512 9e7b5418ffbe7515573381d054accb89fd5bef83748b21ac1cd5f2352dbbeb1f55c606eec45174ed093289098420d9c1f780b182be1650f4963499cce310e3e7
 DIST genpatches-4.9-80.experimental.tar.xz 106456 BLAKE2B 4399562800f6224722105166d24075fb53237b6eab5728b20ff368fa6080ee1d8f6845b5835adec64d5a3583bdf063e8970ff1c9f61b989de474ece88fa9d318 SHA512 03fca9e1bfbf504bc3b42cac4626701aefb36f1f8f0a10d5b7f428aa1244030f50ffc6e24101afc1a6c16d741eb56f44d33c6a2293910a13c97a97f7fb061650
 DIST genpatches-4.9-80.extras.tar.xz 17352 BLAKE2B 8e3043af0e0ccddb209bcce022cd5ddb4ca681b4c0dbdd6a3fb8767b6154ba716fadc137059a845f93a20dcfdb35b3520e6fe67a6fbf5d9018ff1d72368a2358 SHA512 5049f111e3a5ed50f150ab9e257df362f91758424f151ef4ca86c69d6382231b4b2d31262bb331dbe99e4f7c8fe8eede134f0e6dec7e13fbdedfe504f9f73488
+DIST genpatches-4.9-84.base.tar.xz 1548496 BLAKE2B 60668544f3cadcc6b51dc42107c66b4971b215a8ce4c5017b3c660a23b38a1db8b6dec4914346f57b7bd44dfda4571e1578ba8a1a503b91a6d76b739b593ec44 SHA512 0c341a567f178b1bf09151a50d0e90c96644cf157ea167decd22508ab2f6a0f1cc044e045913088ed4fe728fef0b14c32c88df65e32cce81b5f669a38e1bde10
+DIST genpatches-4.9-84.experimental.tar.xz 106424 BLAKE2B 3914158d90da1bc285cf3cee219358d69a128fd7a277b565f81e81e65cef5f4593cbbce5aeeebe11870687d825aedccae489e5f7905f754a746c5e9804b4193d SHA512 c0c3ba0b3894d45ceebfde64f67ff5c7455c83ff72bce1421521fdecf4282ca16e2a159c8ce1d3f930c405e093b519f0ace9a61c15b71818576006a88a6d0218
+DIST genpatches-4.9-84.extras.tar.xz 17356 BLAKE2B 91a7c0e374e9ff9b18a1f290e4d017c642d9150681aa55ca1938e47f0ad0fdb09f1ccb2833e26ab3f71a04417b2bb5342aa082a5fa1cebbb5d3d30d208492b94 SHA512 9e49213b1fe3fc9e07c744178be9b92de2db9eef7b3c41b1a32d6d5a111aa4111f59c448f02573a004f81de1b538c5a688424e6d0ec118f6fac94787c9d2ab2d
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-4.14-ck1.xz 84904 BLAKE2B 6f9510643382d44ab79cbf8c4e8210ae7d30c37c78a9eaacde1296532751b5c881b8cc649266c29d73c1f663e60ca92856f6bf589fc449ff5cb781dc8b5ad8f1 SHA512 5e81d6a8319d030572ad5b6379bc43f2f5f98b6e4f050b1285bd6004516d1bf2e8eee8d3425a09317e15309cf030da2534417265b474aaab80e72e22c04741a2
@@ -95,4 +98,5 @@ EBUILD ck-sources-4.9.75.ebuild 1891 BLAKE2B ae3ce70a8100018a8eccf764634af2b9e1c
 EBUILD ck-sources-4.9.76-r1.ebuild 1891 BLAKE2B ce8174e6bc6e4f150a18fb1711926e2bac42540992b436ce614db9a58257bbd862b3443949500a03da9fed96f7f6f1355f6b847af00c4c9745f91d86331220c1 SHA512 a031654303a9ee5d5bdd40de1138e7cb482301e2593b80ae2498564d5beea266821a13bb3fb059d3d16068fa0aadea8485c60eda4f5493299e160ec9461eb344
 EBUILD ck-sources-4.9.76.ebuild 1891 BLAKE2B 43c7521bf469daf6f9d39ba7f38894054dac69853e4c4c67a173e941b7596937077a8593cb0780370d3a40174c98b02872cdce533e5866efd27c563db65f3624 SHA512 4948f434acf1908442a7fb23635be2bc974bb2b8b32d0247dd2296a8f60fba5ff29f26ced0250b84d541f7374a2b4807dbc59a21f82cad4589120b32689ecd6b
 EBUILD ck-sources-4.9.77.ebuild 1891 BLAKE2B 75b8a711f33720aec316bb0611ecda0f46c20e55c893dbb30b0d931a2d9c4df777ce967aac31e819f1b99fcbc271d79400fc5a432290822712a905eb6579dab7 SHA512 56ba8081b7fd1458aacbade20c9f3daf12089f63f29ec92c499c6c4c0919b9fc419a10c4c91454dbe5563f5de67b6ff5badbffa328737091fe75648a63c53b40
+EBUILD ck-sources-4.9.81.ebuild 1891 BLAKE2B e949daa1ac68ebb1a65a7f44c547427ab7d8a96d1a9f24f31b8ff2040093be9e7ee2ff62350db6e2b8b5d3587cd860db7e8aa1c66ac583af3a82f1fcdee5f6e5 SHA512 0fb289725a930db8e9407ab172e05ff2f78915904813fb4799ee63ef1d23855c0c18ddb80dd80160de50fef1fb64f2366f7de617ea4dfc3831cfc369dbaa0997
 MISC metadata.xml 921 BLAKE2B a4b785a7d542fd5b1899749a5b83eba87ab3ab3e6dd30cee33f7f762e6b433ce4fb47a119b2162ec088b483f0469ff526093c9775b1e92291c5330c64cf2d10e SHA512 611c76b0b27282067a51869db434ca837f604ef75fe54bba2f18f12c41dbd4a62d5c9e2a53bf5db7ee824bbf4d663db6b5292316bde93aec771356e34751496e
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.81.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.81.ebuild
new file mode 100644
index 000000000000..71d0080fdac6
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.81.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="84"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b66ba9786cb4..b1b886f46c1b 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -31,6 +31,9 @@ DIST genpatches-4.14-22.extras.tar.xz 17492 BLAKE2B 1242891d2ebe519d6c9d43eb6a0b
 DIST genpatches-4.14-23.base.tar.xz 569280 BLAKE2B 343a2e0ada59c9ea2b03abd1c5e03be065943e246ed4dec780b4b725a41fddd10410755008b0553c6824e7c2b49bb07e6b1c8b1775a4ac708cc323344b8b51ab SHA512 abc37a0c7431660e3e93227e48c51ce626603bd8f6c88f155fdd3044633fb1b8691409249ffe34652edb40bb09893d730e97b61a8edd85820585e35949c7fc2b
 DIST genpatches-4.14-23.experimental.tar.xz 5180 BLAKE2B 8f3b90b23382994322c92a08b91fe76a099e9cf8bd61d60af0d93b75cf3c8fcceee9dd4497e61d050ff1ee96d608bd6e72a4fab5b27386be96d5542679f3f61d SHA512 7029655d87823eddcc8c1289a171fd210e38189845739f78c27b7631279899efbd8fec19acd72bc802f1a893bbb6eae837cddcb0b483c2236b7509c74897f93d
 DIST genpatches-4.14-23.extras.tar.xz 17476 BLAKE2B eea5f14935bf87231328b7210924eae6c1c7146cac5402d1b588ef0b3b460382a199809f8afd68abbadc7a89caec53fe8aa32d48cdd0e3abd74a9f848e292744 SHA512 3c9bebf01e6ab0fcfa8aed253350946b616cba2a1547b706e7a436fcdc2490d64bf2092238a832594551f7b08bbd725230a6f12e31deb2ae43e3d78025ecd233
+DIST genpatches-4.14-24.base.tar.xz 574580 BLAKE2B 5182b86475118117de536ab9f570f6dda91a505b64aba986be7d56b292e3f47cddf9fc26f645ac9bc3ac11cf2cd325162f6b96424672cd5659bb5f3846102538 SHA512 cbb921e7b8338380ff07b926c5c80ce1996136afb5d30f085e27c4ebd37780aba12dad6d043633089c47478e93539a1294fc1d109376d661d5966c00767b543a
+DIST genpatches-4.14-24.experimental.tar.xz 5180 BLAKE2B 0718b6ee809fa1b1af458d5a7417f9c2ae9f284d389212811d21a86d8da0fb0052776cdff91bc7c949297a0321b9981e36076def3bb9077a49cc213badc6a3e0 SHA512 92fb4e9235be0762ad7b4411d449381d8cd4dfccc4338649c6c8e74787bbbb63a1fa91913f53d054e916ed6fe74dbe0013b3c2114b80f0142f86c799a0aaa39a
+DIST genpatches-4.14-24.extras.tar.xz 17500 BLAKE2B bd1bc686e7e462dc96b5e0b076e7f8236bf524178f331204e5e40128dbe63ef57dd6f15213506b18607aef5510166f280834c6556d4737369f12d87416f96dd2 SHA512 dfcd85a2147787e616fd8ae86fc16f3d7c57665e8e63b4f0642a0f6151523f4a7f52ad14fc14f738f803a1fca9fcf0f6d934f2f865e94b73d80903cc6b5b0fa7
 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
@@ -40,6 +43,9 @@ DIST genpatches-4.15-2.extras.tar.xz 17488 BLAKE2B 7549c1059b8aa48dedf196fbf53be
 DIST genpatches-4.15-3.base.tar.xz 52576 BLAKE2B 41c56cbb010eccd45b7bc84242ad61fa92d72f1ded28ab5e5612757632c6781c37b8f20bb2f21748dd93a1b8f474149465af255a82076cc65d9167303916fbb6 SHA512 d50f3d9f7c65158dfd88e3d9d5df5cc78ca1b1552858ca2fb9e901dafd96e136bca91b240f81a4aa71541da1bb87ae83b5848ce15351c32784b395aa5b6d6a1e
 DIST genpatches-4.15-3.experimental.tar.xz 5180 BLAKE2B 8f3b90b23382994322c92a08b91fe76a099e9cf8bd61d60af0d93b75cf3c8fcceee9dd4497e61d050ff1ee96d608bd6e72a4fab5b27386be96d5542679f3f61d SHA512 7029655d87823eddcc8c1289a171fd210e38189845739f78c27b7631279899efbd8fec19acd72bc802f1a893bbb6eae837cddcb0b483c2236b7509c74897f93d
 DIST genpatches-4.15-3.extras.tar.xz 17476 BLAKE2B eea5f14935bf87231328b7210924eae6c1c7146cac5402d1b588ef0b3b460382a199809f8afd68abbadc7a89caec53fe8aa32d48cdd0e3abd74a9f848e292744 SHA512 3c9bebf01e6ab0fcfa8aed253350946b616cba2a1547b706e7a436fcdc2490d64bf2092238a832594551f7b08bbd725230a6f12e31deb2ae43e3d78025ecd233
+DIST genpatches-4.15-4.base.tar.xz 59396 BLAKE2B 2985da777f300b879ab2171663f81d4f6d7529f13a8217a53f242d4b2925c12669aac499fe24c7845de566a1267924c89a978e4c5e16bf48e6fdf3f183061dad SHA512 e83fb9a85f9544c75ab357fdb299fac76ebf841186f13d9710315360aa3a70a2e3064fb892fe1910affba15e9739a1a73e95a05a0d017a9bcc789abbd26218df
+DIST genpatches-4.15-4.experimental.tar.xz 5180 BLAKE2B 8f3b90b23382994322c92a08b91fe76a099e9cf8bd61d60af0d93b75cf3c8fcceee9dd4497e61d050ff1ee96d608bd6e72a4fab5b27386be96d5542679f3f61d SHA512 7029655d87823eddcc8c1289a171fd210e38189845739f78c27b7631279899efbd8fec19acd72bc802f1a893bbb6eae837cddcb0b483c2236b7509c74897f93d
+DIST genpatches-4.15-4.extras.tar.xz 17476 BLAKE2B eea5f14935bf87231328b7210924eae6c1c7146cac5402d1b588ef0b3b460382a199809f8afd68abbadc7a89caec53fe8aa32d48cdd0e3abd74a9f848e292744 SHA512 3c9bebf01e6ab0fcfa8aed253350946b616cba2a1547b706e7a436fcdc2490d64bf2092238a832594551f7b08bbd725230a6f12e31deb2ae43e3d78025ecd233
 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
@@ -130,6 +136,9 @@ DIST genpatches-4.9-82.extras.tar.xz 17356 BLAKE2B ed2439bfe88bce646e5b70ea03cb3
 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 genpatches-4.9-84.base.tar.xz 1548496 BLAKE2B 60668544f3cadcc6b51dc42107c66b4971b215a8ce4c5017b3c660a23b38a1db8b6dec4914346f57b7bd44dfda4571e1578ba8a1a503b91a6d76b739b593ec44 SHA512 0c341a567f178b1bf09151a50d0e90c96644cf157ea167decd22508ab2f6a0f1cc044e045913088ed4fe728fef0b14c32c88df65e32cce81b5f669a38e1bde10
+DIST genpatches-4.9-84.experimental.tar.xz 106424 BLAKE2B 3914158d90da1bc285cf3cee219358d69a128fd7a277b565f81e81e65cef5f4593cbbce5aeeebe11870687d825aedccae489e5f7905f754a746c5e9804b4193d SHA512 c0c3ba0b3894d45ceebfde64f67ff5c7455c83ff72bce1421521fdecf4282ca16e2a159c8ce1d3f930c405e093b519f0ace9a61c15b71818576006a88a6d0218
+DIST genpatches-4.9-84.extras.tar.xz 17356 BLAKE2B 91a7c0e374e9ff9b18a1f290e4d017c642d9150681aa55ca1938e47f0ad0fdb09f1ccb2833e26ab3f71a04417b2bb5342aa082a5fa1cebbb5d3d30d208492b94 SHA512 9e49213b1fe3fc9e07c744178be9b92de2db9eef7b3c41b1a32d6d5a111aa4111f59c448f02573a004f81de1b538c5a688424e6d0ec118f6fac94787c9d2ab2d
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
@@ -146,9 +155,11 @@ EBUILD gentoo-sources-4.14.15.ebuild 742 BLAKE2B d3121b065e2470df22b82884c4786e1
 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.18.ebuild 742 BLAKE2B 3120d84266e5b599e5d398f28221823336683faf9c35ebaed19d2386fba04d9324d03f160aa8fec405b660ef56ac918d18b0b3ebb09a68819c9d58b7d3420701 SHA512 cd3ae9825cb4e4f6d39dc76828fe7031a9a7ad8541771cd64670e0c58a39e2d02ac0b25e7f306c026ba82cabeb8e3a8a6528779f9c87fc7e3ac4801c84921f9c
+EBUILD gentoo-sources-4.14.19.ebuild 742 BLAKE2B 1056779426ae875ca9d47036d745e288f1d05e6c9b513241bd16d4fa8494d88682c8b62afacdbe632f42a3dea31471ae94a854a7f7faa962007d7240ecaf436e SHA512 820c9491c24e60bb533a155156c9e524136d06ca8182f6261d17c608436047cf983a282b0d66061ec8eafc874483ddc7a480c087f02a5e1afb672a4409375f54
 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.15.2.ebuild 741 BLAKE2B 2eb00d59aa519bd1ce81391f509a492a74fb5026947883f638c5f0eae7f7b78e86310997497db063f18398f3f7c7543c1913f6d5552c986443ec75724895d13f SHA512 a369ec39bdb9c4f320fc140f92109aac23067610d99250c298d033248be9b324f07f07dbbcbac52e9be01666bfc111c121346813b267ace82f6fa8690940124e
+EBUILD gentoo-sources-4.15.3.ebuild 741 BLAKE2B 64ad4fafa2243d25c4798c2020c8a16ce32c4212812023073b55a977021e150b52bb2fcd13133831233be438760178c71c03423643b3729e11814ad55aa71c95 SHA512 2a26da6cc8938e404fde1ae53aba5531521d87cdfb1ccda14cb64584df2595e9293d303ebcb09c384c2134b4a5e0e6176c0d5d77de6a55f463113e4b94a06d70
 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
@@ -179,4 +190,5 @@ EBUILD gentoo-sources-4.9.77.ebuild 742 BLAKE2B 704f24883b5dad9bb1ffed3c6ed0467c
 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
+EBUILD gentoo-sources-4.9.81.ebuild 742 BLAKE2B 5b545f957ac9991f8afedcc7be209a884774df2e4c466d79f8cb9f55660a6e3c55d7087fb02e9109e65f57d0f20e7c68feea060090459bae2cb6eab41d89dafa SHA512 9eda375a41c0af8d57b1ea8c74918ba2fe80f7c88d03c2dfe29bbf51812d9e7bac5bed526d5b46b1edb7af1accca64caa93b22ac5fd41d467f9c1404bfc15b0a
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.19.ebuild
new file mode 100644
index 000000000000..13819a8328f3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.19.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="24"
+
+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.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.15.3.ebuild
new file mode 100644
index 000000000000..3237baaa381d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.15.3.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="4"
+
+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.81.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.81.ebuild
new file mode 100644
index 000000000000..06e2f28ac16e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.81.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="84"
+
+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/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 477006ef014e..093d11677285 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,20 +1,4 @@
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST patch-4.15-rc1.patch 43506905 BLAKE2B b6126c5f86574042d1c1dc3f305eea3453b24a7049458d720d2a7826ad0070ff4f7db930e46969bd5696bbba74008e58217ff742ba1c2ef67c94a2795a64c31e SHA512 ede06f733521cc274456f62b01441ec6194425c0455d937db9324275978fc855372aefbf19d895e8bfbe11dcfe2145dff672c9c3b693315fb9c8e14b280fd43a
-DIST patch-4.15-rc2.patch 44097969 BLAKE2B b0ebb776063a83eda0dab583a4c53cb19366dcc50ac32dc12eb7de7a033a8b8671f66f587ad34a62864958d111e16e1efe336e8fef0b6b188bccaaecce8d9451 SHA512 a1833e28b7e513c71c6a14e3caf6c1709ebb2c4cb9804ec31a4d0afd2a6b3f339f5fd6523197459f6a96d0b9b4ba4885e188a88365b1d195a8e38ced3c2910cb
-DIST patch-4.15-rc3.patch 45281665 BLAKE2B ff9051f836b8efeaa0c356a58221f5464413807dbe5c5e2b879e6b57f0ee67da1ab1b245f10de95db4054d3b20c799d3b30b8f6573a118172b38939d4b09575a SHA512 871bd2804f50ab732c73c67e9d41daa3f1bc427c00d846be06068155e5f2fb0e3a6b0941d949e8488f6b987953dd8ee06f23f34d676d567cadabae894f9b1025
-DIST patch-4.15-rc4.patch 45578434 BLAKE2B cddb2beb403d3cbd0d0d98218dad90078fba989e386f5926af97cffdbcc5d5e1cb7c2d71aba428e4ed85e3c61811ee91d14d5864de6b1f88acad1eba9da28841 SHA512 378f693d76ee16043da844e9cd053bbfe086c31025ea8d295803845c9d71b1a310c816238703bae81ecbe76dbe45cc69bc007f0b3e7ff6d8eb9dbf621c401847
-DIST patch-4.15-rc5.patch 45928364 BLAKE2B 0e798993916680abae0ec40c4bc3128b4b79fd267a6c22448e2cf4bf574aed1b923681a406cf9f48ea1902df2a95f0962d8a300402cccb7dfc1fb9932c9fb6fa SHA512 90d19f5d373e9368d6346c047754a0cdc6e53072da63a533a49cadc8a7ed14e6eebfe109d8be6642f820398626a25d6e75577fcf59e9a9902c4e959fcc470604
-DIST patch-4.15-rc6.patch 46146258 BLAKE2B 7a71a6e995aaa104012bb8f2a6e728658a2961d511d5302e7c3de182ae104ea8eafbce2a7b3c7a342ae84cbdee26cf9306fe231b9b92268cc8ed3d7cf562f3f6 SHA512 b68965ef7b78ed9a0547d3a00432b0afaa8441a77412026c84d9b91b751f62d54cb263ec0ffc3547196038f0fe39bdcdfd1e7535776dc8f7a139528ea8ce3dcc
-DIST patch-4.15-rc7.patch 46244792 BLAKE2B 80731383db15ebc6aac897b97fe1602ab161f04ca1f3811b47e699d5d50c5e96281672261770c0e8a80f3c0111f6b210104bc67478ccc00cb658cd7d42fb396b SHA512 fae57a83355d3ee0d1b3f07c1af89036f97cb22ab2135a5b57299efb451f3ef91dd8e3822928fb3ad44271508a1ea355771b0e9416d41d25c3888a5074281ade
-DIST patch-4.15-rc8.patch 46486932 BLAKE2B 783cc4fa216d7591a7cf0713cb1aa285017f382c1f6f8c5ebb5a98a5627080854b0f081f7a4417d650c0591ef1878047ebc54cc8ce04763214e861abb74c343d SHA512 30fdd6ad1174f8e3e2b58b80c2796cda502a24153fbdd8852defac552800b4f7baf66c840ec5c3ef4095391b89e6a700e9e5f88e67a2663db4544ac986c2142c
-DIST patch-4.15-rc9.patch 46706278 BLAKE2B 67552561e9a9e4d8bd6e878f3779319414abdc587140d31388eace7d43f955982f1a49cc36948d5b67f3379d8e13e6a8237d2f3c714860d32f042f01a0c53f5f SHA512 2d54f54d2a7b8586f3d5e3f2fef7768a7c10440c5394c14d397fc6686c56d028c7a5a81bf0e4e5a89f41b7d7124c69d983f7d972accd1e7c18b3505a579e80a8
-EBUILD git-sources-4.15_rc1.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
-EBUILD git-sources-4.15_rc2.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
-EBUILD git-sources-4.15_rc3.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
-EBUILD git-sources-4.15_rc4.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
-EBUILD git-sources-4.15_rc5.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
-EBUILD git-sources-4.15_rc6.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
-EBUILD git-sources-4.15_rc7.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
-EBUILD git-sources-4.15_rc8.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
-EBUILD git-sources-4.15_rc9.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
+DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
+DIST patch-4.16-rc1.patch 165143143 BLAKE2B 9c373b51ffb514eca21c01dad33d2b236ca0b38e70cd2059afdc39a1a39cd70112ba975f3632da788f58e4bcc6951229f0a7121eedfa4b0d70d07b011a4e7c1c SHA512 fc2e21bd93e0364bf06f5b8fd7512704bffec214a8448e028f72e1037d35f521adf5ca421e38a77fb6481a52df4b3b4e56a77be210600abae6c4730edb759b09
+EBUILD git-sources-4.16_rc1.ebuild 1179 BLAKE2B ff9f1f6d3076137b621091d11964fd812e5f40ccb86cd4cc244113e4a2b30294a6b25dc1adf5870c9adbb8de559f596dae4589b722a77b96440c6b378ffc28fd SHA512 379402177143e0719bd645ee825aadd90d48b33edee91c86a11a76642e4744db6cc20da21d97d39ab8ce1142ddf28c7f10cecdba954686c47e82b38617a1b21b
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc1.ebuild
deleted file mode 100644
index 163014d38b8d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc1.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"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc2.ebuild
deleted file mode 100644
index 163014d38b8d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc2.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"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc3.ebuild
deleted file mode 100644
index 163014d38b8d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc3.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"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc4.ebuild
deleted file mode 100644
index 163014d38b8d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc4.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"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc5.ebuild
deleted file mode 100644
index 163014d38b8d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc5.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"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc6.ebuild
deleted file mode 100644
index b525f064fb5d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc7.ebuild
deleted file mode 100644
index b525f064fb5d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild
deleted file mode 100644
index b525f064fb5d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild
deleted file mode 100644
index b525f064fb5d..000000000000
--- a/sys-kernel/git-sources/git-sources-4.15_rc9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.14"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.5"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-4.16_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.16_rc1.ebuild
new file mode 100644
index 000000000000..de404a4af084
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.16_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.15"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/kccmp/Manifest b/sys-kernel/kccmp/Manifest
deleted file mode 100644
index f93a02034dc9..000000000000
--- a/sys-kernel/kccmp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kccmp-0.3.tar.gz 14033 BLAKE2B 4da36826e640e3045ec8f92d7d962027ea5c14ae5055a475ed61a8fb4c59db332c0c77a33c7017cc4f777b726db3bb5e0f7da706b41649f8936bc9405590f6a6 SHA512 0274f36bf0e9d702b3e8efc0168987fd4c54ffc316a967ff326ad4c969996143a93bbaccee6dea0afd254bdf875c05492c35b11fd7121e0b9127467286e8e013
-EBUILD kccmp-0.3.ebuild 547 BLAKE2B 07c98c0a1314c17cba778531b7ecb7ef4a82eee6aed6698bb97f9993fee96876413f537b2a300f109382e092585525f18ff125f28dcfb4ec7fab2a8362311b74 SHA512 0d8510d9879509508fbded0dda5b76599d29f02c6d5b08372e06387d733481f95920d9748756df6e81b30dc5c88ed19c1bcec1b5e678695c8028b9c5ffbc837b
-MISC metadata.xml 330 BLAKE2B d3e78e137055f0b464c6d64ef2456d43fea3f667023ecaf9c9327b6385652a750b7b5789e83b743a0542c6949e105a7b01070ea27da8650c83550a13b08f916e SHA512 3b21165d70b04795bc9ef97526e2c19becea847eeb41eb09ff2e57345826b0b29a733de44fa292ace67a5cfced988c9a12a5e7f6adb7444df2a9d1646be3b8e6
diff --git a/sys-kernel/kccmp/kccmp-0.3.ebuild b/sys-kernel/kccmp/kccmp-0.3.ebuild
deleted file mode 100644
index b3e2bb07f256..000000000000
--- a/sys-kernel/kccmp/kccmp-0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit qt4-r2
-
-DESCRIPTION="A simple tool for comparing two linux kernel .config files"
-HOMEPAGE="http://stoopidsimple.com/kccmp/"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-	echo "DEFINES += KCCMP_QT_4" >> ${PN}.pro
-}
-
-src_install() {
-	dobin kccmp
-	dodoc README
-}
diff --git a/sys-kernel/kccmp/metadata.xml b/sys-kernel/kccmp/metadata.xml
deleted file mode 100644
index 924e63bd15bd..000000000000
--- a/sys-kernel/kccmp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>mpagano@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>kernel@gentoo.org</email>
-  <name>Gentoo Kernel Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index ecffa9d57bbe..f9f6b0246b26 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -24,6 +24,8 @@ DIST patch-4.1.46.xz 1236640 BLAKE2B 0c4305e3a3d2da4dfb8f23e0837d27d7916830170a0
 DIST patch-4.14.15-rt12.patch.xz 226068 BLAKE2B 07c48a69597f40cdf115696db46ee34c94178cdf7e594ba680697944bc44a7bf61308ae0f4caed3e008177975cb86942247a939196973dda372be33e5ff2dd15 SHA512 527a327248c39f8a49f2fd14db0931cd15a7752e4153ea0a9d88f72a41c8c91692aeca44ce1ef9894fd6a65b9e781a1309b61de7a2b2bdae62c8aeb0d94a671e
 DIST patch-4.14.15-rt13.patch.xz 226080 BLAKE2B 0f45ecae01c95ab621d58844a8d57686f28996c9d0202502b990b4c792b49ae979970d1096ecae6509123d871b475afe56e66a6e2f73980f286bbb88f3d8b234 SHA512 63e8fbfdea9547e3c52f248bdcbb5d6358a668f7f05ca3881944ab3c11dd5eac16b4dc607246b18f41cbd781e1cabfe58ba319fde5decb6831783217fdde5626
 DIST patch-4.14.15.xz 457912 BLAKE2B 19501a2cbc51eff59efe989af545ffb24829e0a1972c29b8e2d55f77957f76cdd538ed3af58c3ad8fee80f851afc1d5273a238e37c4938f9374e358c16a7f242 SHA512 faf165072fcff9f6f8cec76f0c35cf422afc453dfa2fc9ab5bc918eb177ebefd1e305f2c994a90c9dff073151762d79359789d118307ba15f53a020426c291a8
+DIST patch-4.14.18-rt15.patch.xz 226196 BLAKE2B 6624270d140cde5534bfb05bc21a1c2e4c89a10cc0d56d6aac57bfcfaa4b53c9ad53302740a024c8e55cb68c0dc477b93ada050364866b4f4aff84a325aa007d SHA512 656c16f09611ff33cae7bd5cdddf33179bd707f6892c3349d7ee9b90976a347f0d90bb766c85d457e7766ed3a45b0636533fd67552c1502ce98ffb3af76f4256
+DIST patch-4.14.18.xz 540160 BLAKE2B 0514edaa8cdc0abdc84ee629ccc4c6a8f27ff5a5486008555a2628b29d38b0583bdad4a44dcc9fb23618606b76b6c7e52a4d1bb3422e34112d5d2f3ce4402376 SHA512 3582494199ecb65e5c7a908a87e69c97005640f857c54487ff4a0cbd749c505d8d114fb9d4a01e081ab6e7982fc39b8c7077e6b4cc7e52bcdb904cffea637e62
 DIST patch-4.14.6-rt7.patch.xz 227192 BLAKE2B 1253224989c3787ff364c182e5924e84d0fa909cf8b1d8abb5d747c97b472125952e19f75ee90617786d6a4250e7b3dbd86019a4e7e661903d169b04e768d1ed SHA512 3073ad820c5fce77c982ebcc4835b875ac3d5421dee9a476c396d1efe33a87f034bf6d5aa08f7f6c63f45424bd8c74273a908c30ff77a788bec1259ff110a521
 DIST patch-4.14.6.xz 163536 BLAKE2B bfd141411a2077a64fba3f5e256b1ff9b60f099bac16a91782c5f32f7366139a5797d943df147f8218291a6c582fcff4a496efe07447c8a445c2f9e0fa6219fc SHA512 c37b437f740fbb480766149ca1c6ddb5ee763b88b034b9b4eaf3ce000f299545ee19a93638d1a4161ab0c76ec73e1a53b2264b94213d53d6ad7dcda6bee45b8c
 DIST patch-4.4.105-rt120.patch.xz 194500 BLAKE2B a2714c0f0ddf6f533d4cbc7d325fbb911cf1dd0c3a58afef9b979ffc8ae1f7aec2f652e8cb20d8456bc88c91ff35932751e0e7fa56e2b732e48d3564c9279170 SHA512 10cbf7b109a6376df6fc2e672decf10fcf52f5c2f855984dc4cecb245e71c3b8b19efe7c134a5f27d84ff6c848b42a93fc5a7b9289634a62b33b699d8a40c225
@@ -32,6 +34,8 @@ DIST patch-4.4.110-rt125.patch.xz 194480 BLAKE2B f10044957518a03ec8234698939d3f5
 DIST patch-4.4.110.xz 1553352 BLAKE2B eb4e37d1deee89586db12a56dab415a985a678291b74fd4c0c5ded3214e47ca7f9019e572db79ed2d534f737dac01ecf065460c998de5e902b49fbe2d8631be9 SHA512 c247b8258d203448f5f8e0595475a4ac73c9550dadf2cd910c3179aaffb43cf11580647146e6e27d9fbcb33d869be91d4c206f3f1090492123973e3f239324fd
 DIST patch-4.4.113-rt128.patch.xz 194624 BLAKE2B d4dfc5e06c61b81d3700f5fbebf697ee654f88361c5c5400e2de718e6be67322f66f7bc218fefe0924aba11f6c20725bf9be434aea7b449cc9414430eaa56b52 SHA512 d255b1ed13fdcc79c01d9a885cf15c08ed513593db4115434db9052c8b8002eb6d847acedce4d2feaba3014eadaebdf1d2bff6e353ab1731125f78d45fd8f660
 DIST patch-4.4.113.xz 1595348 BLAKE2B 6094c18a9040dfe370b2d8c35b0b171242fabad5ce89afa6b4121eb8431f11dcd29b728fd8a27a3987ae30063155aa747c14b3dceb39aafbd063e4ad7aa07086 SHA512 644c4e9a633cf9c71b8950972260eba6144e4ef4053b339b69f7787ae7c3b71e9d0a82697870ae6138094865c9333ee922e31f59e6229ecf307fdb7f8eb111f1
+DIST patch-4.4.115-rt130.patch.xz 194620 BLAKE2B 75dfb4b21cd57b3f15cd094c2dcd4d31e952488b9d2ca7de29e2b6fd016c30393864b96461ffbea9ed25938ccdccf2719675c3f133c984eed7523d08fae8cb9e SHA512 86e438be47ef85745e8125bccede9d1d553adab03551fc55d7b0e8a3f47b247db67793bf80a51809740e705b3aa4d554b634f265dbeb5bdb6c6c6a4eea49cfb0
+DIST patch-4.4.115.xz 1624128 BLAKE2B 329ddfb7572b4fc34fcd46670f54cbcadc43ed83aec3c5a86874309ad73807cd3f9ea89f276347a496b47b8a31ccd02b98fac39d580f30015044dbda20a4f53b SHA512 1cc57e9078559a0def347eae38a02a63f09876c2c4c7453c2bfcc9ec509d54d92242e13e0933319bceea287f5031326acd966ba97b239fe90faa90f0ef6ce886
 DIST patch-4.9.68-rt60.patch.xz 173760 BLAKE2B fd2837714f44f1d66d25c4abb247adc18cb36542be66b1e7eb060e084c5eaa23ebd6e6da3f7cc5ce7d7fe0214a9cbb3a3b657767026eb652bc7e8fb18a41b81c SHA512 d95fbddc27af73512cbf7751abc9158ecf075a242ab42b30c59148e3c3ecb2f969fbc9447be62db5e50b82981fdd9b5dafc44e635be2103f8f9271b992436c41
 DIST patch-4.9.68.xz 1216096 BLAKE2B a37893a9526c31ac3a5b0eac06e17cd1d2a6ad23dcfd7ef5c1c0955a9cdd3c5912486a35b111d9eacc24aa4b4ecccdd43ec3e7e6f77c76b4fd697c092a2676e0 SHA512 2eb4479a89dd59a3b441c65f235777e69e06e24c91e8269ab77e4b628283cbc954376d685ce9a9b7fa408132e183a2581a3867e32d8c38666ec66b6d6b8bcd79
 DIST patch-4.9.76-rt61.patch.xz 173748 BLAKE2B 6f6adb72b4e906a4c2f3e3898c3b588bbaf9675a79978716695a88d6eae3ac3e66929c2b46a566e912972d5587f85f23d177bbba4c1ba89f2692fbe026feb2af SHA512 cc28f677ef1a92f4a4547f3858c324f3f57fad263101f3c3f45f52fe865212cf48fc8a1386266536f19645771e67a130ff417cd5ef8d8599c93648ca0840bd1f
@@ -42,10 +46,12 @@ EBUILD rt-sources-3.18.91_p98.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479
 EBUILD rt-sources-4.1.46_p52.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.14.15_p12.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.14.15_p13.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
+EBUILD rt-sources-4.14.18_p15.ebuild 1445 BLAKE2B 32d78dc667c02cb733badf0b909f7a439d3bbd265091e1f3a04ea371ed1f42f6893e5eb99f44a7efac3fbb571a41ee69eec84e4396cd8d52e7c41ce16c48a406 SHA512 6a19444c2b39f767a892da8d5ab489a9431b1771d8fd603d39cdcb9bcbc899fbfa62a2641ec2caf301f2cc259049041dc0612d2676056501307100ad28b3ad5e
 EBUILD rt-sources-4.14.6_p7.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.4.105_p120.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.4.110_p125.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.4.113_p128.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
+EBUILD rt-sources-4.4.115_p130.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 EBUILD rt-sources-4.9.68_p60.ebuild 1445 BLAKE2B 004134fe10c96636bd977951171e289cfa40472f48eadf90e777c5cd38e5f052815af790afc79cc09b859da4e1595913443cd64fb1275563ded1371f2ca67f6b SHA512 29f06648a0e813d797a02e7e86507649327d417bd42a7c87e5e7d13ffba4c9983c8da6e83707cd50a60504b42e53be130c9bde6571bd0a26c0c261f6901d3314
 EBUILD rt-sources-4.9.76_p61.ebuild 1512 BLAKE2B 24f5d5076b7ffabc8463ef1d473479cc03d505101e49d36d12ec3a36ac2bea420f4a1c78dba026a51d787c29d91087c376476fd686e3bbd5d22c20e4bcbaec2d SHA512 00a959da4f5ead205a27a3ac37082f3f531c7316b7125095390380cb258d1aca448f034a3a188f112f5122f3c3a87f2b180961faf854aa220a2de161631c486c
 MISC metadata.xml 656 BLAKE2B 3bd604678b07a267b32917a36104fae8ac19abfed08ad8400368dd1d165f628712ba924653b6a03062f065a1d93660c5bd95addd463633f799a525cdcc5134a6 SHA512 7645322de766780bef064c3b6313009bf7ce4e4e28c247ce7707d0950bb7bbb792091254a4af1fc9ab3d24923fd69ebea0f9d253115527ef6b48cffecbcdfb67
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.18_p15.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.18_p15.ebuild
new file mode 100644
index 000000000000..ad4f19f2289a
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.18_p15.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-4.4.115_p130.ebuild b/sys-kernel/rt-sources/rt-sources-4.4.115_p130.ebuild
new file mode 100644
index 000000000000..1ca2170247ac
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.4.115_p130.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="https://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+PATCHES=(
+	"${FILESDIR}"/rt-sources-posix-printf.patch # 627068
+)
+
+src_prepare() {
+	default
+
+	# 627796
+	sed \
+		"s/default PREEMPT_NONE/default PREEMPT_RT_FULL/g" \
+		-i "${S}/kernel/Kconfig.preempt"
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index 6c41aa6ce5af..71bf10e85d76 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -7,5 +7,6 @@ EBUILD spl-0.6.5.11.ebuild 2708 BLAKE2B 97b92f5e3ee8635caea44103446ccebf89457744
 EBUILD spl-0.6.5.4-r1.ebuild 2924 BLAKE2B 496213b2c56731291103b98595daf77ae5748f2514022eca2e8c39e172f485019c1fabbad80d5e4d3029d73a9cd62e4618cdb194ad3172a44bdad060da27f57b SHA512 4092f4be37805660a15982bdedc05d1650789e2711ba550cbbbe7171929ce58e7157221991210f8f5f496bbe897af6d8aef5435058a31984a692c2324d8ed494
 EBUILD spl-0.7.5.ebuild 2708 BLAKE2B 24502e8b7bc0d3b4f180cfa0163121dc0fcb4b4524cf062a3e75e95e501b1d1d1c4d7e9c416eff2dd5a114eae77bc99358de74bf77760ef7d7c1b63de8066565 SHA512 4d9199c47278c8b432017432ea7f916fb6ae155b96972e7b53f7b633ef0617cca3a09235e635674711a9e733575d8e3aa4ad9de53bf910d55036865666bb3509
 EBUILD spl-0.7.6.ebuild 2687 BLAKE2B a2671237360f4169cb3de8d419604b45e486fb6f54fbd4cb645a6a32f8fe109a86d81504bfe69c93213b44677c0bf99fafa4641bbc948c7ee2998f56c8cbafc1 SHA512 7c50bcd5e4751f3f0cc2db4ba11029a47b84a696aab725d502dfaeb3da4a824cdfc0c4213af0058ae14bc27be54487e3aab6d5a0360808648b795d520c8dc54e
+EBUILD spl-0.7.9999.ebuild 2778 BLAKE2B 07296e3768b48b6c4047180f74e3374d402ec87638c448ac39023785db3ce819fe45d7c134fc79fad507f724b24d381b216f89ddbc9d44528a07fe6392e06a71 SHA512 29cd683cd14f8a61b8a9772d05e5d56702529e1f57602a37922680561cbe09e00d3167961d757133ce5e24b0145e930cbabb82c94070f629e2f8ebf0a6fa72a1
 EBUILD spl-9999.ebuild 2744 BLAKE2B bf65299df864ef7a983532e23c8f5764fd30701ad2c24face5c4cd1cf41fd24abe2dc7e57001d1b1a7d8353a21a85737f305d00910bac285723294faa4b8728e SHA512 ccfae24c381d939ce22dd3a745f8ee1933803cb49761f73eb58c54b0a8e915a40155efc088c95549461538af7cec4d2460bff904a4a5c14276d0c373cd1d8729
 MISC metadata.xml 436 BLAKE2B df6b2b25107b10b62618306f09e48f4337315792390c58392f73b270466f4927209dba0d8d1f1d8b8f65f345bce077a7b738f240f077a0eb26c23353673d412f SHA512 1b867378bde3ac034a7fbdc84e47b77b570ecf7a7688b0dc47950de7ea6601284c8101600928ddb7725f7a09ecc73eb01bdf646b0ecca250029e3063a4427ca8
diff --git a/sys-kernel/spl/spl-0.7.9999.ebuild b/sys-kernel/spl/spl-0.7.9999.ebuild
new file mode 100644
index 000000000000..a8d89680db28
--- /dev/null
+++ b/sys-kernel/spl/spl-0.7.9999.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+if [[ ${PV} == *"9999" ]] ; then
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+	EGIT_BRANCH="spl-0.7-release"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
+HOMEPAGE="http://zfsonlinux.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug"
+RESTRICT="debug? ( strip ) test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
+
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+DOCS=( AUTHORS DISCLAIMER README.markdown )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		!CONFIG_REISER4_FS
+		!GRKERNSEC_RANDSTRUCT
+		KALLSYMS
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	[ ${PV} != *"9999" ] && \
+		{ kernel_is le 4 15 || die "Linux 4.15 is the latest supported version."; }
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Workaround for hard coded path
+	sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \
+		die "Cannot patch check.sh"
+
+	# splat is unnecessary unless we are debugging
+	use debug || { sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" || die ; }
+
+	# Set module revision number
+	[ ${PV} != *"9999" ] && \
+		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	set_arch_to_kernel
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=all
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ]
+	then
+		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl"
+		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+	fi
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 751292da5538..43e6d2c4985a 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST linux-4.15.tar.xz 102181404 BLAKE2B 5fd831356c2174d2779ab31033caec6929b2f47857f0bb82ef43ad1140c639d0dc5553e64d062f67486eeff780d5df8d971051fd5a626b51bed170067fea11e0 SHA512 c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST patch-3.16.53.xz 1861772 BLAKE2B 4f575ae7d31911628052f56d1fef2ec8d8e9de9a8794752cec55d354234becc267d1af4fc4e0f58034096d09a9131270ce2089bf34a7cbb822989b97e65fa6d4 SHA512 2b703e84be6814f696a0929b9d5d352a01a75442a1992a7008c73cbdf5dc8049db7768f34984eff26fe207938948721ac1bdf7688024174d9173067dd7563bfd
-DIST patch-3.2.98.xz 1866168 BLAKE2B a36f145ce8ce5d70d106c9eda04ffe8be6c9caf234fbab6068b151e6128ca82dba5d776e08f25afead30b064230585de0209bf4067f19386ff6902230787a736 SHA512 7e1bfa08987ec1115ea20b9c27946326c8c1b6849ab025c0b72e741eafd462e173931a3bc8b483527c148e0f32859d34f96c1a895d08d8b117a63b08d281d319
+DIST patch-3.16.54.xz 1892168 BLAKE2B c9b9d3bc9100c60de8969acb0c6950854e7bfabff77339bc7454f3f97094d37fcd4cd86498431a7c2bc769f8ff5afa703af846b43639a38503e1439e47d5b74c SHA512 87556ae9b5cefa2745b7368da7f1e7f665a538c1228f2ddd56166d14a6eba20765dad6758d6f0debfd7052a00a7619ffdf1cfd9743f80880297d83735eb0487a
+DIST patch-3.2.99.xz 1884484 BLAKE2B b6b552c4baa07db0d9ce2a2f2cc28c76fb6fab14eaa9ada7f35bd455b3bf7f04cd43ab6bb4a693dbe5e26ceec5f055e5de4043e1ba13369e913f6853912792ff SHA512 11ecddef327d873a1d9dcc6bc4b2bade4f64efe7826d75ed01694429d5eccf5e73651185b5348a95a0f6c8eed5f13c02e88251d68f132cbff0a550f4943a8877
 DIST patch-4.1.49.xz 1337256 BLAKE2B 3252613e08b734e282f7b2034da65b873e925e9244cb011d995913a1dc9829bcb1f374e21bcf785b97f05474b1b5a104c61adbf430eb7f75d8dadd854627d9d4 SHA512 e10f3186b94bfa2ee7189bf4527d4129bb89f23829a480bee87fddfb1d31533ffc1a97ee860a159828c0853e6579d6a4537fa646e977f0f66daf7d304a99ef8c
-DIST patch-4.14.18.xz 540160 BLAKE2B 0514edaa8cdc0abdc84ee629ccc4c6a8f27ff5a5486008555a2628b29d38b0583bdad4a44dcc9fb23618606b76b6c7e52a4d1bb3422e34112d5d2f3ce4402376 SHA512 3582494199ecb65e5c7a908a87e69c97005640f857c54487ff4a0cbd749c505d8d114fb9d4a01e081ab6e7982fc39b8c7077e6b4cc7e52bcdb904cffea637e62
-DIST patch-4.15.2.xz 47304 BLAKE2B a4566ac0529b6b3d893f60e082cdd1409d8026a217993f2350a0877e13c73c74d892b5e638327356733633adece078dc4948d952c7f5e2508de1be65bafbdac7 SHA512 883d36831ab6a785dda071c91502ca4401b4d4602901bb19716a390cf48ef21830ebb309fe77ec1b741519fa799de7e342df5d7689224a2989f2816bbeaded24
+DIST patch-4.14.19.xz 544620 BLAKE2B 3186183b838c4d29893d7d3a7798c518920fee77ff9443b589ce305f8471dd4771c6531d5c2430552015a707ea91a3459949ca457f0c2d43f081bb3b89e7f9bb SHA512 e36c1571872965e419a46102ba17d0ed6a7dc004b6355e29d2154ce9653bceb949c92b7eed527bede7085c6acc3c0829ff2935cc038aa90ea17f44a50b6954b0
+DIST patch-4.15.3.xz 54072 BLAKE2B 8415ebada954c038b32e61e7a36fb45fe9f2cd9a5bb76aaed2f0ae464145c5fdfbcc4fd130dd21c35ec8e8246d9864fe999ce3fabf26f87b0e9e23029f30f4aa SHA512 e82ccc4829353458b77e6261b7793221ece82430727b5bd38f79fa637cb920648b50fc5abedf0a9690eca926d8adb4454dd41bd64442ccc7573a4c13ce007277
 DIST patch-4.4.115.xz 1624128 BLAKE2B 329ddfb7572b4fc34fcd46670f54cbcadc43ed83aec3c5a86874309ad73807cd3f9ea89f276347a496b47b8a31ccd02b98fac39d580f30015044dbda20a4f53b SHA512 1cc57e9078559a0def347eae38a02a63f09876c2c4c7453c2bfcc9ec509d54d92242e13e0933319bceea287f5031326acd966ba97b239fe90faa90f0ef6ce886
-DIST patch-4.9.80.xz 1413908 BLAKE2B 59d3c3f45bf28303c8b0beddf6134622b58dd3ae47d6782898de570b769780520690534c2b4758a31ddc6aae94ce6af5e90c60a5d2f84e13e5acda1f7404ef0c SHA512 fc6c3a4d9803c25c6f601590630f42bceb4330d646c91813c3c86dbfae97d40a9a61278ba5f5013c1ff4a22542fa4db1031f6358e26c1a6137cdd70b6d270433
-EBUILD vanilla-sources-3.16.53.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-3.2.98.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+DIST patch-4.9.81.xz 1442028 BLAKE2B d67162a9056cec8ab3fa1158695c16d8e34d5eed3ea641c1bf682c986392c34d99e47735bac60048762570407444a4b306cdc0e40947abaad5a5d01cc61bbfc1 SHA512 3a2b8e6d2db301ddf54125e5caec50a8ab5562a8dd4888370fcd557ecb5494e967e7f7bf85c22a6fd9cbe8d89cf3992ee95c3a6191674d88f1997fffa273baa8
+EBUILD vanilla-sources-3.16.54.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-3.2.99.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.1.49.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.14.18.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.15.2.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.14.19.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.15.3.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 EBUILD vanilla-sources-4.4.115.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
-EBUILD vanilla-sources-4.9.80.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
+EBUILD vanilla-sources-4.9.81.ebuild 426 BLAKE2B b25609c42424a49dc380bcf42e9bc0d45c147ef710d7895d1c79476c3e24909fb789fa02b7947664ce6c7c27de95066f472244e3ac421a8f6fbf5db9508e7349 SHA512 5d983013c6ab32e02c62b1f9d83f7d0246eb5f89910915f5807252b4817128fb9861be9b1b761f0e63a3c5d0f72e5259dcdcdab7150c666946bfd8a84f1df842
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.53.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.54.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.16.53.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.16.54.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.2.98.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.2.99.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.2.98.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.2.99.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.19.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.18.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.19.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.15.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.15.3.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.15.2.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.15.3.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.80.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.81.ebuild
index 9f9c2bf5ccf7..9f9c2bf5ccf7 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.80.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.81.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 92376ff11c82..b46fb6288cb9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 58033b5faa68..06904ef0fb45 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -47,7 +47,7 @@ EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e66
 EBUILD glibc-2.25-r10.ebuild 5005 BLAKE2B 304f809cd18f0fa0abd1f0ab1f3058d6cfa4115221fa117dd4c75404a1d8d68b05c0a0e19f8003ffd4db1654b82756ab89f799c54c6fc1f64f51d89d03316c13 SHA512 ac3e747592d2e9956feb772ce4ea8f4d689e01b136ca40e6f81388904d9e6e5121adb90ccc0b3ae379eef21741d8f348ef397159e68e4bb24c12af9adef0a944
 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f
 EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260
-EBUILD glibc-2.26-r6.ebuild 25257 BLAKE2B 90aab929f1dd12159434058b7cec3e3656fd26a93418f1a9a0ebc147a998548cd4298fbb963991eb9bf139a961fea3e99119ce0dac61f3cd2e4c21057b08f0e7 SHA512 e35d894ef7cc247e9a66055e169f26a5eb74da021a8ca92675a84538028e0027e60b1fdbac068cf995a5a0a5f3c206f78653a92ad3627e9b0350dde49383842c
+EBUILD glibc-2.26-r6.ebuild 25256 BLAKE2B 2ee690c964c690d9cb0b4e7da1ed883f26da6e99f5dc86df8b3f6334f36fed90755022a9d4ffb934461f7e0807655f54c85aeb235eedf89595aebf35d2462ac6 SHA512 34ae6b2d21f4816df026e8cee0bb2b925d0a407a28863d10c51e09250e4d6fc144c7920bc71b601aacf3e4c935fbf7c360de5fa510bc21d35fff57ebd057a1e1
 EBUILD glibc-2.27-r1.ebuild 40753 BLAKE2B 892e2f160e48da9c59f7477fa9efe9e4e2048840744cb89d641439df8597ef96c1e1ec4cdbd347bca1b7e15dac88b90507638afffe970873de95081b8fb2c94d SHA512 ecebd3254bad225146a761d57b2a6ebca9024414f7510914e064adeebee752933f42d7b5fedff94c14ea41eeccdbf7d571d2ccfb209e398a87654166836a5a15
 EBUILD glibc-9999.ebuild 40753 BLAKE2B 45f37561dd43566b4aaddb19ed5cec6e801ede0da5e0200aeac60d8f35a96df8e7b73bcc2c53aba236cee59aa14baa7c476418b555c1fc93e6208c5298232e5a SHA512 fe8b49b39ebcf270fb0484732b5ef41511a6a8ccae5ccc90c9181583206d0f459d4abce302b4633d48bc4b3ed85f9cd8a12e8cc11960aaacc9f9dc6d4fa86005
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r6.ebuild b/sys-libs/glibc/glibc-2.26-r6.ebuild
index a812ff3c43cb..e04e8dd36215 100644
--- a/sys-libs/glibc/glibc-2.26-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r6.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 86fed62c25a6..7c454d77a9f2 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,4 +1,6 @@
 DIST gwenhywfar-4.15.3.tar.gz 2249350 BLAKE2B 278ee013fbcf1e05f8006b3b1bcf325e47895987e374868c9c64d1312a43485b61589d17ab1790f64b11d06c9976960b66f587157ca87749fa259502fa19e405 SHA512 a14d625518d94c94491df149f9e746ed8d769f4e43b6df24f51f4269f29005f7431e33e85de0bde0a81a2e876fea8ddad5ed4191114295d6c9ea2e94aba08799
+DIST gwenhywfar-4.19.0.tar.gz 2362848 BLAKE2B cfdde7b26c9ab26d0ab8ce45ccb8da417bc118507e24d7c4315d0f0480deb92e60f331147cde2145b7b41e4764d18266ed221632b0110e3735a20ce6a6a674b2 SHA512 d05b230f7c00247301428046bf9ed643915d0939d804c78622892ae85c81dfe244832a8375820d489277251b407e424a5cf9b19224ad14f7fbfae83485e00da1
 EBUILD gwenhywfar-4.15.3-r1.ebuild 1629 BLAKE2B 01995aba6b8b85da368900213dccd1d5bf1c55d0e1a29d59997324be92d49eee44f4972ba57dd403e8ceb75c095d0e3c9ec9216551e9e3b1fa145acc11f2250d SHA512 bd0edd9354418dbeb9792f4371d0d862c2e7cfb5cddde2f682b342ccf08313681f0a4b7adccf7407a7d7e7c3e5faa45c334fa36bc546ea427fb454fb2f4aab5c
 EBUILD gwenhywfar-4.15.3.ebuild 1422 BLAKE2B 32a46d6e8a1f4a07b67522531f014f38915fc5f6b5ce3479113ddf60d409f42247d77320ee3aed6d97bf3a0870958dc589f7eae40489927f6fd5f13c5b6662e4 SHA512 230baa16807362d4a0c48f9d9392c63e82abd2f44d6528f4431b96a0ba86dd2b073f65daf907232bd7e01b24ec85b1c189f611ca8af9ca6a657fc5256bf8d8af
-MISC metadata.xml 311 BLAKE2B cc3625a7453912795e14f15efaa5c2ad26fb2a1045a8f14e6c7f3b77021c75fdd1b0f570c17ee5e9af3000c07d2c9202e08933fa29dc644212099ef4a77e9ee1 SHA512 32a2ba2efc6a41f89871a9cd0a64cf894cabee5b863eefc17f4a5d1549b10472ee7359e19fc06a976f15a3f93dfc5b82bc248e0512c4d2f7b0f8d9ad18350fd9
+EBUILD gwenhywfar-4.19.0-r1.ebuild 2804 BLAKE2B 6840dcc7be26c3706c91b8ad3a19bc22e80721d525347ed66a89a9413b8f96aae080b35a4a4bf11266e5b79ddcab4f4625ec6063810344ccdcf49fc9d59ccc17 SHA512 5bffdb6fd0c197f9d78bd0573b54272d80cf326ded2fe7b8e1204594f66315da34150b2899d008ed2517da2b604b76fdda24c3d51f9548569229dc2fcd10fbd1
+MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
new file mode 100644
index 000000000000..fd0dfe31ff29
--- /dev/null
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/_beta/beta}"
+inherit qmake-utils
+
+DESCRIPTION="A multi-platform helper library for other libraries"
+HOMEPAGE="https://www.aquamaniac.de/aqbanking/"
+SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
+
+REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
+
+# TODO: not yet required by any revdep. Switch gtk when gnucash is ported.
+# gtk3? ( x11-libs/gtk+:3 )
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-libs/gnutls:=
+	virtual/libiconv
+	virtual/libintl
+	virtual/opengl
+	designer? ( dev-qt/designer:5 )
+	fox? ( x11-libs/fox:1.6 )
+	gtk? ( x11-libs/gtk+:2 )
+	qml? ( dev-qt/qtdeclarative:5 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)
+	sensors? ( dev-qt/qtsensors:5 )
+	serialport? ( dev-qt/qtserialport:5 )
+	test? ( dev-qt/qttest:5 )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+# broken upstream, reported but got no reply
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	disableQtModule() {
+		local module
+		for module in ${@}; do
+			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
+		done
+	}
+
+	use designer || disableQtModule designer uitools
+	use qml || disableQtModule qml qmltest
+	use sensors || disableQtModule sensors
+	use serialport || disableQtModule serialport
+	use test || disableQtModule testlib
+	use webkit || disableQtModule webkit webkitwidgets
+
+	local guis=()
+	use fox && guis+=( fox16 )
+	use gtk && guis+=( gtk2 )
+	use qt5 && guis+=( qt5 )
+	# use gtk3 && guis+=( gtk3 )
+
+	local myeconfargs=(
+		--enable-ssl
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
+	)
+	use qt5 && myeconfargs+=(
+		--with-qt5-moc="$(qt5_get_bindir)/moc"
+		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
+	)
+
+	guis_config="--with-guis=${guis[@]}"
+	econf ${myeconfargs[@]} "${guis_config}"
+}
+
+src_compile() {
+	emake
+	use doc && emake srcdoc
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install-srcdoc
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/gwenhywfar/metadata.xml b/sys-libs/gwenhywfar/metadata.xml
index 4196ab24d5ad..762819655dde 100644
--- a/sys-libs/gwenhywfar/metadata.xml
+++ b/sys-libs/gwenhywfar/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hanno@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="fox">Use <pkg>x11-libs/fox</pkg> graphical toolkit</flag>
-  </use>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="fox">Use <pkg>x11-libs/fox</pkg> graphical toolkit</flag>
+		<flag name="qml">Enable support for plugins using QML</flag>
+		<flag name="sensors">Enable support for <pkg>dev-qt/qtsensors</pkg> module</flag>
+		<flag name="serialport">Enable support for <pkg>dev-qt/qtserialport</pkg> module</flag>
+		<flag name="webkit">Enable support for <pkg>dev-qt/qtwebkit</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index b9ba877f35cc..5d707cf7e4e2 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -2,5 +2,5 @@ AUX libapparmor-2.10-symbol_visibility.patch 215 BLAKE2B 5f24a528a37f9fa652284fc
 DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c
 DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 EBUILD libapparmor-2.11.1.ebuild 2161 BLAKE2B 5bfc0b49a9e20f583c7839743b3e4e33075de37df75f44233648d2f198ae178e74f02916af31a99088ad3ae2f120e01af4da6b6dc11e5af8ed716811453a954f SHA512 8f54f44882c3732d2cefdf069eb9329c273b7838c0cd4dc535b8a3b0cac5d9244a75f7872d14a3be94d7ffa6452bea79189895fd2ff30973ebb5b4a94373fb81
-EBUILD libapparmor-2.12.0.ebuild 2167 BLAKE2B 7f11e5826d820d0a38cfca75256050da6b56c23f812adafb7a401d14b1148ac23b05060bee5bf0905594c888ef07a09abc50d9e23702fd13ff0d26bf1b96dccb SHA512 3d2d82b3636829de6eb1aad76096a901e0559aac8430eeda4ffc54b93a6f5bd67c7bc9d5f5293c590b5a1f671dc3698ce57b417b995d5e5accf948b29e71953e
+EBUILD libapparmor-2.12.0.ebuild 2166 BLAKE2B e5396ddf8010202fd4cb71764625ab814e19cec3c62942e20b32c2762b32308aa0cb6ddace1e7ab5cef36a64df8ed090d044c9aadef618b4a034f513a6be030f SHA512 a9b5186d731847b296c8cb61bd2d2b38a538e31351578591b21d6bb8d7983314ccc283588516e62138e892e578317510f471265e5411a0fc36e826dbbaf2640a
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild b/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
index 026e70ab2e84..0743c002fa40 100644
--- a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 10069af48fb2..d8b752026586 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,5 +1,7 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
+DIST libblockdev-2.16-1.tar.gz 282247 BLAKE2B 0645ffe9f0cadc6e412de813b32f4e37ead67039a69f7e8938b41f5ea10983a18d31e29653eab50dc41889952b00658b91853908dff3e62b50c1e85a267b4a63 SHA512 d48d4b0e3174ad7b93558534d7f0285b398e47e2c9dce3cc60cbe0a32a78fef32601cca2508f30a882609ceb3cc59efe2761720af191e6394ca1b8c51878b535
 EBUILD libblockdev-2.14-r1.ebuild 1504 BLAKE2B 8da60dc425c0b83f6e75705815bc94275937bd1c1d5ace0798c850d04d561910a1f7086f32d131b7aaf0d785cbacfc9179909d0e8909646524f34638a38ae399 SHA512 6e19060b01e9b21f1969d35cfff4a58c20456d4594f22ec4e8ae961480302abb639816f97212956e067b0df921ed17d8c1298ef025598c56aab663cb430e0ad9
 EBUILD libblockdev-2.15-r1.ebuild 1511 BLAKE2B 4dec54efab145e4b97faf0fabb0a98bde71ea31aae72ab6baa2e4fc70b046fe423bbdb1e3b95be911cf7b0d93b8f88529261b5819ec734e1aa1a1f402a2914e6 SHA512 9706152e06aba541beab82f1c3b20fa412cc96de67ebcaf3373eb6d071d8de40067c58136b1b32140ebcb6581c285f6fcbf1e6c2c0594687217a0d944612b058
+EBUILD libblockdev-2.16.ebuild 1511 BLAKE2B 4dec54efab145e4b97faf0fabb0a98bde71ea31aae72ab6baa2e4fc70b046fe423bbdb1e3b95be911cf7b0d93b8f88529261b5819ec734e1aa1a1f402a2914e6 SHA512 9706152e06aba541beab82f1c3b20fa412cc96de67ebcaf3373eb6d071d8de40067c58136b1b32140ebcb6581c285f6fcbf1e6c2c0594687217a0d944612b058
 MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
diff --git a/sys-libs/libblockdev/libblockdev-2.16.ebuild b/sys-libs/libblockdev/libblockdev-2.16.ebuild
new file mode 100644
index 000000000000..5a0a5ca95e87
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-2.16.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit autotools python-single-r1
+
+MY_PV="${PV}-1"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/rhinstaller/libblockdev"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
+
+CDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		>=dev-libs/nss-3.18.0
+		dev-libs/volume_key
+		>=sys-fs/cryptsetup-1.6.7:=
+	)
+	dmraid? (
+		sys-fs/dmraid
+		sys-fs/lvm2
+	)
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	kbd? ( >=sys-apps/kmod-19 )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${CDEPEND}
+	>=dev-libs/gobject-introspection-1.3.0
+	doc? ( dev-util/gtk-doc )
+"
+
+RDEPEND="
+	${CDEPEND}
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--with-python3
+		--without-mpath
+		$(use_enable test tests)
+		$(use_with bcache)
+		$(use_with cryptsetup crypto)
+		$(use_with dmraid dm)
+		$(use_with doc gtk-doc)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with kbd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f882d6ecebe4..6caf5a4b596b 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 4f689183b254..ad6532279d1e 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -8,14 +8,11 @@ AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc4
 AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878da1962b9748689c1637e8a1733b9027507d0e382ec226ddf47e2d392d3a467855732137ff7ed3763513b4421e98a1 SHA512 3bb9963907b92d791e54ad57fde2474b77ac4bcd26e7eff67ff098feacd6c0255c560a3d364031e0a4051b9a8c943b9401afb271cfee1d91e58e116a02f3d979
 AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
 AUX 2.9/criu-2.9-makefile.patch 2504 BLAKE2B 854a693730bf674ea9b18298d527f61e17e2e357db81662c863b4a51b4dd73bbe4acb99d3546c96b55ed81c201c6d53203e3a7c80be8752cdf8c46221a24b628 SHA512 8d0919c1fb7f2672e44f8366eb3df70dae9d687224170b43688365af9be4a974d169c78f84dc2525d32b24188749c992b8b716df840af0ebdace2eaa61eb2366
-AUX criu-2.12.1-glibc-2.26.patch 1838 BLAKE2B b44c1347a6dc984ca417e348cf61e0abbd0eb18bc9de32dffbbc032aa54864a3c2168440dd47dbd47eda59b10c1071f1e6979e7df462966a66f81578235388e1 SHA512 bd16e6aa787d50e9e9d73c102d2bedeb5550cf6cbbe8bb75a0202660b80407c96b8f59b844902f405c59dcc3ff7baa0531218f654fe6790e64889f4221e3d8b4
 AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
-DIST criu-2.12.1.tar.bz2 646855 BLAKE2B b3bb7fd7b9006dd60346639c0d86954fa083de3af8950810a642447dd2f0043fdd8c6df96cd2f5e55788c002dd2c0530f7379fb17a5e798dbdacc14227cd5ae7 SHA512 7a168bc20665ed3ca9931e6f2fa6d58b87faee38eee30dcdda8dad041ffd90ea7e1bad17d4dcf5c5d8de563eacc64ecbd579b7f4b959a654182a688e94024ba2
 DIST criu-2.5.tar.bz2 605226 BLAKE2B c4086b9822b119a648bda4f6cc831eba5b7e3fba5af41f8f0b1c00dac7d4aff88a71e81569c4559fd98113e76eba0653c67684f443c1c803c453209367a4c875 SHA512 ccf942005ff3b2a567726ddb8aa44048c130f1adf6e2cbdf48e919043c84a4e1c03ad0ec34b44263e5764bea62807a2cc0fa1135b929ad3166fb9486c2880570
-DIST criu-3.4.tar.bz2 701680 BLAKE2B 16cd6bde7f356322b979c14823d6f22ffc64a3104ca185c7407a97d7af9dc7a83bb538c86e7a93bb7d99c6a01eba309435d4e1e80033a90bf386d235871fca34 SHA512 71fc700d19b46381873b2d0fa90e7fa253b00beb5e4e6065bbf510766acbcc14b35d58fa8073801112f897d2320b7decca1115fb6853d5fe64f3c52aa40a9f32
 DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
-EBUILD criu-2.12.1-r1.ebuild 2419 BLAKE2B 962796151a06a2a4e8bd18c3986dc56f126457b97cd915960e5924f7338c580ed9aad0a078e1381ab0c327632eefde2d540e45691314cb1af49c88583a1e4c66 SHA512 653b81f9f0b668414ab5bbb89af492d0fa5bace24d99ff0d1f82e6aff1badef02fbfcb6506328bb7c462aaecb5dd4b3e839b707b4c4e21083e23b0f81e5bdf23
+DIST criu-3.7.tar.bz2 749499 BLAKE2B 41222983183910b8a039a69e1a425993703e4f461c1cc0e64e92f877aff571d56c7f32cdae7848ef1633a15cac9e7b746f8c84a71f3607f7fc22959964820258 SHA512 8feb9e2579c04b67a7fe9631bb662504a7eb78550c3951cbe29252d87d9258fd6994533f6e60b0017b6a6e21bbdd5e7cd7e8a255be53b77b57efacec4e50140f
 EBUILD criu-2.5-r1.ebuild 2400 BLAKE2B d69f86d8cbe441515adaa45f60f394193c4cf0d66a138762b9cf2a9e3687c2b283e293f3ddfec06606421c8c57dd4d07abf0ed9372b9a3739a25e137432551e8 SHA512 2f6511dad5b89065430ed58786c4b12f539cdf0222c655eff5c9635ab83e4fc7bee4dc2f28dd8be5423078c6fb6f00beffb20a388962aaa99f16c06475cb8610
-EBUILD criu-3.4-r1.ebuild 2331 BLAKE2B 3555508c91ed9ff280d30cafdc1de4fbe91032e796cfc9cc065eb09a19545adc67fcd55be08288809f37b9d1c4ec94b4d4d125e90a8bf50c72c2ff0b41c26636 SHA512 72be29b80857de3110970182e2684452afb0a7fb8e6f14d952d2da1b64509945ae5ba0c853fdcafdd743fca3c7a5d28a98a5da09b802f82dccdcb0c9740f1a3a
 EBUILD criu-3.6.ebuild 2595 BLAKE2B a834b690e575a9b1cd6dc1d3d8109037cd9ef8942c6f3d4096c479201a0b9c2fe3d5e3714b2d8a4a448e377938d19dd5c3f4dd2dd3e75b810d68752a94ffc208 SHA512 464aabd062cca613fc10f6976c7a798404f3d6d79d9f9aa7d9c3d849ffa128c66404a14cb75cb8bfa5eb17595b04e62f1a6954cc35db8a4df9cc8de7e0663183
+EBUILD criu-3.7.ebuild 2595 BLAKE2B 2d4ea71cb432008f122fc9e46c60a533e9f5fdaa4dc224834024967741a28fe348b5b19b30e8b3da411cf86a9cb9926522d5ed80c1eaa50bcac5a1ddea903901 SHA512 1fcffccf0221bade98f452dcad0c9f611336d7d365d12be07d150943d74f1154497eaee8812a30cbbfbb984be43b8acc5e95ef4d06361e3b13b4fe26b9cba901
 MISC metadata.xml 480 BLAKE2B 55ce3f89b53789b3ed3e9a19fd4dbf3184941572269b3ef489c3cbbef8bac8a3aac58ea84887ac0c99919797e74c289ffaa617fc8370f936c9c34c27b976ace1 SHA512 0a108eed5d8cdb1818b9c497377b3a83b282354c9402f1ee6473df4eca6ab75f508b3faba55a88007ca225238ac0c00fa1c0d845fdd4c98556f1c03b6f33a764
diff --git a/sys-process/criu/criu-2.12.1-r1.ebuild b/sys-process/criu/criu-2.12.1-r1.ebuild
deleted file mode 100644
index bf72562e14c7..000000000000
--- a/sys-process/criu/criu-2.12.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/protobuf[python,${PYTHON_USEDEP}]
-		)
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-aarch64.patch
-	"${FILESDIR}"/${PN}-2.12.1-glibc-2.26.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/criu/criu-3.4-r1.ebuild b/sys-process/criu/criu-3.4-r1.ebuild
deleted file mode 100644
index 37f7bdf70e91..000000000000
--- a/sys-process/criu/criu-3.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="python setproctitle"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		|| (
-			dev-python/protobuf-python[${PYTHON_USEDEP}]
-			dev-libs/protobuf[python,${PYTHON_USEDEP}]
-		)
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-}
diff --git a/sys-process/criu/criu-3.7.ebuild b/sys-process/criu/criu-3.7.ebuild
new file mode 100644
index 000000000000..34cf3149abcb
--- /dev/null
+++ b/sys-process/criu/criu-3.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1
+
+DESCRIPTION="utility to checkpoint/restore a process tree"
+HOMEPAGE="http://criu.org/"
+SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="python selinux setproctitle static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/protobuf-c
+	dev-libs/libnl:3
+	net-libs/libnet:1.1
+	sys-libs/libcap
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	setproctitle? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto"
+RDEPEND="${RDEPEND}
+	python? (
+		|| (
+			dev-python/protobuf-python[${PYTHON_USEDEP}]
+			dev-libs/protobuf[python,${PYTHON_USEDEP}]
+		)
+		dev-python/ipaddr[${PYTHON_USEDEP}]
+	)"
+
+CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
+	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
+	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
+	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
+	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+)
+
+criu_arch() {
+	# criu infers the arch from $(uname -m).  We never want this to happen.
+	case ${ARCH} in
+	amd64) echo "x86";;
+	arm64) echo "aarch64";;
+	*)     echo "${ARCH}";;
+	esac
+}
+
+src_prepare() {
+	default
+
+	if ! use selinux; then
+		sed \
+			-e 's:libselinux:no_libselinux:g' \
+			-i Makefile.config || die
+	fi
+}
+
+src_compile() {
+	RAW_LDFLAGS="$(raw-ldflags)" emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ARCH="$(criu_arch)" \
+		V=1 WERROR=0 DEBUG=0 \
+		SETPROCTITLE=$(usex setproctitle) \
+		PYCRIU=$(usex python) \
+		all docs
+}
+
+src_test() {
+	# root privileges are required to dump all necessary info
+	if [[ ${EUID} -eq 0 ]] ; then
+		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
+	fi
+}
+
+install_crit() {
+	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
+}
+
+src_install() {
+	emake \
+		ARCH="$(criu_arch)" \
+		PREFIX="${EPREFIX}"/usr \
+		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc CREDITS README.md
+
+	if use python ; then
+		cd lib
+		python_foreach_impl install_crit
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch b/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
deleted file mode 100644
index d378cc88cff9..000000000000
--- a/sys-process/criu/files/criu-2.12.1-glibc-2.26.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d77d8cc402e597bb38edfb4e81db89fd7d96d0b6 Mon Sep 17 00:00:00 2001
-From: Adrian Reber <areber@redhat.com>
-Date: Thu, 29 Jun 2017 14:19:32 +0000
-Subject: [PATCH] fix building with newer glibc
-
-Newer glibc releases have removed SIGUNUSED from bits/signum.h which
-breaks building criu on those systems:
-
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8082d91e1c449e0cb137468b731004a5e605c8c6
-
-SIGSYS returns the same value as SIGUNUSED and testing has shown
-that criu still successfully completes zdtm with this patch.
-
-Signed-off-by: Adrian Reber <areber@redhat.com>
-Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
-Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
----
- criu/cr-restore.c            | 1 -
- test/zdtm/static/pthread01.c | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/criu/cr-restore.c b/criu/cr-restore.c
-index e8fb4adf..6ba50f18 100644
---- a/criu/cr-restore.c
-+++ b/criu/cr-restore.c
-@@ -880,7 +880,6 @@ static void zombie_prepare_signals(void)
- 		(1 << SIGPOLL)	|\
- 		(1 << SIGIO)	|\
- 		(1 << SIGSYS)	|\
--		(1 << SIGUNUSED)|\
- 		(1 << SIGSTKFLT)|\
- 		(1 << SIGPWR)	 \
- 	)
-diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
-index 52f849c0..2520fcfe 100644
---- a/test/zdtm/static/pthread01.c
-+++ b/test/zdtm/static/pthread01.c
-@@ -43,7 +43,7 @@ static char *decode_signal(const sigset_t *s, char *buf)
- 	COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); COLLECT(SIGCONT); COLLECT(SIGSTOP);
- 	COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); COLLECT(SIGXCPU);
- 	COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
--	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
-+	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
- #undef COLLECT
- 
- 	return buf;
--- 
-2.14.1
-
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 9e8e7d966b23..1601ba9f5ad6 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -2,9 +2,11 @@ AUX cronie-1.2-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a75d78
 AUX cronie-1.3-crontab 485 BLAKE2B fbc9aa3e49d7eabe63838b39095c5aea0623d604df1504a4140d56271f991659c9da56b71885817853688b65ef7746235b075141da2b1cab2ea6313b350343b5 SHA512 4c1723a9363ec62d466525c701c1c355a3e3e741d8fa1b34fe43b2cdffc46cfe9044d6291ef20c1b3c95f4ae219eae6d4d3f0d9c294127c6fdb6f38319a55e6c
 AUX cronie-1.3-initd 274 BLAKE2B 11ea62f09ca1263b9daecfcccc422d4ce28c200e03a1edbae91db9cae770910490a5c34f0f3e8a6a7ccc677aca6c555450fd9b2e7ec7aade163552f5613cbbd8 SHA512 f80a745dd00c62518dff3faff45bc79df97254e275bd5d26a1edc7452c23cebffa1d3eb3cb1767b23f40eae462f9432cca87b5b075a143169e056b38f21e85ae
 AUX cronie-1.4.3-pamd 231 BLAKE2B d993c025529e817435264c798bec757ead59d77540e1ff08a0f43d2d686d5c82eb9101455bc3191417323286a483e68795ec3a376c73b216ac4ea6d77fbaf2bf SHA512 32268d8b097e60eb039c023647ecd651b6940a8fe1587111ce0d49314bbb2de451214f98b7b703fd284e231c10bc4e616d4d0c63c107d9cdbc2bb470a17f2c3a
+AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b8671b550228906e8e68d539085b260ee52c4b27384d000ba34878f648310b50ba7bf1d6b6ef41e3 SHA512 ee626c83612bc143c5a1ba816c8147751ce519d0bd0de6adc2132b930872259ae4ecdcd465563ebce43d5fa913ab5e52a36392ae7933a71b3ebcdab840742ebb
 AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd473940c296015cbd4a1fb2fb7032ca2b7d81edc8bb946f72e83a3282c071ef14a1f0dc28505e03cdaba43 SHA512 dcbeb3fba468f3b63965714075bb6619c768e0d14caddf8c4b62a5d6bee6a2f55be2f1d589b9ef5adefe57d9a20eb2c17216550519fd83bcea2151ccf151d4e0
 DIST cronie-1.5.0.tar.gz 242072 BLAKE2B ef21cfabbc70981a0d57ff85cbdbae786aae2d01095e7da3f55c5a9c97c1b62cde2e29e7e872b34872e9b8faacb36d86cfb37a8257faf49f1586761eb8797f23 SHA512 cad4d78cbb58ea32d1093890b316b6599d115b29f367eecc2e4a0a3560ab85ac85aa159886c883e46defb6212432d37f425396cfca686e4dd8526102ca4dd8fe
 DIST cronie-1.5.1.tar.gz 114848 BLAKE2B 9b2a045c2c3c18a931588c620e455c4f2efbf17a5f5826bc1b276bd2c4537fe91d7f81cdb7434dc7d8357414c14d9dc89c90bb7a5dc22956d90b6a84c731f498 SHA512 7e5b2e5cc782d04b84ffced21b4601ed5a041c125ec9daa3ae3c704c04b376b07f8f6e6e1351659690ce695ca4c9373456420099eefde985e15fbe5d3ebdcf5a
 EBUILD cronie-1.5.0-r1.ebuild 2149 BLAKE2B 11ba9fc9f9bbe786fa226f45b11c689188be8606b9c2365a2dcabb71c1e0a4ab77388be8c7ec9e3bc73c0e0c7f66bbe170949957496c1aab61e66d4cc74f819d SHA512 345dbd19db3c032f1a3a32253b091359775ce86f0ed69b7abffdcc9603fb56d49d355c6d4e0907f20a5d560eae10f815700c9e62dd472837b39d0645f90d6638
+EBUILD cronie-1.5.1-r1.ebuild 2274 BLAKE2B b22e14cb329a250cdf70898707468c88cc599018c19be6a6792f4d9d3a303454bc1d81c8b5289d8e15f119ee3a8e469b507967a782dbeb47ef6a6282f9aa61ce SHA512 cd896ba84da4a0a7b2c57c12d698cb2be5bd5b0d031a47c7f9ff36de2dd8e7acb9449f787f60563ffba9bc4094687673be71147200ebb4c77b4b548b4582923f
 EBUILD cronie-1.5.1.ebuild 2207 BLAKE2B e96e430c2654b80301a536b12fbc9584104eb6e2dbcf14df14f4eade954ae020e0b75f874eab8ccf8ea7fee193c73067893e1d0dac9b06b994b526dd7a3a1b88 SHA512 4f6588e27aa00bc7ace3c8a930c84873f23d28dbda048a1b4476108ea01fc0a5e6f733c05e5366ecd7c3c9a8e0608dcddf2e4942f08c0425b07312cce230db92
 MISC metadata.xml 1014 BLAKE2B be8a19ba115ac54d9cc8c667072264f4eb134ba5133e404f74436ab5b0fd88b42a21d6a6f0441ebe3158ce475ea29f5eebc5d135e6b2317ef4b35ee1365bce52 SHA512 7f8295708e5049940e4e2147494e8ee2649635b492fe9096f1d61785f6fd8126d380be1517b253e668d6355d0d2d03e97af4fcca47ed42a6b70a5d669e7ab2c5
diff --git a/sys-process/cronie/cronie-1.5.1-r1.ebuild b/sys-process/cronie/cronie-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..9030fc8fb1df
--- /dev/null
+++ b/sys-process/cronie/cronie-1.5.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cron pam systemd user
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="pam? ( virtual/pam )
+	anacron? ( !sys-process/anacron )"
+RDEPEND="${DEPEND}
+	sys-apps/debianutils"
+
+#cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/cronie-systemd.patch"
+)
+
+pkg_setup() {
+	enewgroup crontab
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf \
+		$(use_with inotify) \
+		$(use_with pam) \
+		$(use_with selinux) \
+		$(use_enable anacron) \
+		--enable-syscrontab \
+		--with-daemon_username=cron \
+		--with-daemon_groupname=cron
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/sys-process/cronie/files/cronie-crontab b/sys-process/cronie/files/cronie-crontab
new file mode 100644
index 000000000000..275f06c603d4
--- /dev/null
+++ b/sys-process/cronie/files/cronie-crontab
@@ -0,0 +1,17 @@
+# Global variables
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+MAILTO=root
+HOME=/
+
+# For details see man 4 crontabs
+
+# Example of job definition:
+# .---------------- minute (0 - 59)
+# |  .------------- hour (0 - 23)
+# |  |  .---------- day of month (1 - 31)
+# |  |  |  .------- month (1 - 12) OR jan,feb,mar,apr ...
+# |  |  |  |  .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat
+# |  |  |  |  |
+# *  *  *  *  * user-name  command to be executed
+
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 815a84d49641..209b7ce97f77 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/freedesktop-icon-theme/Manifest b/virtual/freedesktop-icon-theme/Manifest
index d778fe29a9df..a7710a961d21 100644
--- a/virtual/freedesktop-icon-theme/Manifest
+++ b/virtual/freedesktop-icon-theme/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedesktop-icon-theme-0-r2.ebuild 582 BLAKE2B 0637e5cd52b0459ea30385a4fe21b1529115d6e350d09f14b982c3da57c670c25e606aa861cd10100103998d20346c7aa849d6138eea450a84355d1f74a20df2 SHA512 2ee4227c4e356b886631b9170aa719e40bf0437ed861e7740f17bc966239fc157b0a84e9f56b620dbf9db66d8d43449e842540f7252fd06269d48bd1ff69e978
+EBUILD freedesktop-icon-theme-0-r3.ebuild 553 BLAKE2B 3d81251103033d492e29903d445279695108d4ce554efbbc18115b244a07241f9db696d8bf8d2d40e9177459a1daa5e9d9a85424312a15d681d67c2cbebea31d SHA512 f3786dc59f05890c2af62c9a63cbf30afc2686612afa2196c752d92992a50a3fd072e0d944b47c16379d460e04c0e911c7d8b236d0eb81232f169aeb3ca57d23
 MISC metadata.xml 225 BLAKE2B 81838b4d796d9721db9c105c009fb414f50cf0394c85d19006a221687b19ab7e8933985d81c8f81ef81dcb80383de177aaf12d9d97dbc29021ada35bb7f43a27 SHA512 7a66de18f711494ffdb2145fa8aed4639444cc18286ca5ba374739428598e279be56382e7a90e7d6d5fececf9e060269e5d9b497b94e0f204201d95c55cc163e
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild
deleted file mode 100644
index 76e524ef9fae..000000000000
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual to choose between different icon themes"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="|| (
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-icon-theme
-	x11-themes/faenza-icon-theme
-	lxde-base/lxde-icon-theme
-	x11-themes/tango-icon-theme
-	kde-frameworks/oxygen-icons
-	x11-themes/mate-icon-theme
-	x11-themes/elementary-xfce-icon-theme
-)
-"
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
new file mode 100644
index 000000000000..d8ec207be732
--- /dev/null
+++ b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A virtual to choose between different icon themes"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="|| (
+	x11-themes/adwaita-icon-theme
+	x11-themes/faenza-icon-theme
+	lxde-base/lxde-icon-theme
+	x11-themes/tango-icon-theme
+	kde-frameworks/oxygen-icons
+	x11-themes/mate-icon-theme
+	x11-themes/elementary-xfce-icon-theme
+)
+"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 125300b348c5..635c251aa45b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 47c6fcc18012..814addb483c4 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,9 +2,9 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 651 BLAKE2B dcf0ddfcd2cbbc457f0dc7142a64c403c7657c30a7f85ab103828758c16fce8c6fc2e80a4f2f943393f3c226f873a2bce4b6df999fa4b178b3e95bf213688d86 SHA512 7bda41f0c6ee9ec0947ef6b8d4591453f797ac0256f9b67800249a6edf699e55855a9bd6f46501a86ffec5b5d2e1d8ac735657a0c63600683f61044e0bbc35d4
 DIST grafana-bin-4.5.2.tar.gz 50374607 BLAKE2B 0cb4fb5c6b2b465e7cc9ce1f99bf102cd8fc5bc1fad1d995393923e0d6e0e16dd3bd9858b6ad93fc178092e6ef32c1000d4928187d67ab2cdd4f8e9d5a0c71eb SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7
-DIST grafana-bin-4.6.2.tar.gz 47182881 BLAKE2B 4235ff77e8d03c3495030acf173c322f0122aaa833188af0338c185f11969cc90c3b8799591a9988290bc6183d6e2bcb92f05d8d5751be1d1bbb807b38ae8ade SHA512 e75f30e8a34e0c0c5e8624fb336be3b8fc0d618f7e20a83451fac68a82195f6f64abfda6215d1d3e9f17cb8af5537c43030e93f0885978de264865ddbebaf86f
 DIST grafana-bin-4.6.3.tar.gz 47187988 BLAKE2B 8d09f6569c8cc7b880fe852e0696b5d8b811d91a8aed360dffb40dc033e8ca756f7b37c6f2fd16d9925c33f2b7fcc4d279e31611fdb5aa7e4b24eee88cea0d38 SHA512 dad2c26b998910519cc462aa3dc91bd6d7ab6b7fdea9e1aa3c54ed5eb86830e9b8484434a5fd307f7ff490549509df97486249b301ccd84a7bd5b2de11ffe929
+DIST grafana-bin-5.0.0_beta1.tar.gz 52551303 BLAKE2B 442060a1a69e10c7694c742de386a6d05754a66baaa79b9e9e036b333e90a81da375b0eb1eaf753f30989f16899db35c07ac10bc37239217214600339ace6cc4 SHA512 013c13c43b1b60ccbb23d7fa57c9aa07e7a74895df745dc5c879a3423b1f8cf5129411c220dd06697bb13f6a13674b8b1b265b8d21ac0ad67da484a93e41f0f0
 EBUILD grafana-bin-4.5.2.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
-EBUILD grafana-bin-4.6.2.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
 EBUILD grafana-bin-4.6.3.ebuild 1750 BLAKE2B cb822beb7365474a21f49de6aedd9ffe31c80f99a5c3817b4c87f12cbc8390310cda5ec0f756e543d7d71970c809b5d21aff3a6a3dd377909e453e2f81c03730 SHA512 7b0aac0e0e288f00d29e4a1b770ebc0ebea629cb1760c4c99ea6531f746b6a571d58a0ac1a8001a1668dc1d4527510fe3ecc7b02e70247df9589fde6ece9a2f4
+EBUILD grafana-bin-5.0.0_beta1.ebuild 1764 BLAKE2B 4054bb9e0cf6f4c05504e35a10f569aa1d0faedb1b69b74bd968314e694f1a3c7ac7d5d6502afdb9c41c6f6775c58b9af0a145cc8bd94fab7162dd54602561ca SHA512 9e5b68ab1cdf549e6b909857975bdddff860e240a333c946911f38b260e6235d129e4c2707922234fbff36fa4b51a894c714c203dcd58c6a612091cf15fa209d
 MISC metadata.xml 299 BLAKE2B f907a1d524382aed556259ab450e2e6b9c927b7b07a975d468867855e3dc184d7d296a4f6f098a65598b377b2c46cab1c90dced667c7b0cdad16e156949807b1 SHA512 3c543eb4a0465af174a2a80650a542daead9f89685993575eef9ab826b98c84585184152f8ebc5e81fdafd9bbe24d63f467b251a4c9aeaaeef52408a1a3812df
diff --git a/www-apps/grafana-bin/grafana-bin-4.6.2.ebuild b/www-apps/grafana-bin/grafana-bin-4.6.2.ebuild
deleted file mode 100644
index 3a8308e2d6d7..000000000000
--- a/www-apps/grafana-bin/grafana-bin-4.6.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
-QA_PRESTRIPPED=${QA_EXECSTACK}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-5.0.0_beta1.ebuild b/www-apps/grafana-bin/grafana-bin-5.0.0_beta1.ebuild
new file mode 100644
index 000000000000..cbcca07e13c1
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.0.0_beta1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+MY_SRC="${MY_PN}-${PV/_/-}.linux-x64.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV/_/-}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_SRC} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 1a7ce5f641d0..29aaee5456cb 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,4 +1,10 @@
 AUX otrs.service 246 BLAKE2B 1909aace3a51119d58e6e8296a581771189d1b35f53db525e7574745bcaf0f8f2279e66c2dd39137131c4f7e30bfa0e3c25753712e35c3cfb59da2fb17af0e30 SHA512 52fbaf320b3943ec51b178cf0558f77d208b6f735e3278a790f48c74770bfc0b87888ac9225b43c0f7f3b0149296497b2c405b0424995d1d6f83a33b5d072ae7
 DIST otrs-5.0.25.tar.bz2 20671315 BLAKE2B 045037411039f480434e7c36ab84b63ec0c119e39cc6918ba05d9a7c92e5c940545412dc2824fc427199b384dece34793d2b60fadafec302f67581aabdc5ac82 SHA512 1e68471f071265d963c51ab5a6510a9a9b23d3de87e10eb58b9f9ca937500f4fdf68a7e911f9509244e4cbf43e1658c95dbaba83160d736ea0116167f3361e37
+DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a7d375416df90d85b694ac59e84978fe61183aa058497da18631513c25ecc93e3150f662e2e2efd335014e1e75 SHA512 d7f551e2c9bbe8b303d3de1f7993d76ea22cfd876b61941cfb72a25f2ba7e0a889c275c87aa40c104c1f2e6e1923b7a530cd088bd11b7b575a608b623e2b0541
+DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
+DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
 EBUILD otrs-5.0.25.ebuild 4124 BLAKE2B 0022cb1f8819c580bcfc75312bb21ae13406e03cd70ad9a05e433c041a76ab6e05c0076f1866d6047ad324eebe0c683c7bc201ae73d1725f424e97b02f927cac SHA512 bca3059455541b65749e612773d46983c5b6eb8b7e64696a9b807c07c26237e6b072b4269737efe2b94e5ecded5bbf8388261223b6c65d4c47a1689f57ad6479
+EBUILD otrs-6.0.3.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
+EBUILD otrs-6.0.4.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
+EBUILD otrs-6.0.5.ebuild 4171 BLAKE2B aa4f31b8f816fd0335c49f57bc4085a163bc18629c91527094fdfce79ed163196b721e65d6a429c429290a6325bf65c49abcbfad43c19bc3f997e98335979f73 SHA512 4d866bdbca92105912b1fdc8a1a7b1777c942bb1125536aeee367f49bd13a52c39164f1edf1e8122ec039aa6a29190a08db99c1e72ea47f33f681784ebf5bef1
 MISC metadata.xml 581 BLAKE2B 14a4dfee6a80d7b1640d67ea954dd638978ebee0f6770a70a9a3e9f8a0182954d660439aa8f81cec5a85039a028f507e704109c7d946dc85b2491311f8e3f090 SHA512 8b39dcc1639161c524b1d34de6184409c72422e6442e4a61b0c47f7b1c37ef04d267936dc43c2a10f11f702c50b0b7fe04ffcf9de084f5196f1135ada3c3c802
diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild
new file mode 100644
index 000000000000..5ab8f192a5bc
--- /dev/null
+++ b/www-apps/otrs/otrs-6.0.3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user systemd
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="https://www.otrs.com/"
+SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="media-libs/libpng:0"
+
+RDEPEND="dev-perl/Apache-Reload
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-XS
+	dev-perl/LWP-UserAgent-Determined
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	>dev-perl/Net-DNS-0.60
+	dev-perl/Template-Toolkit
+	dev-perl/Text-CSV_XS
+	dev-perl/TimeDate
+	dev-perl/DateTime
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-Parser
+	dev-perl/YAML-LibYAML
+	apache2? (
+		mod_perl? (
+			www-servers/apache:2
+			=www-apache/libapreq2-2* www-apache/mod_perl
+		)
+		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
+	)
+	fastcgi? (
+		dev-perl/FCGI
+		virtual/httpd-fastcgi
+	)
+	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+	gd? (
+		dev-perl/GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pdf? (
+		>=dev-perl/PDF-API2-0.73
+		virtual/perl-Compress-Raw-Zlib
+	)
+	soap? (
+		dev-perl/SOAP-Lite
+		!=dev-perl/SOAP-Lite-0.711
+		!=dev-perl/SOAP-Lite-0.712
+	)
+	"
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
+	# so we create the apache user here just in case
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+	enewuser otrs -1 -1 "${OTRS_HOME}" apache
+}
+
+src_prepare() {
+	rm -r "${S}/scripts"/auto_* || die
+
+	pushd Kernel >/dev/null || die
+	local i
+	for i in *.dist; do
+		cp "${i}" $(basename "${i}" .dist) || die
+	done
+	popd >/dev/null || die
+
+	# Fix broken png file (and see pngfix help for exit codes)
+	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+	if [[ $? -gt 15 ]]; then
+		die "pngfix failed"
+	fi
+	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+		|| die "sed failed"
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+		|| die "sed failed"
+
+	grep -lR "/opt" "${S}"/scripts | \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		|| die "sed failed"
+
+	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+
+	eapply_user
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+	einfo "Installing cronjobs"
+	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
+}
+
+src_install() {
+	dodoc CHANGES.md README*
+
+	insinto "${OTRS_HOME}"
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+		Custom Kernel bin scripts var
+
+	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
+	insinto /usr/share/doc/${PF}/
+	doins "${T}"/crontab
+
+	local a
+	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+	do
+		keepdir "${OTRS_HOME}/var/${a}"
+	done
+	doenvd "${T}/50${PN}"
+
+	systemd_dounit "${FILESDIR}/otrs.service"
+}
+
+pkg_postinst() {
+	einfo "Setting correct permissions ..."
+	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
+		--otrs-user=otrs \
+		--web-group=apache \
+		|| die "Could not set permissions"
+
+	einfo "Installation done!"
+	elog "1) Rebuild your config now by running the following commands:"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
+	elog ""
+	elog "2) Enable cronjobs with the following command:"
+	elog "crontab -u otrs crontab"
+	elog ""
+	elog "3) systemd users: enable and start OTRS daemon:"
+	elog "systemctl enable otrs"
+	elog "systemctl start otrs"
+}
diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild
new file mode 100644
index 000000000000..5ab8f192a5bc
--- /dev/null
+++ b/www-apps/otrs/otrs-6.0.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user systemd
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="https://www.otrs.com/"
+SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="media-libs/libpng:0"
+
+RDEPEND="dev-perl/Apache-Reload
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-XS
+	dev-perl/LWP-UserAgent-Determined
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	>dev-perl/Net-DNS-0.60
+	dev-perl/Template-Toolkit
+	dev-perl/Text-CSV_XS
+	dev-perl/TimeDate
+	dev-perl/DateTime
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-Parser
+	dev-perl/YAML-LibYAML
+	apache2? (
+		mod_perl? (
+			www-servers/apache:2
+			=www-apache/libapreq2-2* www-apache/mod_perl
+		)
+		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
+	)
+	fastcgi? (
+		dev-perl/FCGI
+		virtual/httpd-fastcgi
+	)
+	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+	gd? (
+		dev-perl/GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pdf? (
+		>=dev-perl/PDF-API2-0.73
+		virtual/perl-Compress-Raw-Zlib
+	)
+	soap? (
+		dev-perl/SOAP-Lite
+		!=dev-perl/SOAP-Lite-0.711
+		!=dev-perl/SOAP-Lite-0.712
+	)
+	"
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
+	# so we create the apache user here just in case
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+	enewuser otrs -1 -1 "${OTRS_HOME}" apache
+}
+
+src_prepare() {
+	rm -r "${S}/scripts"/auto_* || die
+
+	pushd Kernel >/dev/null || die
+	local i
+	for i in *.dist; do
+		cp "${i}" $(basename "${i}" .dist) || die
+	done
+	popd >/dev/null || die
+
+	# Fix broken png file (and see pngfix help for exit codes)
+	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+	if [[ $? -gt 15 ]]; then
+		die "pngfix failed"
+	fi
+	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+		|| die "sed failed"
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+		|| die "sed failed"
+
+	grep -lR "/opt" "${S}"/scripts | \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		|| die "sed failed"
+
+	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+
+	eapply_user
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+	einfo "Installing cronjobs"
+	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
+}
+
+src_install() {
+	dodoc CHANGES.md README*
+
+	insinto "${OTRS_HOME}"
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+		Custom Kernel bin scripts var
+
+	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
+	insinto /usr/share/doc/${PF}/
+	doins "${T}"/crontab
+
+	local a
+	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+	do
+		keepdir "${OTRS_HOME}/var/${a}"
+	done
+	doenvd "${T}/50${PN}"
+
+	systemd_dounit "${FILESDIR}/otrs.service"
+}
+
+pkg_postinst() {
+	einfo "Setting correct permissions ..."
+	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
+		--otrs-user=otrs \
+		--web-group=apache \
+		|| die "Could not set permissions"
+
+	einfo "Installation done!"
+	elog "1) Rebuild your config now by running the following commands:"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
+	elog ""
+	elog "2) Enable cronjobs with the following command:"
+	elog "crontab -u otrs crontab"
+	elog ""
+	elog "3) systemd users: enable and start OTRS daemon:"
+	elog "systemctl enable otrs"
+	elog "systemctl start otrs"
+}
diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild
new file mode 100644
index 000000000000..5ab8f192a5bc
--- /dev/null
+++ b/www-apps/otrs/otrs-6.0.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user systemd
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="https://www.otrs.com/"
+SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
+SLOT="0"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+DEPEND="media-libs/libpng:0"
+
+RDEPEND="dev-perl/Apache-Reload
+	dev-perl/Archive-Zip
+	dev-perl/DBI
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-XS
+	dev-perl/LWP-UserAgent-Determined
+	dev-perl/Mail-POP3Client
+	dev-perl/Mail-IMAPClient
+	>dev-perl/Net-DNS-0.60
+	dev-perl/Template-Toolkit
+	dev-perl/Text-CSV_XS
+	dev-perl/TimeDate
+	dev-perl/DateTime
+	dev-perl/XML-LibXML-Simple
+	dev-perl/XML-Parser
+	dev-perl/YAML-LibYAML
+	apache2? (
+		mod_perl? (
+			www-servers/apache:2
+			=www-apache/libapreq2-2* www-apache/mod_perl
+		)
+		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
+	)
+	fastcgi? (
+		dev-perl/FCGI
+		virtual/httpd-fastcgi
+	)
+	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
+	gd? (
+		dev-perl/GD
+		dev-perl/GDTextUtil
+		dev-perl/GDGraph
+	)
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pdf? (
+		>=dev-perl/PDF-API2-0.73
+		virtual/perl-Compress-Raw-Zlib
+	)
+	soap? (
+		dev-perl/SOAP-Lite
+		!=dev-perl/SOAP-Lite-0.711
+		!=dev-perl/SOAP-Lite-0.712
+	)
+	"
+
+OTRS_HOME="/var/lib/otrs"
+
+pkg_setup() {
+	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
+	# so we create the apache user here just in case
+	enewgroup apache 81
+	enewuser apache 81 -1 /var/www apache
+	enewuser otrs -1 -1 "${OTRS_HOME}" apache
+}
+
+src_prepare() {
+	rm -r "${S}/scripts"/auto_* || die
+
+	pushd Kernel >/dev/null || die
+	local i
+	for i in *.dist; do
+		cp "${i}" $(basename "${i}" .dist) || die
+	done
+	popd >/dev/null || die
+
+	# Fix broken png file (and see pngfix help for exit codes)
+	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
+	if [[ $? -gt 15 ]]; then
+		die "pngfix failed"
+	fi
+	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+		|| die "sed failed"
+
+	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+		|| die "sed failed"
+
+	grep -lR "/opt" "${S}"/scripts | \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		|| die "sed failed"
+
+	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+
+	eapply_user
+}
+
+# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
+pkg_config() {
+	einfo "Installing cronjobs"
+	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
+}
+
+src_install() {
+	dodoc CHANGES.md README*
+
+	insinto "${OTRS_HOME}"
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
+		Custom Kernel bin scripts var
+
+	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
+	insinto /usr/share/doc/${PF}/
+	doins "${T}"/crontab
+
+	local a
+	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
+	do
+		keepdir "${OTRS_HOME}/var/${a}"
+	done
+	doenvd "${T}/50${PN}"
+
+	systemd_dounit "${FILESDIR}/otrs.service"
+}
+
+pkg_postinst() {
+	einfo "Setting correct permissions ..."
+	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
+		--otrs-user=otrs \
+		--web-group=apache \
+		|| die "Could not set permissions"
+
+	einfo "Installation done!"
+	elog "1) Rebuild your config now by running the following commands:"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
+	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
+	elog ""
+	elog "2) Enable cronjobs with the following command:"
+	elog "crontab -u otrs crontab"
+	elog ""
+	elog "3) systemd users: enable and start OTRS daemon:"
+	elog "systemctl enable otrs"
+	elog "systemctl start otrs"
+}
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index c10922635ab1..84f14f5bf6ce 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -4,5 +4,5 @@ DIST postfixadmin-3.0.2.tar.gz 1306500 BLAKE2B da57834bc6b5222e4e964b64ff90ade50
 DIST postfixadmin-3.1.tar.gz 1279224 BLAKE2B f37fd9e34e5eb88a82c10a0b80d5593a7451f407948454a064209ba9150192b7026645774b97b0482488814d6abeb25b6a800c2f7fe12a7a768e711919b94852 SHA512 a3e1ecb3ac4ff4d604533bce532694bcc304b9b3d3e1b1ec840be6d007027705113f067393486f58908dd3846332ecf59c9c3c1a5123d03aa088f47593a75812
 EBUILD postfixadmin-2.3.8.ebuild 2774 BLAKE2B ea4e8fc724adcb931aaec91202777bb1d626f32934eb8094ab9745dfeccc66d806bc2b8cd3df0ede735b1443bcf749cabec3918ba1188b53fd015cd9e95a5498 SHA512 6a87a80fe823fd5a66cab4ab0db985b0afefb3bf365e8faa22ad0d118add71acaa3f2f338883a5a7e4c2d81e4ecf5b45c2688a810cd681f14b91f65c2f130950
 EBUILD postfixadmin-3.0.2.ebuild 2785 BLAKE2B 154ce95ab28e0ac89cda0bc83e3f984e12a8d84de0ddabd1c3b3d38d7b0ed7560ab493dfe8e0d78ba00cb0735cae9977bd40beaf3512f539b0d6c6f3a96b2552 SHA512 8d5ac164a30daf1eee14cfbefe7a4edf378134609e85e4091ddc147752ad4ff624bb70e83426807d9b43912c5519a75dcd5faa7f705015c789c6f811323d1008
-EBUILD postfixadmin-3.1.ebuild 2732 BLAKE2B 7cff433c922723e25ce11793e1b9333c9a76e21daca8691bbff41e83d8d869dc07a2ab1b2c0e4626e02b1b494d681e8bc359d25d28f9de05b99eecfc3488001d SHA512 0e0316387c1e3d7566bf3eb42b08e5630a738c68d2053b651251201bbe1503c09963df830a26d84a6b8935d30957f0e3fc37b50d24491d159a05ed305ac80cb1
+EBUILD postfixadmin-3.1.ebuild 2731 BLAKE2B b5c6f2c9e989537c2cbb800d9ec3510b46686a8098300a2819f2e9e24dbb5711e9542afab2d5195c935c439255bbe766bbd693980dc0052bcf40902bd32d2fd1 SHA512 d31e8e69b150b4c82b1f70f5c9aa1feac0b81384bac71ee7cb893cdef12c6096f037e821a9f14968150544c50ec75b4d2206ef46b911dda2cb1698d68c786e39
 MISC metadata.xml 536 BLAKE2B 0ec01f47f106656e1b98ca14d8b531597a34cfb2fd261c93c775d7dd3b0a08155e9e912a20a2330946697418898ed08d9be6f8409edb5e1ef6009cafddde2437 SHA512 4657f3ae892ad55572ac39f23cebcef58480d4ff608150c75d2cf3f0046b5e0a2861f9bf8dfffd45aef580675feae11a05297a7a99f63997d43ab703372ddf4a
diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
index 7c491a63d73b..51746c903f8d 100644
--- a/www-apps/postfixadmin/postfixadmin-3.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.1.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"
@@ -10,7 +10,7 @@ HOMEPAGE="http://postfixadmin.sourceforge.net"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+mysql postgres +vacation"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1bca12292afa..3375ee5d062f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c75a04a43768..76d4f36390ce 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,12 +16,12 @@ AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-63.0.3239.132.tar.xz 534286424 BLAKE2B 52658d4e8ff50bb8bdb1d397bc90a36e73407810198c4f28eea29bd0a4ad98bd4af947bdb8a5ecdbd73a248be8f375ba80c74c9a097aa57ef51eed1dc440ff95 SHA512 96e9ebdf1c3dc14a914bee50ced9547d5a94838ed602552379711ba67f00381173059ceb8a552efadd3175ceaa4cb6c15902fe582fc2eba7b7bdb8a19f47d1a0
 DIST chromium-64.0.3282.140.tar.xz 482252896 BLAKE2B 68d71353fca6f6022119baeeb4db42722d82a9f2d2c1738b372cc8d35b58ee5fada8af96b08ffc3599555b4f9f41be29eed2df3cc43ce4e5f3a94db07ac8efff SHA512 84a559e594d544ce3784b2d30831bd0cf4ef04896c0d107793b158f996aac0a41b731ed0c0fb751da2e06de7202df8235348468ff28fb4aef6e8cfb56ab0d89d
+DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
 DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
-EBUILD chromium-63.0.3239.132.ebuild 20062 BLAKE2B 5f3131a161c5993743a9294337ff5dd9a69aad085199367518ecfe461b92f51c4633a5e68ef9098b53121381e5ba28d9c8731871c54c5183f75bd5329e15b7a7 SHA512 b78f21944f38fa42883c51e2ffccbaa0e2ea07382b12964fc3104d9ff1a59511efd94b6954ff79f7025b535fe1655b4bde443ca794b950972e0682e5c431b37f
 EBUILD chromium-64.0.3282.140.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4
+EBUILD chromium-64.0.3282.167.ebuild 20383 BLAKE2B 8a4d61ebeddca6263a76dde876d9f90238279d095c74b8db75f2cbdacda534289f329d05e1269ec05fbcfc9a9c70a1ac4d453e04902d2f9f6e551e83161eaf65 SHA512 224ddaf94c439efe0e93f3f8f72659b60c8abc25d51277a5b1abe33dda4a7e6197046bf302f11870bc9c5161169f588ff5f58f43e829d665574cd48ab222398e
 EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
 EBUILD chromium-65.0.3315.3.ebuild 20513 BLAKE2B e32383801314add6f6997a26e0a11c091b38f8cc27e4ba974c8ba96a6a01707c67f9118a37204af993a15d3746755f0e504b17afda7a33be2dc98a9a75f33142 SHA512 27c13ce2174e0f0fff75b54946760fdc58976330e9c5ba2e52ccdf9bf5c3c9c8d4577db3246b6e754447af11d08ce7588f1957953920cee96b0e189540ca1ca3
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-63.0.3239.132.ebuild b/www-client/chromium/chromium-63.0.3239.132.ebuild
deleted file mode 100644
index 87915555ac0b..000000000000
--- a/www-client/chromium/chromium-63.0.3239.132.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-widevine-r1.patch"
-	"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/${PN}-gcc5-r4.patch"
-	"${FILESDIR}/${PN}-clang-r1.patch"
-	"${FILESDIR}/${PN}-webrtc-r0.patch"
-	"${FILESDIR}/${PN}-gcc5-r5.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/blink
-		third_party/boringssl
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/polymer
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
-	if tc-is-cross-compiler; then
-		local -x AR=${BUILD_AR}
-		local -x CC=${BUILD_CC}
-		local -x CXX=${BUILD_CXX}
-		local -x NM=${BUILD_NM}
-		local -x CFLAGS=${BUILD_CFLAGS}
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	einfo "Building GN..."
-	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	bootstrap_gn
-
-	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around circular dep issue
-	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
-	eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	if use widevine; then
-		# These will be provided by chrome-binary-plugins
-		rm out/Release/libwidevinecdm*.so || die
-	fi
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-64.0.3282.167.ebuild b/www-client/chromium/chromium-64.0.3282.167.ebuild
new file mode 100644
index 000000000000..1f79ba7bd6fa
--- /dev/null
+++ b/www-client/chromium/chromium-64.0.3282.167.ebuild
@@ -0,0 +1,679 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-cups-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-angle-r0.patch"
+	"${FILESDIR}/chromium-ffmpeg-r0.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288, #627356
+			die "At least gcc 5.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=false"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 2a454da97bf9..a0856e693aa8 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.140-1_amd64.deb 52849920 BLAKE2B 7f3dd44f40f527f1ed2de30427e677c3d2b1de87737b88ee53c159a792ef776dccf7a604347eb3ebcfc12d2de736b33b146e5a9a5a818928f464b300d5f883fa SHA512 8c9517d2023da4c1adb91678d284e195303fdd32f34b84d77d0c8166678ec2866791251e8c75ae86991fd004d438d6f36cefba5855c3a3a19db7829d7d48264c
-EBUILD google-chrome-beta-64.0.3282.140.ebuild 3613 BLAKE2B 6cc1c18348c2b1b286b67d08683a6360e629d572651fcbb4d413707d356954b47a72f8c432720d52ccec500eb40262465d8f514d5a033356fa6a9cb7923869ff SHA512 0a116bf5b178f5f8d1a5d3ac5de413174baba1b3ea08889992f421e4d41a29069ce3d1801262d9d664d736f433c1aefc53527cb485e77b924dfe463af30b01d9
+DIST google-chrome-beta_65.0.3325.51-1_amd64.deb 53278244 BLAKE2B 54159122dc7550f6fc62a75b8bf5ad325b0d835692de660810e7bf6b4b26d87959b8d987ace8f6e8a12f0aae5f0cf79bb33058d9240446ffedfb22c269228a8b SHA512 0ffc62319bba7964137d0d512b47d4f29e951fb122a099fff1dc60b94c4cf31f9554933f773f92296a312bc7d418566f5e94beeba09ac5554d649f3729a50d66
+EBUILD google-chrome-beta-65.0.3325.51.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.140.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.140.ebuild
deleted file mode 100644
index b6c1fbac0615..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.140.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-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
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.51.ebuild b/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.51.ebuild
new file mode 100644
index 000000000000..500479b752d3
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-65.0.3325.51.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+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
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 595424946125..44ff0b1d2044 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_65.0.3325.31-1_amd64.deb 53258960 BLAKE2B ef575913e3183d4ec16d95c0193d4024b0a59952b1aa933c0d2099410e0d3e13a331a5b00417bb7db79ed82f08c9923c2e367cdd08efadbb6f11f1b7a9f1e666 SHA512 792680c90bccd2ef3cd13d64ab26dda4559c5f724e5b4273e3128070a31ea6f553c555897062b5a932dfbf29d6691d174cc1b3426192656efa295e93d538f786
-EBUILD google-chrome-unstable-65.0.3325.31.ebuild 3592 BLAKE2B af60284f4aaacc4a596ee16638d6e5743e9da3d4c675c70fc1a23bb52a77ce4bc6244fcf33180ad56785636e7adcb1c7d2632b9a3e79183a8b12db097fc8f2ca SHA512 22dd0e15181c6f9ebd5fa0eba67198ea9fa6c68433ae95431b6e4477330273ec2571867bb648e867599bff6663818d0f56817e91018d3d99fdf2a939b46fa2ee
+DIST google-chrome-unstable_66.0.3343.3-1_amd64.deb 53156634 BLAKE2B 5bb22366c989619411fb3d1c758b02397e98a9710d3a2f59eb8394d00a80c9119be4e2958532070d2adca69905bb1ed893bd7802f6ddc35ae8894e99cb929103 SHA512 274b819faeaf19782be2042f1aba51076b95b2692ddf48f0b32a12cf9f9cc63182e499e0d59f9fa25fbe1c2fcf27bcfb637688b56b715e68998a8686cb46c818
+EBUILD google-chrome-unstable-66.0.3343.3.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3325.31.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3325.31.ebuild
deleted file mode 100644
index 83a0297e3596..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3325.31.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-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
-	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
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3343.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3343.3.ebuild
new file mode 100644
index 000000000000..43d5352b4dd5
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3343.3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+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
+	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
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 59f7722eb66b..df491ee33f1a 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-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
+DIST google-chrome-stable_64.0.3282.167-1_amd64.deb 51801914 BLAKE2B cb069aecc58cdc343450be4f592207139d2fea7d00a0ef7546cbb1ae4caa64bd9b1bb8ca3195c2d1ec89cd37d19e8772ddcb222669b607cd87bda1debbd9eca6 SHA512 d672f201b347f6de8cca159fbd46e8bd0233afd03735b2b785ed1f300cef66b9275372b057c678cc832b7485b74782c6bf0f75f6e31aefc4a5e12a1adf67b074
+EBUILD google-chrome-64.0.3282.167.ebuild 3609 BLAKE2B af5bc703e53acabf3360003c1b4e71e1e3f5e1d5fe57d9c63ea3a2ab7e87344e0146b369666c678c5bc6011dd407d14175757e84540bb608b0046fe89801a1b3 SHA512 d484e3674f6f72fe23a20b4e4734cfcdfb3a8630616e412cc299575df2e9ccb9397c3e0a919ccd5ae3290c3d460ae65047bd013847d436f2521f0a2630965b74
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome/google-chrome-64.0.3282.140.ebuild b/www-client/google-chrome/google-chrome-64.0.3282.140.ebuild
deleted file mode 100644
index aa34e5affa5b..000000000000
--- a/www-client/google-chrome/google-chrome-64.0.3282.140.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+plugins"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-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
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-
-Please notice the bundled flash player (PepperFlash).
-You can (de)activate all flash plugins via chrome://plugins
-"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/${PN}" || die
-	fi
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/google-chrome/google-chrome-64.0.3282.167.ebuild b/www-client/google-chrome/google-chrome-64.0.3282.167.ebuild
new file mode 100644
index 000000000000..38dbe68c340a
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-64.0.3282.167.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit readme.gentoo-r1 chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE="+plugins"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+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
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-frameworks/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/adwaita-icon-theme
+- x11-themes/tango-icon-theme
+
+Please notice the bundled flash player (PepperFlash).
+You can (de)activate all flash plugins via chrome://plugins
+"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use plugins ; then
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
+			-i "${CHROME_HOME}/${PN}" || die
+	fi
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index b02f60994d6f..346a331abc15 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,5 @@
 DIST links-2.14.tar.bz2 6535707 BLAKE2B e0a2f804e05fde94be50ee2dce1453c0c616aac29bd91a73f78b1976119aa5cfa8aa4b3df5e7feeb193bba74fbe3b32be50f4947babb4115a3e79835c2c241fb SHA512 d03b091957e0a2e06605fcf7c9bc56d48ebbcdc695f4ce894901540008455a9bc6544abdecd787faa041e2dbdff28b0d6ddcc9d26528d39d7d72750655c73575
 DIST links2_2.10-2.debian.tar.xz 13964 BLAKE2B 2de4e49281a53d37d3d9bc53b5e49c3bac534f3ba5d7a57748f3ef998e6ff7f5309b5d6c7a00f72d623525fc1413fc15d1585ffa84c186d684467539cb807cef SHA512 01101edef00ede0b95857ea28d305e98198306c428b79bb9c05da16285d8b4052b7f800f7def67a945d498db440745d81b7e3b6a03c9b077d5bcf5da1cb2691e
+EBUILD links-2.14-r1.ebuild 3272 BLAKE2B 6a52691bfb6a332be0f79579115750833584fe151227518b4e03a16ef3574a0bd605e062325c7d0da6a716063f4b7a8ca9edcd91c230ce67e6a1cce68f7b6c3c SHA512 c0183b8943c59df3b252d8df07753b66640c9b8c9a77c6fccc8db6eb10d43de7ceb9696cf9a94c38683bab08bf140ae788675c9eaa0654a855598f3246ea82ea
 EBUILD links-2.14.ebuild 3332 BLAKE2B e1aa4ff36c8765869b25a374ee8a854a8f34fa5235a29c2b1a6f18f212df87b82cc5906b71d378c60cd9f18ad1bfd584b99908bbbdfb238f246c9b8ce03218de SHA512 b2f55df94ffda2db4bcab87115ae8caa92da6e993cc05e903b5675eef2ec6dfba711b3fd899f945a57800226c4fd479ed548c296a4d10d3640abc740970e02ba
 MISC metadata.xml 345 BLAKE2B 5d91a968b8b9185cc9c61d02a1980369e5cf8c87bef6a5de4e05d3b375473548d3cbec311920d52cd7aad4517fbc2ddb2d900d520e5b1d2b3445e1424ac16662 SHA512 40528fd846439acf44ddf1e49a65d7195aecb6d78e9d20d3d734fbb48b4cef842975cbe8383a8feba6e6894ebe0fa6b7cbc27c1ac663cc563aa1e8884e09c7d9
diff --git a/www-client/links/links-2.14-r1.ebuild b/www-client/links/links-2.14-r1.ebuild
new file mode 100644
index 000000000000..7e7df3664596
--- /dev/null
+++ b/www-client/links/links-2.14-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg
+
+DEBIAN_REVISION=2.10-2
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="2"
+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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 fbcon gpm ipv6 jpeg libevent libressl livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	xdg_src_prepare
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with libevent) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_preinst() {
+	use X && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 8a8ef776637e..06e9ad81d524 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_52.0.2852.0_amd64.deb 53763992 BLAKE2B 2530aa7d2f0e1e8ce3f8e309c9c318003425db775bad0378f32cbf958110d9fab67190c69d0724cca0cc79f347038c21b65a281bc79d64f64f4ccea33d7a20f0 SHA512 cc2c2deaff565002a668f70ad175f2ae4d978e4c9a79453541d5b702f451f96668c09cb05efb6fdd899d84a15aae3b375bf0983adff7f659f57c9a522314e3ec
 DIST opera-developer_52.0.2857.0_amd64.deb 53543592 BLAKE2B c6808f382d1927b926797867dd5c36f23644a4fa576f81570cc4dc9ce43914a2ebb2192154dacc95e3d8e2f4aea60dad035f22a29b0a3f7ddd75eb42958ba3b6 SHA512 1002a0295dbf5741baa06d3631899766cf3e69d1deb23c6161a0055e04a7b38e14a22b0be51b68215ab80bac7eeeb6c0a1981bab53a0466fa1cc05de50d18dcf
-EBUILD opera-developer-52.0.2852.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+DIST opera-developer_52.0.2864.0_amd64.deb 53915986 BLAKE2B 05770bd42406359afa5c23c4dc1f92fc88d76e3a4634921054c9fe1fc5a2352ed08c5c79c5192b22a026575d1e38bfc59bc572c45a294618b55edd5b0fcf712e SHA512 92f97e8da4034bea1f04136dbe5715c6628c9cfaa910b6207db748a2184e855bca7de7dedb1f564e3d39a4b07ce8a931122ee3932daaaa984511efcaf0f083a3
 EBUILD opera-developer-52.0.2857.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
+EBUILD opera-developer-52.0.2864.0.ebuild 2316 BLAKE2B 8fbb8274e4ef03f9fca9382ade28d36524be58c1e16fecb33d7c90947f938e115e3f47bba5df7b07f145b15e3759df73bb6f2cc5729b4d327492e25f68429a72 SHA512 0199d19ab24caff2b35b700db1c75a8d0279bfa2612395c83572a43f3cfc49526501377cf9d2a1042843e999f451a3ceff13f381dbbcc9d3e6b2305b88531ff8
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-52.0.2852.0.ebuild b/www-client/opera-developer/opera-developer-52.0.2864.0.ebuild
index 12a41bce61c8..12a41bce61c8 100644
--- a/www-client/opera-developer/opera-developer-52.0.2852.0.ebuild
+++ b/www-client/opera-developer/opera-developer-52.0.2864.0.ebuild
diff --git a/www-client/phantomjs/Manifest b/www-client/phantomjs/Manifest
index 561bff00bb46..f0a2b4a8cccb 100644
--- a/www-client/phantomjs/Manifest
+++ b/www-client/phantomjs/Manifest
@@ -1,14 +1,8 @@
-AUX phantomjs-gcc5-compile-fix.patch 860 BLAKE2B ebfcae37b0fc84ea8080d9ec24783dd7baa2b57bc79bc32f6003bc3101c815603ef9276de7ce4a110fc5d26efa4033e0fe3bc55a6b46473682a552de1d4b4e5d SHA512 95838ebb8406fcecae852bca8ed95d8a18f194e2255603e1170c102ffdeb99d6134a34a3142e915437b71d845225676657ab28fb6ed8b744ddeafe75c83885c0
-AUX phantomjs-python3-udis86-itab.patch 664 BLAKE2B 6e12ad96e8489dfc4a1b1c221e1c160e04d7d3ab3fe5ce3e3b633e85063d13c3281dea22058421f9de79518e8f22c1e787adb71e971e272bc2cc455f32cdd43c SHA512 39f5803fe063953edb6fe848c2b12b3c2ba87224304ff49ad6798c8b3a9c7b99049ec24176efa54cf97c092fbfcce7c7676ef20e0ad16db1b86f69d158d972f2
 DIST gentoo-phantomjs-patchset-0.01.tar.bz2 7537 BLAKE2B 4a0fe19ae338ebb1846e2f04c3a6ea2f790d3835044d089304f7eba1d1f3bf0af41148d87b6f4a32103a5613cb1b470a8572189653bb3c38a64fb0c12e475feb SHA512 3e85fe068da41fa620ad89f9b0450fa7aa405778c2011d4b0f046edd9c921702125adf01075cd90d70cd21d9704081a67be18c1f9eece4070a26407a6a56a5df
 DIST gentoo-phantomjs-patchset-0.02.tar.bz2 8017 BLAKE2B 0bde29dab19ced08afeab0484e0d88f9fee35306ddba0aeda3cef158ad0f818a7f93f6d1462766399231513d1279dc1071bde4e82d82c67e156eaeb0c52d6f87 SHA512 88e8acb47842b108c4f01bc778c25d95011462b9d6732e6cca20372824a93321731d1976b19736a87d6e51737dffa0c76a15983d4b0739e97c7dc55ea065e791
-DIST phantomjs-1.9.8-source.zip 40965044 BLAKE2B f0ba4e7684539daf19b3f4c012ca680cbce8858ec1639714d14726e8234e4392d7239cd9f797471bdf3fdcf46ee81b006548891f645f5d71783a28a749c32616 SHA512 3692268a2706b097484ade500a2b24ce33d243b8ebbdf5ae8dea4b5e37adea5a84c11528e2862b9da71deb53cd14a985f1878d190a91c440632dd22cbfaf78fb
-DIST phantomjs-2.0.0-source.zip 110092872 BLAKE2B cbd27e1803801cfd8316effcf532f68fe03ce3ebee2b972c8ad2c909522e362b28d0054e73272d0eb0a1cb68a68a1942f2d04072b3e0524a8fa0fe84092ff6a9 SHA512 c8262353ee4daa842ef891b41e006baccf1815a99cf3262aeba457cfc37bbef6cb2ca234e69bd33a5446014fe802b3e35591e2eb0d49d8483c1f75bacf9d6f42
 DIST phantomjs-2.1.1.tar.gz 1880406 BLAKE2B e54e8a1d42cdbf6fb98c90283a0ebcb4145350bc34d76b8a0d01163fcca15b7e6bbf7043e2d17bbf21c5d01e7fd0e76a4386f9c01dfc8727998f8d0f17da9291 SHA512 07b769133957c5194c9afdaa347bd9a019ebe47653f98adf17a35d3dd12714d2f8e3773ced91d7d99f31cb18d7f73167022d5b0a3906d9aac0732ef96341f5ec
 DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 BLAKE2B 2fd956a2d8cb64e31bff107497191bc601048fe173fe3361a5baf3f5987c9dea035c9c1829595531c5d09eb5168acbabc10a361adea943e597daa781008212dd SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 BLAKE2B 74819c28ab00b09d090a77f10d5338e04381432130e0420cf006b8dba75da2426b047cf449a708343eae76e06a9230d962e724dc5d34f8c799947de2e5079581 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a
-EBUILD phantomjs-1.9.8.ebuild 1972 BLAKE2B fa8d56274e95fb425f003f9a4f74e21d0c46776e73695a817b29fc13f7ad331e50be3acfbf02da7549adc7c0755ced07392b3419d4875631f05e51ad44e1b4d5 SHA512 58cd58785d25d34aaebd091c73b8c50e4e8b974db1e77cf0cd4ec9929c07a54641f8bdcd825b1ad47a421b8dd91465b9aca65d9a2028b12e5445eea4c4a74fe2
-EBUILD phantomjs-2.0.0-r1.ebuild 2147 BLAKE2B 2604c350aa778d7dfa9b3f94170f178469459c052b40dc21736dcd61d8977b72f194994389a72936d91b8da11ba8d894a6a234fb48d1736ed9ad267282016dd3 SHA512 d8de3eb916fbd8219058c54c218bdc586df698bdb8e7bbcc7eed7de8c828e2c39771ee0c4d75ceeea62421f4d2bb8e6a2b35d1b91a07f29787d3f825842d7d96
 EBUILD phantomjs-2.1.1-r1.ebuild 2794 BLAKE2B 37c80004693ab37067d2bdee4168b30e1ce7ccf6e8c28f8a2abfad09bd1057b9987cd9b9f4093902a2b6a088e268a14bd83c0cfe8fd250c26e339dc799bce0ba SHA512 a526af772650a51ab635f7e714bda1449d0b43160107e306f55311d3305a345bf33e7873a2028378c7dccf954324383fbef4a740c2ee7c3f5fcab1d68fd572f9
 EBUILD phantomjs-2.1.1.ebuild 2794 BLAKE2B bd3410849ebbb936b26c844c10a77ca44fa0db2c74a599dea0b6483227f7fbccdacd44b013e23cdc139c3fa8b9196d5ba4404dc0d1db3c31a7c92cf7ffba3b7c SHA512 2e1f2a0bc357ab3e131c31a5c78ec7cf35284c19e9c714c3cf202c8a153b6d948eafff5e53fd95e54cafbce149044480f0d204db470bbfc124299c0a484cacab
 MISC metadata.xml 382 BLAKE2B 8f4b356d275737c3d790bdd8007f6edce0b9def238278ba810dcb4dc136738928aa2ed0e3a0f16fae2b9aeab18a3677bc452153381a50e82330bcd374f58323c SHA512 67e68f44de1b0a5554104a67d363c414ca0a03842633a0e08e9f1d8e30f8b0f19aea14185c0e791d945f047e319a137904f551058b37b5f7622bcafe343f82b5
diff --git a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch b/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
deleted file mode 100644
index 7191050f265b..000000000000
--- a/www-client/phantomjs/files/phantomjs-gcc5-compile-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp	2015-01-24 08:19:52.000000000 +0600
-+++ b/src/qt/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp	2015-09-24 18:18:45.598322592 +0600
-@@ -1909,6 +1909,11 @@
-     }
- }
- 
-+// Used in JSArray.cpp so we must instantiate explicit
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
-     VM& vm = exec->vm();
diff --git a/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch b/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
deleted file mode 100644
index 7c67e6b8ece0..000000000000
--- a/www-client/phantomjs/files/phantomjs-python3-udis86-itab.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py	2015-01-24 11:19:52.000000000 +0900
-+++ b/phantomjs-2.0.0/src/qt/qtwebkit/Source/JavaScriptCore/disassembler/udis86/itab.py	2015-03-17 16:20:04.580191055 +0900
-@@ -314,8 +314,7 @@
-         self.ItabH.write( "\n" )
- 
-         self.ItabH.write("\n/* itab entry operand definitions */\n");
--        operands = self.OperandDict.keys()
--        operands.sort()
-+        operands = sorted(self.OperandDict)
-         for o in operands:
-             self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" %
-                     (o, self.OperandDict[o][0] + ",", self.OperandDict[o][1]));
diff --git a/www-client/phantomjs/phantomjs-1.9.8.ebuild b/www-client/phantomjs/phantomjs-1.9.8.ebuild
deleted file mode 100644
index ba919e977952..000000000000
--- a/www-client/phantomjs/phantomjs-1.9.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs pax-utils multiprocessing
-
-DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
-HOMEPAGE="http://phantomjs.org/"
-SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/icu:=
-	dev-libs/openssl
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e '/^# CONFIG += text_breaking_with_icu/s:#::' \
-		src/qt/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri \
-		|| die
-
-	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
-	sed -i \
-		-e "/^SYSTEM_VARIABLES=/i \
-		CC='$(tc-getCC)'\n\
-		CXX='$(tc-getCXX)'\n\
-		CFLAGS='${CFLAGS}'\n\
-		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n\
-		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
-		src/qt/configure \
-		|| die
-
-	# Respect CC, CXX, LINK and *FLAGS in config.tests
-	find src/qt/config.tests/unix -name '*.test' -type f -exec \
-		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
-			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		{} + || die
-}
-
-src_compile() {
-	./build.sh \
-		--confirm \
-		--jobs $(makeopts_jobs) \
-		--qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
-		|| die
-}
-
-src_test() {
-	./bin/phantomjs test/run-tests.js || die
-}
-
-src_install() {
-	pax-mark m bin/phantomjs || die
-	dobin bin/phantomjs
-	dodoc ChangeLog README.md
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild b/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild
deleted file mode 100644
index f02650d96586..000000000000
--- a/www-client/phantomjs/phantomjs-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,83 +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"
-
-inherit eutils toolchain-funcs pax-utils multiprocessing ruby-single
-
-DESCRIPTION="A headless WebKit scriptable with a JavaScript API"
-HOMEPAGE="http://phantomjs.org/"
-SRC_URI="https://bitbucket.org/ariya/phantomjs/downloads/${P}-source.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples libressl"
-
-RDEPEND="dev-libs/icu:=
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/libpng:0=
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	${RUBY_DEPS}
-	net-misc/openssh[-bindist]
-	app-arch/unzip
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/phantomjs-python3-udis86-itab.patch"
-	epatch "${FILESDIR}/phantomjs-gcc5-compile-fix.patch"
-
-	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
-	sed -i \
-		-e "/^SYSTEM_VARIABLES=/i \
-		CC='$(tc-getCC)'\n\
-		CXX='$(tc-getCXX)'\n\
-		CFLAGS='${CFLAGS}'\n\
-		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n\
-		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
-		src/qt/qtbase/configure \
-		|| die
-
-	# Respect CC, CXX, LINK and *FLAGS in config.tests
-	find src/qt/qtbase/config.tests/unix -name '*.test' -type f -exec \
-		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
-			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		{} + || die
-}
-
-src_compile() {
-	./build.sh \
-		--confirm \
-		--jobs $(makeopts_jobs) \
-		--qt-config "$($(tc-getPKG_CONFIG) --cflags-only-I freetype2)" \
-		|| die
-}
-
-src_test() {
-	./bin/phantomjs test/run-tests.js || die
-}
-
-src_install() {
-	pax-mark m bin/phantomjs || die
-	dobin bin/phantomjs
-	dodoc ChangeLog README.md
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index a967289ece38..c6d0f5353d5e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,10 @@
-AUX vivaldi-snapshot-1.14.1072.3_p1-desktop.patch 347 BLAKE2B f54dcdac06c3011d0fd73d0b8c6576a94c77121c488aa103f856afa0cde4a0cf7c5f6249936fd189469179e14c05e192bce9f426e2c7f6f2978b5f8e2171b47a SHA512 946d7bb5875280a98fba1caf48174b3eb3891cc079879a5f76bc74d6f301064437faf6cbe65acbaa9c6528925e4741205bc8f64fb41ace379be9a8f1d39690a4
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 1271 BLAKE2B 51c020903f801608f2515df7f9efb125353d42b61e2126c8858d22237eccf21dcc1571b46be74dc65546544cb985b0d4f2e023ea23dd18ef336f5b3ea0f03eea SHA512 1fb9e60240ec5bdf8d422290c9676b3fd3c7dacd88a26b0bd5f19cd160e3ef63d46fd5697ed0798ed3fab9db79da76d9068d36f2760681b53dad89775e12aad4
-DIST vivaldi-snapshot-1.15.1090.3_p1-amd64.deb 53474510 BLAKE2B dc57070b1bd36ca8fd9b57676631468c8146ec7849cdfedf6b51118ea79cf287f354059be0af3a154c3a387d0029b73f08166624a28ba63fb7dcd0808bb8e332 SHA512 a2d937873ad6ad213a097c20bb063e3a9a582916a4b2b91a5b3f86c7db3c170f7455ba43b36cd5862580ddbc11494c1fd547e40c0a0538484008fca99991cb50
-DIST vivaldi-snapshot-1.15.1090.3_p1-armhf.deb 47271950 BLAKE2B 41df28f35809dd2dd252f92aeca8cf1dd71c00e71d1046b163b50aadb0ec6c2eeba369ef8d12eb3b970d3319ecb436df9b352ea66ec6254e7ba3a4ee363cdbe5 SHA512 1aacf2a66fed3d65cda72c0ab7982659afbed6705620853bb7f1e0e9430adcae1fb0679b0554cdf631339e0ab6c01c58499cc21a6d9b1de38b6c0b1727c1596d
-DIST vivaldi-snapshot-1.15.1090.3_p1-i386.deb 53030952 BLAKE2B e41461d06aec3d4741d764841dcc616aa0aa54e52b8a4865b655b28fb4f64e14d4c81977eb84ab63dfc345282d3ec2f50a8c872f6adad04f4a8042c5b1a95a20 SHA512 03fb4b93ad51708a34bfe78cb09325592c19159fba25182219442a83cc6240d97e2be4a59673e946c9b32c27bce04ed13bceb12b3033f71b8264ecc057ceaa35
 DIST vivaldi-snapshot-1.15.1094.3_p1-amd64.deb 53493344 BLAKE2B 9461a42a8c124cffca67eef511d571ec42bfda7a4b28a6fadca71b2ffe51027ce231fba103efc7a9883a6250dd9b00c0dc39cbe35c39722c90002538bb1d8eb2 SHA512 59f000ded4b7b38a1709975380d1ba53a2a419223559b5e0f9820197b275e11db142c9c9539576b40650ca8f4068cec66c879877c2700b23caf5b5e7bb37402e
 DIST vivaldi-snapshot-1.15.1094.3_p1-armhf.deb 47288992 BLAKE2B b4f43ff658ecdfa0e0f2d36fb3dea43f03e7b3f6cfced22dd4081031124df451cdb51c85818051b15b878b5a4c43c0fa2b020bb0a328fb0311e448d812150e93 SHA512 6f2c9a09a92459fd26d97a605a4b39af9f190162113164feb47028cf7176e0a3244613982b4e734513e1fce79707b47a99c6bed23cc45d8c7e2ceb7ea4834d98
 DIST vivaldi-snapshot-1.15.1094.3_p1-i386.deb 53039128 BLAKE2B 0a07cc1e97d9f76fe41ca7a73b6c7ee3e358b73ba54337f14166d2c61cf7de6eb4a6599b61b107ab063e005a3f91adc0e9df145d5aa0c6b1293f8c0e2c11a6d0 SHA512 93cdfe9c8359cc779c32c167a5453d46ecab3333cb33a2a2992fd4636cf4722b3cc58342180a6d782acd1eb25fa3bbe36895e941c2e5f8ee2dfd17b1090920f5
-EBUILD vivaldi-snapshot-1.15.1090.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
+DIST vivaldi-snapshot-1.15.1099.3_p1-amd64.deb 53496850 BLAKE2B 7b3d11970055876707729779511a05d58fc838247e392f9275c24a54a1a9fc781f38c11df57a60f59e5614e579565993a8e973d1a602e41221f85d1aac9dd683 SHA512 04c172ce69fc3ea293164c72acfb0fe8497773fc952ed4dcd305586a88aae06064d0c7e8e89ddeeecbcc20fe368c64486ded3cd2f1e714a4e78cf0d154d78db2
+DIST vivaldi-snapshot-1.15.1099.3_p1-armhf.deb 47287988 BLAKE2B 2aa23c15d0700c92aac6333400ea62b77647038e40a22141369735908be5b9c1478d5f66855c8130a553890b55e15db4cd3566183ac1ec064a4f4a6af1bce26a SHA512 6869c105ea623e08b9d68480dba03e94807cb0848e0d69c3432f61f7a9fd069de3553a5d26be49fd8286fea88b26b102079a75a6e9d1a0f37697286b4fb83c0b
+DIST vivaldi-snapshot-1.15.1099.3_p1-i386.deb 53044498 BLAKE2B 975bd2608dcb2a15c8963a4a6a333727fa9f57becc98ebbcbacf3ddee66439462947b70660c318727a99fb852013c00c6e61f54ea70a903ac9303e653dac182d SHA512 a39ec548b9fe5526df8140a8c724b52b34a38e4d02b32ed0f14cf1cef429392a39f244d978336c3cf7596be3db96bff421deb22adcc1c4e7e09b82f9839e2c4c
 EBUILD vivaldi-snapshot-1.15.1094.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
+EBUILD vivaldi-snapshot-1.15.1099.3_p1.ebuild 2631 BLAKE2B 1f736c60ee67e0dae5fbd7682d546f79609fcbf416bfa14cabad3d6cbace0c68469d3d9c30dd9c604a0b18ad7e9ed795f64c440adabb5914472b37f765986462 SHA512 d4fec030632f8c5eef4d47b525970f9d2b9671e3ed1afac95b34ec8790b15cd431a17abd8fc4346241f4cd6ac31309424bb057832732c3586c4b75128cdaec0c
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch
deleted file mode 100644
index aacf5f5e2eb8..000000000000
--- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/usr/share/applications/vivaldi-snapshot.desktop
-+++ b/usr/share/applications/vivaldi-snapshot.desktop
-@@ -111,4 +111,3 @@
- Type=Application
- Categories=Network;WebBrowser;
- MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
--Actions=new-window;new-private-window;
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1090.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1099.3_p1.ebuild
index ee9ad44cb619..ee9ad44cb619 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1090.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1099.3_p1.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2eaafe4c67cd..a77f7824020b 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 61ea1520806c..8890633f3dcf 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.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.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
+DIST google-chrome-beta_65.0.3325.51-1_amd64.deb 53278244 BLAKE2B 54159122dc7550f6fc62a75b8bf5ad325b0d835692de660810e7bf6b4b26d87959b8d987ace8f6e8a12f0aae5f0cf79bb33058d9240446ffedfb22c269228a8b SHA512 0ffc62319bba7964137d0d512b47d4f29e951fb122a099fff1dc60b94c4cf31f9554933f773f92296a312bc7d418566f5e94beeba09ac5554d649f3729a50d66
+DIST google-chrome-stable_64.0.3282.167-1_amd64.deb 51801914 BLAKE2B cb069aecc58cdc343450be4f592207139d2fea7d00a0ef7546cbb1ae4caa64bd9b1bb8ca3195c2d1ec89cd37d19e8772ddcb222669b607cd87bda1debbd9eca6 SHA512 d672f201b347f6de8cca159fbd46e8bd0233afd03735b2b785ed1f300cef66b9275372b057c678cc832b7485b74782c6bf0f75f6e31aefc4a5e12a1adf67b074
+DIST google-chrome-unstable_66.0.3343.3-1_amd64.deb 53156634 BLAKE2B 5bb22366c989619411fb3d1c758b02397e98a9710d3a2f59eb8394d00a80c9119be4e2958532070d2adca69905bb1ed893bd7802f6ddc35ae8894e99cb929103 SHA512 274b819faeaf19782be2042f1aba51076b95b2692ddf48f0b32a12cf9f9cc63182e499e0d59f9fa25fbe1c2fcf27bcfb637688b56b715e68998a8686cb46c818
+EBUILD chrome-binary-plugins-64.0.3282.167.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
+EBUILD chrome-binary-plugins-65.0.3325.51_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-66.0.3343.3_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.140.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.167.ebuild
index c62a441fcb51..c62a441fcb51 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.167.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.51_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.140_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.51_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.31_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3343.3_alpha.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.31_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3343.3_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 30ea9541ede5..111be4c582dc 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 08a9fc1e4be8..2274240f68bd 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,8 +1,4 @@
 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60
-AUX http_echo-nginx-1.11.11+.patch 1920 BLAKE2B 749ed5aa9347eac26f1cd2cc8432f8629a3434d81bc4818c583f746846a064500df6fdec1aef111a9e32f0aa6fdd3b77fb6cdb27e7ed9d166fa8aba8352f2c0b SHA512 fb86dd9a17a1ed6d99609a9e024971749569bfa108e1bae86e9e9f72792e2e6767ad710330bcc81cc67deca7fdaabe8dbb63a5ae3a519481c8ffab1e8c446f34
-AUX http_lua_nginx-1.11.11+-r1.patch 6790 BLAKE2B 314c7885d3b78196c2acecd18a771e915801a63b815a106027dec418dda1575db7c3ee0749e84ef71f90e503510316f419db7a72392d667c8df3550a612cfbb6 SHA512 bbd9f97d598482212887ebfa62b6037e2c5d89087ff761925399ef3ff6a35970a88b42e4d59f54ee59fd5402b37a40640599257e61bcb9ac49ec7fa857a674f2
-AUX http_security-pr_1158.patch 3045 BLAKE2B 597e51ed2dc783003fa700677062f6e7bb5d564d25a9bf6a811e2e0a109a6d733508e44e5e6c71ea1971ee1b86cb0eea462ea2243e78304055db12235df005be SHA512 7bb5a1c1feabd81279b7fb40df470b0d496f68b7c45e72d26afe1ef4c911de979ea9f5f30c5cbfe93b05971232885246bfab807d04f6943f772118af21ecf4ab
-AUX http_security-pr_1373.patch 1185 BLAKE2B 767f5ede1bfc4cf7fc242408426bdc423e62b3a7dcff0e314f6d11692e7712cacafdd5e01651818b715fe3d3fdf9c48283e8880e99bac25475aa88d2265a20b5 SHA512 7b2e6d0606cfa40a7851f85d8295cb62e4e00cf895b0ad78f52ac636d8efed4bae748c0c3437144d5f9a0a12ffd5ac897be1d679435780e5f753c2409e0ee4c8
 AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9
 AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
diff --git a/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch b/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch
deleted file mode 100644
index d4f3db808098..000000000000
--- a/www-servers/nginx/files/http_echo-nginx-1.11.11+.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d16babcc09050966f5055df41572429bd84d811a Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 08:43:30 +0300
-Subject: [PATCH] fixed build with nginx/1.11.11
-
-Closes openresty/echo-nginx-module#64
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_echo_request_info.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/ngx_http_echo_request_info.c b/src/ngx_http_echo_request_info.c
-index d28ec4d..27b3c52 100644
---- a/src/ngx_http_echo_request_info.c
-+++ b/src/ngx_http_echo_request_info.c
-@@ -179,6 +179,9 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     ngx_int_t                    i, j;
-     ngx_buf_t                   *b, *first = NULL;
-     unsigned                     found;
-+#if defined(nginx_version) && nginx_version >= 1011011
-+    ngx_chain_t                 *cl;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *mr;
-     ngx_http_connection_t       *hc;
-@@ -215,8 +218,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
- 
-     if (hc->nbusy) {
-         b = NULL;
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+         for (cl = hc->busy; cl; /* void */) {
-+             b = cl->buf;
-+             cl = cl->next;
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (first == NULL) {
-                 if (mr->request_line.data >= b->pos
-@@ -280,8 +290,15 @@ ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
-     }
- 
-     if (hc->nbusy) {
-+
-+#if defined(nginx_version) && nginx_version >= 1011011
-+         for (cl = hc->busy; cl; /* void */) {
-+             b = cl->buf;
-+             cl = cl->next;
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {
diff --git a/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch b/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch
deleted file mode 100644
index 2a61c03b2008..000000000000
--- a/www-servers/nginx/files/http_lua_nginx-1.11.11+-r1.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 0459a285ca0159d45e73da8bd1164edb5c57cde3 Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Wed, 22 Mar 2017 07:50:57 +0300
-Subject: [PATCH] feature: nginx 1.11.11+ can now build with this module.
-
-Note: nginx 1.11.11+ are still not an officially supported target yet.
-More work needed.
-
-Closes openresty/lua-nginx-module#1016
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- src/ngx_http_lua_common.h  |  6 ++++
- src/ngx_http_lua_headers.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
- src/ngx_http_lua_headers.h |  3 ++
- src/ngx_http_lua_module.c  | 13 ++++++++-
- 4 files changed, 89 insertions(+), 1 deletion(-)
-
-diff --git a/src/ngx_http_lua_common.h b/src/ngx_http_lua_common.h
-index 079a4dc..f37d776 100644
---- a/src/ngx_http_lua_common.h
-+++ b/src/ngx_http_lua_common.h
-@@ -199,6 +199,12 @@ struct ngx_http_lua_main_conf_s {
-                                                 of reqeusts */
-     ngx_uint_t           malloc_trim_req_count;
- 
-+#if nginx_version >= 1011011
-+    /* the following 2 fields are only used by ngx.req.raw_headers() for now */
-+    ngx_buf_t          **busy_buf_ptrs;
-+    ngx_int_t            busy_buf_ptr_count;
-+#endif
-+
-     unsigned             requires_header_filter:1;
-     unsigned             requires_body_filter:1;
-     unsigned             requires_capture_filter:1;
-diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
-index 2392598..6700ce8 100644
---- a/src/ngx_http_lua_headers.c
-+++ b/src/ngx_http_lua_headers.c
-@@ -26,6 +26,9 @@ static int ngx_http_lua_ngx_req_get_headers(lua_State *L);
- static int ngx_http_lua_ngx_req_header_clear(lua_State *L);
- static int ngx_http_lua_ngx_req_header_set(lua_State *L);
- static int ngx_http_lua_ngx_resp_get_headers(lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- static int
-@@ -77,6 +80,11 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     size_t                       size;
-     ngx_buf_t                   *b, *first = NULL;
-     ngx_int_t                    i, j;
-+#if nginx_version >= 1011011
-+    ngx_buf_t                  **bb;
-+    ngx_chain_t                 *cl;
-+    ngx_http_lua_main_conf_t    *lmcf;
-+#endif
-     ngx_connection_t            *c;
-     ngx_http_request_t          *r, *mr;
-     ngx_http_connection_t       *hc;
-@@ -93,6 +101,10 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-         return luaL_error(L, "no request object found");
-     }
- 
-+#if nginx_version >= 1011011
-+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-+#endif
-+
-     ngx_http_lua_check_fake_request(L, r);
- 
-     mr = r->main;
-@@ -109,8 +121,13 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("hc->nbusy: %d", (int) hc->nbusy);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos,
-+           hc->busy->buf->last, hc->busy->buf->end);
-+#else
-         dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos,
-            hc->busy[0]->last, hc->busy[0]->end);
-+#endif
-     }
- 
-     dd("request line: %p %p", mr->request_line.data,
-@@ -146,9 +163,37 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     dd("size: %d", (int) size);
- 
-     if (hc->nbusy) {
-+#if nginx_version >= 1011011
-+        if (hc->nbusy > lmcf->busy_buf_ptr_count) {
-+            if (lmcf->busy_buf_ptrs) {
-+                ngx_free(lmcf->busy_buf_ptrs);
-+            }
-+
-+            lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
-+                                            r->connection->log);
-+
-+            if (lmcf->busy_buf_ptrs == NULL) {
-+                return luaL_error(L, "no memory");
-+            }
-+
-+            lmcf->busy_buf_ptr_count = hc->nbusy;
-+        }
-+
-+        bb = lmcf->busy_buf_ptrs;
-+        for (cl = hc->busy; cl; cl = cl->next) {
-+            *bb++ = cl->buf;
-+        }
-+#endif
-         b = NULL;
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy; i > 0; i--) {
-+            b = bb[i - 1];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start),
-                b->start);
-@@ -223,8 +268,15 @@ ngx_http_lua_ngx_req_raw_header(lua_State *L)
-     }
- 
-     if (hc->nbusy) {
-+
-+#if nginx_version >= 1011011
-+        bb = lmcf->busy_buf_ptrs;
-+        for (i = hc->nbusy - 1; i >= 0; i--) {
-+            b = bb[i];
-+#else
-         for (i = 0; i < hc->nbusy; i++) {
-             b = hc->busy[i];
-+#endif
- 
-             if (!found) {
-                 if (b != first) {
-@@ -1431,4 +1483,20 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
- #endif /* NGX_LUA_NO_FFI_API */
- 
- 
-+#if nginx_version >= 1011011
-+void
-+ngx_http_lua_ngx_raw_header_cleanup(void *data)
-+{
-+    ngx_http_lua_main_conf_t  *lmcf;
-+
-+    lmcf = (ngx_http_lua_main_conf_t *) data;
-+
-+    if (lmcf->busy_buf_ptrs) {
-+        ngx_free(lmcf->busy_buf_ptrs);
-+        lmcf->busy_buf_ptrs = NULL;
-+    }
-+}
-+#endif
-+
-+
- /* vi:set ft=c ts=4 sw=4 et fdm=marker: */
-diff --git a/src/ngx_http_lua_headers.h b/src/ngx_http_lua_headers.h
-index 39f1114..ee4d21c 100644
---- a/src/ngx_http_lua_headers.h
-+++ b/src/ngx_http_lua_headers.h
-@@ -15,6 +15,9 @@
- void ngx_http_lua_inject_resp_header_api(lua_State *L);
- void ngx_http_lua_inject_req_header_api(lua_State *L);
- void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L);
-+#if nginx_version >= 1011011
-+void ngx_http_lua_ngx_raw_header_cleanup(void *data);
-+#endif
- 
- 
- #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */
-diff --git a/src/ngx_http_lua_module.c b/src/ngx_http_lua_module.c
-index 3dc2817..875f933 100644
---- a/src/ngx_http_lua_module.c
-+++ b/src/ngx_http_lua_module.c
-@@ -28,6 +28,7 @@
- #include "ngx_http_lua_ssl_certby.h"
- #include "ngx_http_lua_ssl_session_storeby.h"
- #include "ngx_http_lua_ssl_session_fetchby.h"
-+#include "ngx_http_lua_headers.h"
- 
- 
- static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
-@@ -624,7 +625,7 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     volatile ngx_cycle_t       *saved_cycle;
-     ngx_http_core_main_conf_t  *cmcf;
-     ngx_http_lua_main_conf_t   *lmcf;
--#ifndef NGX_LUA_NO_FFI_API
-+#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011
-     ngx_pool_cleanup_t         *cln;
- #endif
- 
-@@ -716,6 +717,16 @@ ngx_http_lua_init(ngx_conf_t *cf)
-     cln->handler = ngx_http_lua_sema_mm_cleanup;
- #endif
- 
-+#if nginx_version >= 1011011
-+    cln = ngx_pool_cleanup_add(cf->pool, 0);
-+    if (cln == NULL) {
-+        return NGX_ERROR;
-+    }
-+
-+    cln->data = lmcf;
-+    cln->handler = ngx_http_lua_ngx_raw_header_cleanup;
-+#endif
-+
-     if (lmcf->lua == NULL) {
-         dd("initializing lua vm");
- 
diff --git a/www-servers/nginx/files/http_security-pr_1158.patch b/www-servers/nginx/files/http_security-pr_1158.patch
deleted file mode 100644
index 92f1094c2434..000000000000
--- a/www-servers/nginx/files/http_security-pr_1158.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 2fa8ffea68498e02005e85c27e61bde30718ae3b Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:18:17 +0200
-Subject: [PATCH 1/2] configure: Fix detection whether libcurl is linked
- against gnutls
-
-The find_curl macro is also checking whether libcurl is linked against
-gnutls. However the check depends on "CURL_LIBS" which wasn't defined
-by the macro.
-
-This commit will define "CURL_LIBS" so that the check works as expected.
----
- build/find_curl.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/find_curl.m4 b/build/find_curl.m4
-index 6b23ad6..3310e40 100644
---- a/build/find_curl.m4
-+++ b/build/find_curl.m4
-@@ -2,6 +2,7 @@ dnl Check for CURL Libraries
- dnl CHECK_CURL(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
- dnl Sets:
- dnl  CURL_CFLAGS
-+dnl  CURL_LDADD
- dnl  CURL_LIBS
- 
- CURL_CONFIG=""
-@@ -57,7 +58,8 @@ if test -n "${curl_path}"; then
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi
-     CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi
--    CURL_LDADD="`${CURL_CONFIG} --libs`"
-+    CURL_LIBS="`${CURL_CONFIG} --libs`"
-+    CURL_LDADD="${CURL_LIBS}"
-     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi
- 
-     dnl # Check version is ok
-
-From 67f98e7da04251a40a0172e3dfac2c5a6ac6f7dd Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 11 Jun 2016 16:48:58 +0200
-Subject: [PATCH 2/2] configure: Move verbose_output declaration up to the
- beginning
-
-Macros like "find_curl" are using "verbose_output" variable but because some
-of them are called before we define the variable we are seeing errors like
-
-  ./configure: line 13855: test: : integer expression expected
-
-This commit will fix the problem by moving the "verbose_output" declaration
-up to the beginning so that the variable is available for every macro.
----
- configure.ac | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7517885..0f32b01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,22 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
- 
- ### Configure Options
- 
-+# Verbose output
-+AC_ARG_ENABLE(verbose-output,
-+              AS_HELP_STRING([--enable-verbose-output],
-+                             [Enable more verbose configure output.]),
-+[
-+  if test "$enableval" != "no"; then
-+    verbose_output=1
-+  else
-+    verbose_output=0
-+  fi
-+],
-+[
-+  verbose_output=0
-+])
-+
-+
- #OS type
- 
- AC_CANONICAL_HOST
-@@ -410,20 +426,6 @@ AC_ARG_ENABLE(errors,
-   report_errors=1
- ])
- 
--# Verbose output
--AC_ARG_ENABLE(verbose-output,
--              AS_HELP_STRING([--enable-verbose-output],
--                             [Enable more verbose configure output.]),
--[
--  if test "$enableval" != "no"; then
--    verbose_output=1
--  else
--    verbose_output=0
--  fi
--],
--[
--  verbose_output=0
--])
- 
- # Strict Compile
- AC_ARG_ENABLE(strict-compile,
diff --git a/www-servers/nginx/files/http_security-pr_1373.patch b/www-servers/nginx/files/http_security-pr_1373.patch
deleted file mode 100644
index e4069e16330d..000000000000
--- a/www-servers/nginx/files/http_security-pr_1373.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d19df159043106a4d6dfd113696900b5b0dae24b Mon Sep 17 00:00:00 2001
-From: Andrei Belov <defanator@gmail.com>
-Date: Mon, 3 Apr 2017 12:52:01 +0300
-Subject: [PATCH] Fix building with nginx >= 1.11.11
-
-Closes SpiderLabs/ModSecurity#1359
-
-See also:
-http://hg.nginx.org/nginx/rev/e662cbf1b932
----
- nginx/modsecurity/ngx_http_modsecurity.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/nginx/modsecurity/ngx_http_modsecurity.c b/nginx/modsecurity/ngx_http_modsecurity.c
-index 7c13953..367b2b8 100644
---- a/nginx/modsecurity/ngx_http_modsecurity.c
-+++ b/nginx/modsecurity/ngx_http_modsecurity.c
-@@ -528,9 +528,15 @@ ngx_http_modsecurity_save_request_body(ngx_http_request_t *r)
- 
-         hc = r->http_connection;
- 
-+#if defined(nginx_version) && nginx_version >= 1011011
-+        if (hc->free && size == cscf->large_client_header_buffers.size) {
-+
-+            buf = hc->free->buf;
-+#else
-         if (hc->nfree && size == cscf->large_client_header_buffers.size) {
- 
-             buf = hc->free[--hc->nfree];
-+#endif
- 
-             ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                            "ModSecurity: use http free large header buffer: %p %uz",
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f7793e6c3d61..afcc410a0807 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,32 +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-8.5.28-build.xml.patch 10464 BLAKE2B 658ee0da1b8ae96dd40df7345cf9efea24e409eaa4024f5bcf695bb1f91811b6513f31f70fbd0899040aa23314a2725d2871dc42e81977cd184de6a86a4fddc3 SHA512 5f7f25eae6c5f7e9ca943800b48bea084e7279110d73fa7a54bfc89eabfc617cd82a36f3634aaa9d14580e9d2bf9115214d6cde663b38545f1a3977f597b14e1
 AUX tomcat-9.0.4-build.xml.patch 10464 BLAKE2B e3a8ca895f310fe91f759f558927761a307425bd373695b00eda0d642f98fdf4f8b7d5abe7070fa02ba7eaef506c59ce6e56a47602bce657c05320ccf5766292 SHA512 d055cfa4d947873a0e5541f7679bc1f52fae5196ab00e8c46eb011cb6373dbefa3c29721d3fda0d5b18b7bc961ffc1305d2766fdf088e3db2ee5c6bf5dc1c9b1
+AUX tomcat-9.0.5-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-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
+DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
 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.48.ebuild 4471 BLAKE2B e644b15681482a9a89e0f8f598f6a4344824ed616302e9d76d86fc556a6c8d0cae243c163cab00797afe63d064fddb74b8721763646bbd62933a8a3b49935cfb SHA512 f9d2c7a69c10474acf5379ccb53f029d493987c204bb3cb1e2a2351e2b312196aad5743e961f9863c28ad95786239b2afd0ce79a18b56ae3271bf0fc533b5a94
 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.24.ebuild 4519 BLAKE2B 6a298cd733ce5cb37928a8fa8b3fb86be1811222c90edf6265bf91fd3b3320578ff694a092283b07b7c55b2b2cafaff9faf3a49ec553754f50dffe24721732a5 SHA512 dd929c7657a1b3496ce321e3dc9bfa2b0c135b3c9e2257387b6e1bbbb6d490b8dd835e3d2ab0d883f3059854fd762f65808a8a7e69111c5940d885011b1e9ae5
 EBUILD tomcat-8.5.27.ebuild 4520 BLAKE2B dd196056f5a9573c3a96ade1d2002d8c2941d7184fabadc08679f5cc3f4c22251c1f7e33e98aacde15e8f9d24fece6e0a82dc9389c1ff0145ae8fe2369cb0770 SHA512 9090868c52a1b844202618651eab855e9e7ef48fcb5f6b0ad546c9c223d4835ca3cb3047e44906298312359d3cabd54d7a19c1e02c9b19b361e8e6431536a43d
+EBUILD tomcat-8.5.28.ebuild 4520 BLAKE2B dd196056f5a9573c3a96ade1d2002d8c2941d7184fabadc08679f5cc3f4c22251c1f7e33e98aacde15e8f9d24fece6e0a82dc9389c1ff0145ae8fe2369cb0770 SHA512 9090868c52a1b844202618651eab855e9e7ef48fcb5f6b0ad546c9c223d4835ca3cb3047e44906298312359d3cabd54d7a19c1e02c9b19b361e8e6431536a43d
 EBUILD tomcat-9.0.4.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
+EBUILD tomcat-9.0.5.ebuild 4500 BLAKE2B 0b9a6f855b524697ba5c99d96600eb479e140d03a6719b148c17870188c76f63cf71d829a3f277b16e8804aa839380692842354b2e8196d234102d54f80a433e SHA512 7c27fbeddc1a1e1ddeb1630a722473c6f8d29ef43f62c63490f643e2cad12288f0d6fbfcd71629fd18eb1b350dace1db2f3e61169cad34915e943060dd025cb7
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
deleted file mode 100644
index b0862aef305e..000000000000
--- a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml
-index 6b4465a..ab4008d 100644
---- a/apache-tomcat-8.0.47-src/build.xml
-+++ b/apache-tomcat-8.0.47-src/build.xml
-@@ -715,24 +715,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}"
-@@ -1000,14 +1005,14 @@
- 
-   <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/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <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
-@@ -1613,7 +1620,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}"/>
-@@ -1752,7 +1759,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}"/>
-@@ -1947,6 +1954,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"
-@@ -2008,6 +2016,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"
-@@ -2046,9 +2055,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/"/>
-@@ -2781,7 +2792,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">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2815,7 +2826,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}"/>
-@@ -2872,7 +2883,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="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2898,18 +2909,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}"/>
-@@ -2921,7 +2932,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}"/>
-@@ -2940,7 +2951,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}"/>
-@@ -2951,7 +2962,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}"/>
-@@ -2969,7 +2980,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}"/>
-@@ -2979,7 +2990,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}"/>
-@@ -3002,7 +3013,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>
-@@ -3013,7 +3024,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>
-@@ -3024,7 +3035,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.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
deleted file mode 100644
index d83440c0c4d6..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml
-index b1b2666..263800c 100644
---- a/apache-tomcat-8.5.23-src/build.xml
-+++ b/apache-tomcat-8.5.23-src/build.xml
-@@ -714,24 +714,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,14 +1010,14 @@
- 
-   <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/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <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
-@@ -1608,7 +1615,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}"/>
-@@ -1756,6 +1763,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"
-@@ -1820,6 +1828,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"
-@@ -1860,9 +1869,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/"/>
-@@ -2607,7 +2618,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">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2641,7 +2652,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}"/>
-@@ -2698,7 +2709,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="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-@@ -2724,18 +2735,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}"/>
-@@ -2747,7 +2758,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}"/>
-@@ -2766,7 +2777,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}"/>
-@@ -2777,7 +2788,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}"/>
-@@ -2795,7 +2806,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}"/>
-@@ -2805,7 +2816,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}"/>
-@@ -2828,7 +2839,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>
-@@ -2839,7 +2850,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>
-@@ -2850,7 +2861,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.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch
new file mode 100644
index 000000000000..e08dd17c6cc3
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.28-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/files/tomcat-9.0.5-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
new file mode 100644
index 000000000000..87f869dd4c0c
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/build.xml b/build.xml
+index c1331c9..b664cc3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -719,24 +719,30 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 4.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.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}"
+@@ -1012,9 +1018,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">
+@@ -1074,7 +1080,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" />
+@@ -1108,7 +1114,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}"
+@@ -1123,7 +1129,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}"
+@@ -1227,9 +1233,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
+@@ -1612,7 +1620,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}"/>
+@@ -1752,11 +1760,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.
+@@ -1766,6 +1775,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"
+@@ -1830,6 +1840,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"
+@@ -1870,9 +1881,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/8/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2617,7 +2630,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 +2650,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 +2707,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 +2747,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 +2770,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 +2789,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 +2800,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 +2818,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 +2828,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 +2851,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 +2862,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 +2873,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-8.0.47.ebuild b/www-servers/tomcat/tomcat-8.0.47.ebuild
deleted file mode 100644
index 0275eef00644..000000000000
--- a/www-servers/tomcat/tomcat-8.0.47.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.0.48.ebuild b/www-servers/tomcat/tomcat-8.0.48.ebuild
index 424ec1de47d9..3af577f397b6 100644
--- a/www-servers/tomcat/tomcat-8.0.48.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.48.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 @@ 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"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.23.ebuild b/www-servers/tomcat/tomcat-8.5.23.ebuild
deleted file mode 100644
index dce4c263018c..000000000000
--- a/www-servers/tomcat/tomcat-8.5.23.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/www-servers/tomcat/tomcat-8.5.24.ebuild b/www-servers/tomcat/tomcat-8.5.24.ebuild
index b00d9e34c116..959e4f90437e 100644
--- a/www-servers/tomcat/tomcat-8.5.24.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.24.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 @@ 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"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild
new file mode 100644
index 000000000000..17a74d0fb02b
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.28.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/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild
new file mode 100644
index 000000000000..bb86ba9675bc
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.5.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-${PN}-${PV}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+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="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.8
+	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/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index d511b255284d..e5dcffda6b93 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -4,6 +4,7 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.15.tar.gz 794926 BLAKE2B 0bda44697d3e5f5fedb977d757fb418bb7064e0a5995448513c2c427d2c2694cf7242f76f516208d0ed5f6d3db3b1a157bb6992a714fea3a370d3a767fc67e60 SHA512 1a2a82cf99d3e6dfe62fa18fd6f04afd1dc727d61287a1c9f47f1448e76a4858dfd59286118c94672c84ff22bcd8444c0c1568ae46993fdbdb9414ad60474bf4
-EBUILD uwsgi-2.0.15-r2.ebuild 12847 BLAKE2B 716cc240f85411eff6f76e6795c6c2264ed178262a29210d8560226098cbfa0a04b95c9120259593b04fa20065a8f5e016d185e2d557c0036c166b33ee2ba2a3 SHA512 fd115a50f1b0077812a0e4b88a5940add6b12f6a744188920e814539f4be5a775b00b7fca4af9e0e703ae64580cbe0bb54ea7292434aa43d01ef06afb9fa3f86
-EBUILD uwsgi-2.0.15.ebuild 12659 BLAKE2B a9780429463f47ea09054cfb9029df521b434d1055054389270644ec9384afec9c660822c655ef8fe36c242d21266fcd71524e96ef4af2ced55457792cbe1a59 SHA512 d870f86ca5225ae9807fbf679f77a1d44b01bbced6700a743b5bc734e7092752209066c1839a03514a60a8c7277626fa8e047fbfc949dc148c730582b40ef432
+DIST uwsgi-2.0.16.tar.gz 798509 BLAKE2B a50c46dcd571d9242d7fde49b052b3c8a0cc341b2301ea86252b3b684c738ba1142c9ab36e7a4e7313a95f87186c38770320f3ffa517724c63c5016cc97ed7cc SHA512 2f80da366e463971400648fc8dcc9d7a5b51f03cba0b1ce08ff9e8ed75f0955e2014c84892d9991bd7a6f6a4a6b4ac819477f8e4afeded258d3147b5becb2e77
+EBUILD uwsgi-2.0.15-r2.ebuild 12846 BLAKE2B 90fcbf6300de611aa3d7c930dd94c4a55c175656e2bbcdcc606e1b77df1b2e481fb31beedbb20b33db0bc3c4b0e8338661fd471ae7a088a5eaa386b66c4b9b39 SHA512 7940ac487b2ab57bca5790836c40e604fe5129449aac5d6de474f31a4fb1357ce0b724647e73639e2b3f062f0a9243106d352d2413424408f30c44ec9c3e59b4
+EBUILD uwsgi-2.0.16.ebuild 12848 BLAKE2B b85660cc15fcb6673389974e1dcaefef4a57169be0d216a0a862b6776f551bcd5409eb25316d8bd6a619ac305b8739c4d409ce12e71297ff5f51cecad000609c SHA512 eac54b30cb1b5caa87adc87e0c64dcb5492c15e1acb24c7fffa676e69269e752b83785e5c9c09d9ee6fc85da052e0d9cce7952fc828ef7445d47b1a7eb35373c
 MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
diff --git a/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
index 247957d8aec5..1ffb13273bce 100644
--- a/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
diff --git a/www-servers/uwsgi/uwsgi-2.0.15.ebuild b/www-servers/uwsgi/uwsgi-2.0.15.ebuild
deleted file mode 100644
index f77a797cdf9d..000000000000
--- a/www-servers/uwsgi/uwsgi-2.0.15.ebuild
+++ /dev/null
@@ -1,413 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22 ruby23"
-
-PHP_EXT_INI="no"
-PHP_EXT_NAME="dummy"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php5-6 php7-0" # deps must be registered separately below
-
-MY_P="${P/_/-}"
-
-inherit apache-module eutils flag-o-matic multilib pax-utils php-ext-source-r2 python-r1 ruby-ng versionator
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
-	http ugreen signal syslog rsyslog
-	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
-	{core,fast,raw,ssl}router
-	redislog mongodblog log{file,socket}
-	spooler cheaper_busyness symcall
-	transformation_{chunked,gzip,offload,tofile}
-	zergpool )
-UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
-	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
-	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
-	rados router_{access,radius,spnego,xmldir}
-	sqlite ssi stats_pusher_statsd
-	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
-
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby )
-
-# plugins to be ignored (for now):
-# cheaper_backlog2: example plugin
-# coroae: TODO
-# cplusplus: partially example code, needs explicit class
-# dummy: no idea
-# example: example plugin
-# exception_log: example plugin
-# *java*: TODO
-# v8: TODO
-# matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
-
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
-
-REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
-	uwsgi_plugins_logcrypto? ( ssl )
-	uwsgi_plugins_sslrouter? ( ssl )
-	routing? ( pcre )
-	uwsgi_plugins_emperor_zeromq? ( zeromq )
-	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
-	uwsgi_plugins_router_xmldir? ( xml )
-	pypy? ( python_targets_python2_7 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	python_asyncio? ( python_targets_python3_4 python_gevent )
-	python_gevent? ( python )
-	expat? ( xml )"
-
-# util-linux is required for libuuid when requesting zeromq support
-# Order:
-# 1. Unconditional
-# 2. General features
-# 3. Plugins
-# 4. Language/app support
-CDEPEND="sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	json? ( !yajl? ( dev-libs/jansson )
-		yajl? ( dev-libs/yajl ) )
-	pcre? ( dev-libs/libpcre:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	xml? ( !expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat ) )
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )
-	uwsgi_plugins_alarm_curl? ( net-misc/curl )
-	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
-	uwsgi_plugins_curl_cron? ( net-misc/curl )
-	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
-	uwsgi_plugins_geoip? ( dev-libs/geoip )
-	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( virtual/pam )
-	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
-	uwsgi_plugins_rados? ( sys-cluster/ceph )
-	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
-	uwsgi_plugins_router_spnego? ( virtual/krb5 )
-	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
-	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
-	uwsgi_plugins_xslt? ( dev-libs/libxslt )
-	go? ( dev-lang/go:=[gccgo] )
-	lua? ( dev-lang/lua:= )
-	mono? ( =dev-lang/mono-2* )
-	perl? ( dev-lang/perl:= )
-	php? (
-		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
-		php_targets_php7-0? ( dev-lang/php:7.0[embed] )
-	)
-	pypy? ( virtual/pypy )
-	python? ( ${PYTHON_DEPS} )
-	python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-uwsgi )
-	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
-
-# FIXME: is this patch still useful?
-PATCHES=(
-	"${FILESDIR}/2.0.14-php-plugin.patch"
-)
-
-src_unpack() {
-	default
-}
-
-pkg_setup() {
-	python_setup
-	use ruby && ruby-ng_pkg_setup
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local embedded_plugins=()
-	local plugins=()
-	local malloc_impl="libc"
-	local json="false"
-	local xml="false"
-
-	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
-		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
-	done
-	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
-		use ${p} && plugins+=("${p}")
-	done
-
-	# do not embed any plugins
-	if ! use embedded; then
-		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
-		embedded_plugins=()
-	fi
-
-	# flatten the arrays
-	plugins=${plugins[@]}
-	embedded_plugins=${embedded_plugins[@]}
-
-	# rename some of the use flags, language plugins are always real plugins
-	plugins="${plugins/perl/psgi}"
-	plugins="${plugins/sqlite/sqlite3}"
-	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
-
-	# override defaults as requested by the user
-	if use xml; then
-		use expat && xml="expat" || xml="libxml2"
-	fi
-	if use json; then
-		use yajl && json="yajl" || json="jansson"
-	fi
-	use jemalloc && malloc_impl="jemalloc"
-
-	# prepare the buildconf for gentoo
-	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
-	sed -i \
-		-e "s|VAR_XML|${xml}|" \
-		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
-		-e "s|VAR_JSON|${json}|" \
-		-e "s|VAR_SSL|$(usex ssl true false)|" \
-		-e "s|VAR_PCRE|$(usex pcre true false)|" \
-		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
-		-e "s|VAR_ROUTING|$(usex routing true false)|" \
-		-e "s|VAR_DEBUG|$(usex debug true false)|" \
-		-e "s|VAR_MALLOC|${malloc_impl}|" \
-		-e "s|VAR_PLUGINS|${plugins// /, }|" \
-		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
-		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
-		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
-		buildconf/gentoo.ini || die "sed failed"
-
-	if ! use caps; then
-		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if ! use zeromq; then
-		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if use uwsgi_plugins_emperor_pg ; then
-		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-each_ruby_compile() {
-	cd "${WORKDIR}/${MY_P}" || die "sed failed"
-
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
-}
-
-python_compile_plugins() {
-	local EPYV
-	local PYV
-	EPYV=${EPYTHON/.}
-	PYV=${EPYV/python}
-
-	if [[ ${EPYTHON} == pypy* ]]; then
-		einfo "skipping because pypy is not meant to build plugins on its own"
-		return
-	fi
-
-	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
-
-	if use python_asyncio ; then
-		if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
-		fi
-	fi
-
-	if use python_gevent ; then
-		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
-	fi
-
-	if use pypy ; then
-		if [[ "${PYV}" == "27" ]] ; then
-			# TODO: do some proper patching ? The wiki didn't help... I gave up for now.
-			# QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
-			append-ldflags -Wl,-z,noexecstack
-			${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
-		fi
-	fi
-}
-
-python_install_symlinks() {
-	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
-}
-
-src_compile() {
-	mkdir -p "${T}/plugins" || die
-
-	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	if use go ; then
-		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
-	fi
-
-	if use lua ; then
-		# setting the name for the pkg-config file to lua, since we don't have
-		# slotted lua
-		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_compile_plugins
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-
-	if use apache2 ; then
-		for m in proxy_uwsgi Ruwsgi uwsgi ; do
-			APXS2_ARGS="-c mod_${m}.c"
-			apache-module_src_compile
-		done
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use go && dosym uwsgi /usr/bin/uwsgi_go
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_install_symlinks
-		python_foreach_impl python_domodule uwsgidecorators.py
-	fi
-
-	if use apache2; then
-		for m in proxy_uwsgi Ruwsgi uwsgi ; do
-			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
-			apache-module_src_install
-		done
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
-	keepdir /etc/"${PN}".d
-	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
-		elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
-		elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
-		elog "Therefore you can enable only one of them at a time."
-		elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
-		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
-		elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
-	use perl   && elog "  '--plugins psgi' for perl"
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			elog "  '--plugins ${s/.}' for ${s}"
-		done
-	fi
-
-	python_pkg_postinst() {
-		local EPYV
-		local PYV
-		EPYV=${EPYTHON/.}
-		PYV=${EPYV/python}
-
-		if [[ ${EPYTHON} == pypy* ]] ; then
-			elog "  '--plugins pypy' for pypy"
-			return
-		fi
-
-		elog " "
-		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python_asyncio ; then
-			if [[ ${EPYV} == python34 ]] ; then
-				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
-			else
-				elog "  (asyncio is only supported in python3.4)"
-			fi
-		fi
-		if use python_gevent ; then
-			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
-		fi
-	}
-
-	use python && python_foreach_impl python_pkg_postinst
-
-	if use ruby ; then
-		for ruby in $USE_RUBY; do
-			if use ruby_targets_${ruby} ; then
-				elog "  '--plugins rack_${ruby/.}' for ${ruby}"
-				elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
-				elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
-			fi
-		done
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.16.ebuild b/www-servers/uwsgi/uwsgi-2.0.16.ebuild
new file mode 100644
index 000000000000..85b336d9b687
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.16.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby22 ruby23 ruby24"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module eutils flag-o-matic multilib pax-utils php-ext-source-r2 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+	http ugreen signal syslog rsyslog
+	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+	{core,fast,raw,ssl}router
+	redislog mongodblog log{file,socket}
+	spooler cheaper_busyness symcall
+	transformation_{chunked,gzip,offload,tofile}
+	zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+	rados router_{access,radius,spnego,xmldir}
+	sqlite ssi stats_pusher_statsd
+	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( go lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+	uwsgi_plugins_logcrypto? ( ssl )
+	uwsgi_plugins_sslrouter? ( ssl )
+	routing? ( pcre )
+	uwsgi_plugins_emperor_zeromq? ( zeromq )
+	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+	uwsgi_plugins_router_xmldir? ( xml !expat )
+	pypy? ( python_targets_python2_7 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) python_gevent )
+	python_gevent? ( python )
+	expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	json? ( !yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl ) )
+	pcre? ( dev-libs/libpcre:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	xml? ( !expat? ( dev-libs/libxml2 )
+		expat? ( dev-libs/expat ) )
+	yaml? ( dev-libs/libyaml )
+	zeromq? ( net-libs/zeromq sys-apps/util-linux )
+	uwsgi_plugins_alarm_curl? ( net-misc/curl )
+	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+	uwsgi_plugins_curl_cron? ( net-misc/curl )
+	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+	uwsgi_plugins_geoip? ( dev-libs/geoip )
+	uwsgi_plugins_ldap? ( net-nds/openldap )
+	uwsgi_plugins_pam? ( virtual/pam )
+	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+	uwsgi_plugins_rados? ( sys-cluster/ceph )
+	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+	uwsgi_plugins_router_spnego? ( virtual/krb5 )
+	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+	uwsgi_plugins_xslt? ( dev-libs/libxslt )
+	go? ( dev-lang/go:=[gccgo] )
+	lua? ( dev-lang/lua:= )
+	mono? ( =dev-lang/mono-4* )
+	perl? ( dev-lang/perl:= )
+	php? (
+		php_targets_php5-6? ( dev-lang/php:5.6[embed] )
+		php_targets_php7-0? ( dev-lang/php:7.0[embed] )
+		php_targets_php7-1? ( dev-lang/php:7.1[embed] )
+		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
+	)
+	pypy? ( virtual/pypy )
+	python? ( ${PYTHON_DEPS} )
+	python_gevent? ( >=dev-python/gevent-1.2.1[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-uwsgi )
+	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
+
+# FIXME: is this patch still useful?
+PATCHES=(
+	"${FILESDIR}/2.0.14-php-plugin.patch"
+)
+
+src_unpack() {
+	default
+}
+
+pkg_setup() {
+	python_setup
+	use ruby && ruby-ng_pkg_setup
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|'-O2', ||" \
+		-e "s|'-Werror', ||" \
+		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+		uwsgiconfig.py || die "sed failed"
+
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+	local embedded_plugins=()
+	local plugins=()
+	local malloc_impl="libc"
+	local json="false"
+	local xml="false"
+
+	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+	done
+	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+		use ${p} && plugins+=("${p}")
+	done
+
+	# do not embed any plugins
+	if ! use embedded; then
+		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+		embedded_plugins=()
+	fi
+
+	# flatten the arrays
+	plugins=${plugins[@]}
+	embedded_plugins=${embedded_plugins[@]}
+
+	# rename some of the use flags, language plugins are always real plugins
+	plugins="${plugins/perl/psgi}"
+	plugins="${plugins/sqlite/sqlite3}"
+	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+	# override defaults as requested by the user
+	if use xml; then
+		use expat && xml="expat" || xml="libxml2"
+	fi
+	if use json; then
+		use yajl && json="yajl" || json="jansson"
+	fi
+	use jemalloc && malloc_impl="jemalloc"
+
+	# prepare the buildconf for gentoo
+	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
+	sed -i \
+		-e "s|VAR_XML|${xml}|" \
+		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
+		-e "s|VAR_JSON|${json}|" \
+		-e "s|VAR_SSL|$(usex ssl true false)|" \
+		-e "s|VAR_PCRE|$(usex pcre true false)|" \
+		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+		-e "s|VAR_ROUTING|$(usex routing true false)|" \
+		-e "s|VAR_DEBUG|$(usex debug true false)|" \
+		-e "s|VAR_MALLOC|${malloc_impl}|" \
+		-e "s|VAR_PLUGINS|${plugins// /, }|" \
+		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
+		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
+		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+		buildconf/gentoo.ini || die "sed failed"
+
+	if ! use caps; then
+		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if ! use zeromq; then
+		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+	fi
+
+	if use uwsgi_plugins_emperor_pg ; then
+		PGPV="$(best_version dev-db/postgresql)"
+		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+		sed -i \
+			-e "s|pg_config|pg_config${PGSLOT/.}|" \
+			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+	fi
+}
+
+each_ruby_compile() {
+	cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+	local EPYV
+	local PYV
+	EPYV=${EPYTHON/.}
+	PYV=${EPYV/python}
+
+	if [[ ${EPYTHON} == pypy* ]]; then
+		einfo "skipping because pypy is not meant to build plugins on its own"
+		return
+	fi
+
+	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+	if use python_asyncio ; then
+		if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
+			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+		fi
+	fi
+
+	if use python_gevent ; then
+		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+	fi
+
+	if use pypy ; then
+		if [[ "${PYV}" == "27" ]] ; then
+			# TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+			# QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+			append-ldflags -Wl,-z,noexecstack
+			${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+		fi
+	fi
+}
+
+python_install_symlinks() {
+	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+	mkdir -p "${T}/plugins" || die
+
+	python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+	if use go ; then
+		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
+	fi
+
+	if use lua ; then
+		# setting the name for the pkg-config file to lua, since we don't have
+		# slotted lua
+		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+	fi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_compile_plugins
+	fi
+
+	if use ruby ; then
+		ruby-ng_src_compile
+	fi
+
+	if use apache2 ; then
+		for m in proxy_uwsgi Ruwsgi uwsgi ; do
+			APXS2_ARGS="-c mod_${m}.c"
+			apache-module_src_compile
+		done
+	fi
+}
+
+src_install() {
+	dobin uwsgi
+	pax-mark m "${D}"/usr/bin/uwsgi
+
+	insinto /usr/$(get_libdir)/uwsgi
+	doins "${T}/plugins"/*.so
+
+	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+	use go && dosym uwsgi /usr/bin/uwsgi_go
+	use lua && dosym uwsgi /usr/bin/uwsgi_lua
+	use mono && dosym uwsgi /usr/bin/uwsgi_mono
+	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			dosym uwsgi /usr/bin/uwsgi_${s/.}
+		done
+	fi
+
+	if use python ; then
+		python_foreach_impl python_install_symlinks
+		python_foreach_impl python_domodule uwsgidecorators.py
+	fi
+
+	if use apache2; then
+		for m in proxy_uwsgi Ruwsgi uwsgi ; do
+			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+			apache-module_src_install
+		done
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
+	keepdir /etc/"${PN}".d
+	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+		elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+		elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+		elog "Therefore you can enable only one of them at a time."
+		elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+		elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
+	fi
+
+	elog "Append the following options to the uwsgi call to load the respective language plugin:"
+	use cgi    && elog "  '--plugins cgi' for cgi"
+	use lua    && elog "  '--plugins lua' for lua"
+	use mono   && elog "  '--plugins mono' for mono"
+	use perl   && elog "  '--plugins psgi' for perl"
+
+	if use php ; then
+		for s in $(php_get_slots); do
+			elog "  '--plugins ${s/.}' for ${s}"
+		done
+	fi
+
+	python_pkg_postinst() {
+		local EPYV
+		local PYV
+		EPYV=${EPYTHON/.}
+		PYV=${EPYV/python}
+
+		if [[ ${EPYTHON} == pypy* ]] ; then
+			elog "  '--plugins pypy' for pypy"
+			return
+		fi
+
+		elog " "
+		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
+		if use python_asyncio ; then
+			if [[ ${EPYV} == python34 ]] ; then
+				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+			else
+				elog "  (asyncio is only supported in python3.4)"
+			fi
+		fi
+		if use python_gevent ; then
+			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+		fi
+	}
+
+	use python && python_foreach_impl python_pkg_postinst
+
+	if use ruby ; then
+		for ruby in $USE_RUBY; do
+			if use ruby_targets_${ruby} ; then
+				elog "  '--plugins rack_${ruby/.}' for ${ruby}"
+				elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+				elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+			fi
+		done
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 02e3e6ebf05a..3a9a2db113a0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 6fa291d83fb5..0990ba4e3dcd 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 3944 BLAKE2B e8b3ffd966250ece710a27375373cebe97f78adb914daf962d042d648f4a8062c89d9c55c1f79a181cfb6a8464b54cdeb169ed2a4754d52a3c6247a196ace95f SHA512 9ca1a710e8327a3f31b3ce243eeceac812785bb7a19740e4a32efafd1280c6830e0a030eb6a40ece5ada156e462d4a1723ce97ded21954320788e2da0b076ab6
+EBUILD cairo-1.14.12.ebuild 3943 BLAKE2B 98ab3b5f14093b6bd487bc50cdda9d2d3f357489645fbd7ef78b94baaf66f96271dca5c1853d376061487a9cd65d96ae7bb7b37f4e6e17087264dd855d896a3c SHA512 e730a2ebabc45a647d4a4613b0ffcb2e862ee59dc80c5092671c65cbfc7f758802b18f40ccd4a1447d35fe23c1f81436977c4f7780e7a0b67965e24bc69a3cbf
 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 3a96a04fb72d..7fce0e20be42 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/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index c847559147b1..c81629c4103f 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,15 +1,10 @@
 DIST libva-intel-driver-1.7.3.tar.gz 1648659 BLAKE2B 5d5bf82d02c6e887f4afd332fa395e3044ac9b9bbf8e1682aeaf80d6c61c1db537b27ed22b25e932ec71d9011af07d9008f64df2e7c77a2c6f9dd0e10860d41f SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878
-DIST libva-intel-driver-1.8.0.tar.gz 2308240 BLAKE2B 5d5190b0dedc62421f4118410421823101bdbbd93c9eaa52e42d49049a8400f364f53a3017ab0c683fdc6317032e0fd45e9d440d00dbbcf6c0a134f297de7612 SHA512 fbf68ad5f7558366dadf6e8d834ed89665e86167676ca72fdca218023f5709b0bdf1b124f11ed3f7c10b60741a2574a8ea7c3e5607a6727d3b9cc2ed44981542
-DIST libva-intel-driver-1.8.1.tar.gz 2309572 BLAKE2B 4a51d03000a9787767c65ac1a5c7a27f1e8a5be5f45645f85539e938100fca6c3233b36e10847ef7b8d8e41df50f3f41794b8f2793679b66e6b463f0780ba88e SHA512 a7c414ce32f1724acf62dd67099e5b0642aae880434232adb26f228037ccd8f070a0d836a541841992513c2945520bf2e4dd70309d8d551a892d845303489baa
-DIST libva-intel-driver-1.8.2.tar.gz 2309998 BLAKE2B 8c00779c84ea993ed717c4a3d45499f5077898556f8b7f8e4d6edc94465c43baff202562cb618051893615a10c4f6a76047fe6cf06433872c67bfd938eb59084 SHA512 047362e2ca301e01db8bd73450595c91fd4da36da4737be2fe7ba32086a0ead3443e9247ae84f87034c9ded3f046c314af0d1baab8930bb03b77f22ad1fac9f0
 DIST libva-intel-driver-1.8.3.tar.gz 2591242 BLAKE2B 954ad024ea93073f23045530506c6988cd55bc4bce565856071b30cfc0c10b673a225d4cfdd50cd360a3f828bf236386ba2937e59c260f72717dbdf72a29152c SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990
 DIST libva-intel-driver-2.0.0.tar.gz 2831508 BLAKE2B 3f777303099cac2df3d3d2394af28e086bb4f9b6d595585cedf0d3a4aed79c8ab9d0a132b828d9b56c9bf09526cd6d0a7b9354832464a9ffec7a66aeb939a528 SHA512 2f538d97ae2ea5cbbaa2660c1498a2288b8828ecae914c500f250c25a433a8ee289a9a5beb001b557dd0d84fa3f4bcd8bbe2f23c705caad527080ecca29b933b
+DIST libva-intel-driver-2.1.0.tar.gz 3954965 BLAKE2B 6ff759860477896df6ee433d7b1ff8f3fda498e98210bfcbec33dc663a65bc07b8304ae219885225985fc65a785d7510aacb785a17d9fd66fb1c16a0ca7ffd57 SHA512 2df0d617a4a64ee37641fd9134f8455f59160d003c252b0e82f7be47adaad7d531f9f2f3ab16d75457b2852e8893887d5be6da5f8128e64ffe8311853baf6453
 EBUILD libva-intel-driver-1.7.3.ebuild 1412 BLAKE2B 9e985438dd80942d725ef893e8185370a0b4f2d6aac804d5165e058f0c25657bf10e00d57293e19eec5693eba1ce1ddc6b721cd9bbd41cf7772bd7c1d2d11b60 SHA512 82f35982511b9fd6d055333cfb1c0717e4a9e50d8785df0f589ecfb76452b443452264fdf6963241fb2104eb46fe3d074747137301cf43cfaedc6d764b4a4515
-EBUILD libva-intel-driver-1.8.0.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
-EBUILD libva-intel-driver-1.8.1.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
-EBUILD libva-intel-driver-1.8.2.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-1.8.3.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-2.0.0-r1.ebuild 1430 BLAKE2B aabb842fd5b41fd85e00a777c40844756a03e32241a35a7241b5132292e2081c04be9a6f711824ad9bce9b045b6dfc1caa68186510a3fb1af0a750ff43b2fc48 SHA512 096c9b223cb3e0fcc7ef60be7a5120f12e4c8d1ff9cd0bf07724d8789aca82e2adfcc7d450b85026847d72d68d7ea60b0501b3cb87cfa4eaf785c34c22379f6b
-EBUILD libva-intel-driver-2.0.0.ebuild 1428 BLAKE2B fb65395624b2a600a9c0ddcf6e6eb1b888272b3b75ce264460193b94c1dea74b76f1a21c202bba8ce7eb5ae13917b17a21c1f543c84f6fdefa6cfffd9791bf70 SHA512 8f455f60bd0d3f04252b3ea2e80fe6d3817e8cbe70711facb55a6d17173f2454c0ffc3375d9cc7890a35d58951d74e91e9d46acb3355c2ce15af721ae470745a
-EBUILD libva-intel-driver-9999.ebuild 1430 BLAKE2B aabb842fd5b41fd85e00a777c40844756a03e32241a35a7241b5132292e2081c04be9a6f711824ad9bce9b045b6dfc1caa68186510a3fb1af0a750ff43b2fc48 SHA512 096c9b223cb3e0fcc7ef60be7a5120f12e4c8d1ff9cd0bf07724d8789aca82e2adfcc7d450b85026847d72d68d7ea60b0501b3cb87cfa4eaf785c34c22379f6b
-MISC metadata.xml 421 BLAKE2B 4a4d9faf1984657da212ed918f4dae8cd39e13ed78bb9f65d1eb7a3ca25312b65fbeefd4b06ae584b74468817e232516b49634e28fccbd5d310be5ef74fb74fd SHA512 a4a6264acc0467edc025240668f4ebcf7455e3ffc698dddfa69ae90da0946579ec55c96b346a4eec91e9b8985a12705594687c665df524375a9a8b0e0dbe35ae
+EBUILD libva-intel-driver-2.1.0.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
+EBUILD libva-intel-driver-9999.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
+MISC metadata.xml 421 BLAKE2B f0188d8af65943438672ecd3ca5fdee0050ede13770668e54ebb99cdecbd816a4888f23939ddd1c0f467a000bb9357114db6d1934159cc808d9c981e849ec4b2 SHA512 ce09ecee2e99fa3a1dbb0ba9d320d39b6ed037cb0e6402bc2ea7762acd9dff09313d087e128e377e9d58558cfbc9374dd96acad2ea427a623a68bf1d972b9dd7
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild
deleted file mode 100644
index 053f134f8eb5..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
-	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-src_prepare() {
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild
deleted file mode 100644
index 053f134f8eb5..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
-	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-src_prepare() {
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild
deleted file mode 100644
index 053f134f8eb5..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.8.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.8.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
-	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-src_prepare() {
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0.ebuild
deleted file mode 100644
index 91c3815cfab6..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-2.0.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
-	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-src_prepare() {
-	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.1.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.1.0.ebuild
new file mode 100644
index 000000000000..a440f5228714
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index bcc260be80d3..a440f5228714 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-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=5
@@ -7,18 +7,18 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
 inherit autotools-multilib ${SCM}
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/intel-vaapi-driver-${PV}"
 fi
 
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index e2ecb4c8283d..234fe309ab9b 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -9,6 +9,6 @@
     <flag name="drm">Enables VA/DRM API support.</flag>
   </use>
   <upstream>
-    <remote-id type="github">01org/intel-vaapi-driver</remote-id>
+    <remote-id type="github">intel/intel-vaapi-driver</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 245b3b8c93ff..87c212ad5024 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,14 +1,10 @@
 DIST libva-1.7.3.tar.bz2 824490 BLAKE2B 0579492b700b00e9ed009798e6dcf6dd7fd6cd19e32af9fbab6d780ba83ae3a264dbbfab2633a3458a624fec1935435974875e58a9e57baca9be9cb7ce627488 SHA512 ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0
-DIST libva-1.8.0.tar.gz 195261 BLAKE2B d20c1abf419366bdaa32d40d2b5fc8de15c897056258a8b7c40797208908765851619df10e0a2313d17b7c16c6bdaf4eb4582b28fd72c03a652eee1226869a0e SHA512 0f1b527d67497bc501f2f1acdddcb2519f12a8682a6d98303e7d86dd88b6270eb25e3b0789179aaf5f3b4c70b7e8448eb5505cbadeb0b44c9727ac7cf77a51d6
-DIST libva-1.8.1.tar.gz 195281 BLAKE2B 08286fbadb78efc4c55955d4d56c71d27291db8129f837780d150b749593bb1a40ace3716886b02a9ae16063bdce7ef6ea873eb3ebb260c191bc4d7c1f1a7015 SHA512 381267a1835a2c98a5fb093597aa795929afc4c64e2c5fa3aebb6497acf27428dff05ada5ecd698c25c74a350aa5bd9c42baacfcfe7028b2b420d52e10c78bfa
-DIST libva-1.8.2.tar.gz 195281 BLAKE2B ab298599421519cce7ad430cb7d2050e4e5a86fe3f76e1c88a86bbfba382a1052fd742c2984a1b7713bbd53b93b06d56d1fb85a563708920a7bf6d3422b47860 SHA512 1cf6ab6155e53d09d13710e23bf7baf6dfc33fb121d2171792fc258a41a78bbb5741bf6860f72a832f15e027034aa1e19b4feac0a1ba02ce8b19b2081ac730a3
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
 DIST libva-2.0.0.tar.gz 191311 BLAKE2B 1515c39f9ff12137b07f753101692c71a5bdd3e9a1e00da427d373307277aff950a31038d132902b4554cb290209b1b29038214de3e9d34c545e6d9854267fb7 SHA512 85c47355d95026e88ad443dbfb2e2dc12c37961dbc001fc051f85e8adada46da9a350cf5d2fe20943ca36fe749f49f88f85f8ee1b9fb93d69b32a75f710609d6
+DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163da92da7d8791547d6ca2fd407319093fee89bce5b26b26818cc0131cc0c7f3cd4f511e3f847e3fd2cf1dff3 SHA512 dd4c901f9c75d03fa45b32af5ca08ba24ef68d354ad26ad53d0f87d3290bee152eed9e61b4dd4116c2d15baf0c74f2d37996d08f007d485c57af5e8d9648eb82
 EBUILD libva-1.7.3.ebuild 2269 BLAKE2B f26dd1b8cc005a35ee3d1b68dcd96015dcccc7191bd77aa50781669a76b226fc2f7c79ff82a348e895994057b39e322181888306d52706e309eb07f23af0c1e8 SHA512 56c8c0c7f479e5fc0a74245001524ee8e9b99920092f2d80ad6392a4c9eee5d37549bcc05b09470a1f323db8107ddff450d6e07a03daba46269f6686f9699b4e
-EBUILD libva-1.8.0.ebuild 2277 BLAKE2B 71878e2da2800329922cd9d332311539ea4147d3074070f0b1c8eeaf062b824dd962d285638e0aec2a8ab908f74ebbed442821f69ef7fc7a1f082ce7bfccfb51 SHA512 1f10b90836c0c5a9bab981c56f32db1a534a563f3dc2e4a9dac95d87d18e56c325ec26fa0a4e1de6d321f2db9e69110d6ce72fa9a5351d6fe51646b988faf9e6
-EBUILD libva-1.8.1.ebuild 2277 BLAKE2B 71878e2da2800329922cd9d332311539ea4147d3074070f0b1c8eeaf062b824dd962d285638e0aec2a8ab908f74ebbed442821f69ef7fc7a1f082ce7bfccfb51 SHA512 1f10b90836c0c5a9bab981c56f32db1a534a563f3dc2e4a9dac95d87d18e56c325ec26fa0a4e1de6d321f2db9e69110d6ce72fa9a5351d6fe51646b988faf9e6
-EBUILD libva-1.8.2.ebuild 2284 BLAKE2B 5f03dd987cf0d5068483a573d1145cbe7dc50d1692becb519db48942fe8f4977c6d72a74b30648530eac5da7592d9eef2d16b24cac65ff5dcf8e93742eded0c4 SHA512 5ade9c6d9d0aa066648bed0de34ccd227a9fca88981b8c7a782c74f0c5bda62ab52d92b0b50b9f9695aeb88a89d97ee642ca31e2484329737ada3daa5e7ad69b
 EBUILD libva-1.8.3.ebuild 2231 BLAKE2B 28f6d39d8e23fd2714acce8982be6462e7035e3fbcbfc91358533a2387a99af25d0247c413ec336cc22fba607dcbbb8ff8e29af5a5ca47f892311ada74fef7eb SHA512 c5d8cadb64d2952cb7e119d87a2c37c3f809b53e8fd5441d54d07e9264d049b50c5115150fd2112da08d0420af53416b6ed90de18db0c8725b68f9160937fee8
 EBUILD libva-2.0.0.ebuild 2187 BLAKE2B c1830574389a66b6de0f7537a810c7ddb818281bb56958ffb9395022e45e5d02660d9ce94b4bbac1fa1bc92e67a2b4a5c81d5b8e3b7c630929a2803616f62629 SHA512 4748f3b899f06b17911ee1cc4ec9b318084bb28a86f30c89b722f181fcb5b1a9478ba9d6a85ee70f2f3b919832ea7f8e411f815715e29930d1070b0a74df3bc6
-EBUILD libva-9999.ebuild 2187 BLAKE2B c1830574389a66b6de0f7537a810c7ddb818281bb56958ffb9395022e45e5d02660d9ce94b4bbac1fa1bc92e67a2b4a5c81d5b8e3b7c630929a2803616f62629 SHA512 4748f3b899f06b17911ee1cc4ec9b318084bb28a86f30c89b722f181fcb5b1a9478ba9d6a85ee70f2f3b919832ea7f8e411f815715e29930d1070b0a74df3bc6
-MISC metadata.xml 520 BLAKE2B 1fb6f6e11fdb38e9b1092640e8e15bf666211579f1427798175d8b78d5cf4c3400d9f9be1ea7ab8241e9c8034acf5885f01b472bec126946ef856b2e58f95b98 SHA512 de563ce4e05a8410cf94f2b8776addece7ae152184422592c33bafb5bd946e36afed9e27c32177d6df169492246f22e22f8503c6f62051e701e42618b76dfec0
+EBUILD libva-2.1.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
+EBUILD libva-9999.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
+MISC metadata.xml 518 BLAKE2B 2d363f9ee3a690cda208cd96d14003254c0226bb8c396e367d4382107b675fe9f5d0713f826ef611ddb250e3dd919da5e19473f6e10aa59c05e99cd13335e34e SHA512 655f89ce0b04f3d31f02617065baf715a4e6394828b83b18fe12f35a7fa3a626192d9165d2520a5731b98215afea3db4e5b50caf3ed1915be1a707389449a367
diff --git a/x11-libs/libva/libva-1.8.0.ebuild b/x11-libs/libva/libva-1.8.0.ebuild
deleted file mode 100644
index b83e0e6184f8..000000000000
--- a/x11-libs/libva/libva-1.8.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X utils"
-
-VIDEO_CARDS="dummy nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	utils? ( media-video/libva-utils )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.8.1.ebuild b/x11-libs/libva/libva-1.8.1.ebuild
deleted file mode 100644
index b83e0e6184f8..000000000000
--- a/x11-libs/libva/libva-1.8.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X utils"
-
-VIDEO_CARDS="dummy nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	utils? ( media-video/libva-utils )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.8.2.ebuild b/x11-libs/libva/libva-1.8.2.ebuild
deleted file mode 100644
index 0c83ad49c25d..000000000000
--- a/x11-libs/libva/libva-1.8.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X utils"
-
-VIDEO_CARDS="dummy nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	utils? ( media-video/libva-utils )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-2.1.0.ebuild b/x11-libs/libva/libva-2.1.0.ebuild
new file mode 100644
index 000000000000..2cfeb67ae2f1
--- /dev/null
+++ b/x11-libs/libva/libva-2.1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib versionator
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1)"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm opengl vdpau wayland X utils"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 56a848add454..2cfeb67ae2f1 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-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=5
@@ -7,7 +7,7 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
+	EGIT_REPO_URI="https://github.com/intel/libva"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
@@ -18,7 +18,7 @@ HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 766c0b39c765..25cdd598e95e 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -11,6 +11,6 @@
     <flag name="utils">Install VA-API utility programs.</flag>
   </use>
   <upstream>
-    <remote-id type="github">01org/libva</remote-id>
+  <remote-id type="github">intel/libva</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
deleted file mode 100644
index d0c75d79fc5e..000000000000
--- a/x11-libs/qwtplot3d/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX qwtplot3d-doxygen.patch 1089 BLAKE2B 87af8ef42050cac3e953800122e5713f4a9ba3c3da9397f43ce6dd1e54106ecfd245920e793033c6decf0202f589a53380a3dff688d5ee0c9236f598a7dced7f SHA512 d424ede7e78ddbeeb8bcd2270a83956164d5cf8f574b9a478a9b527c28ed6488edc2324b72dbf3e3c1973e7aae16c1baeb63d0dc3e3e97ecc9d3679fd06db7d7
-AUX qwtplot3d-examples.patch 4764 BLAKE2B 68cdda8bbec7744f4ee8ad811c8d2b934c58cd2ba5320271fc70edbded9ada1a92aee2b387c6238ec16f8de83fb552b7dd78c3851bb76f32ca7693fc0e2ce055 SHA512 b1100942e85df8347a439083a7c2ed1fc86edde2115fba9ec6657f2a8a10ffea937e28d2cb4bfcd377f3f75cb098cac923cb4a254116a56e3d914daa05cc504f
-AUX qwtplot3d-gcc44.patch 440 BLAKE2B feaab80b003dedbe95a4e4ce5d70dff8e29efb498857274a68e078127947822eada637c66c452fbcdc51ccdc98a3dc85993a9a4266b9b7ae39700653a2bddc8b SHA512 4f10bfabc68ec313aa8f3f624632c59bfad18f701bc802cd222607ac551b2ad6736dca14e3b63bd238c9c2b68128cb0b66eb1801dc6efebc800e71b0d03cbd31
-AUX qwtplot3d-profile.patch 717 BLAKE2B e7f8229e246b219c49fc34df4b4374ff76f1358fe0fdb723a157c357495c6d3e9c51a2ad116a4b5db6559fef26748dcfc1c0e025637d620fc05439b447f0a894 SHA512 59fb2d36056074ce16380b7c3c64e63bd0ec8735f0a81c4d37cc3e1daa446721efbe4fd3dd6facf57c62365ae6542d6b9e97ca820d73f89b835b82a23f082728
-AUX qwtplot3d-qt48.patch 414 BLAKE2B bf28c8281b20b7d73f9458cdd869f69426f0f123d5ecedcaa0141806ef49f0844af4051fde1b86cd1ebfef924a51331a2a1497793ba5a761c80bfb4611ae22d2 SHA512 85ef986a35917428cda4929f321a4af11dbf88a71c6adbbb75ab5db7fe392c4df1f0e9631c3f646ee07220747b613068a63f7c2ebef73150c846e11c5ffe89a4
-AUX qwtplot3d-sys-gl2ps.patch 915 BLAKE2B 8f45de13b3ae5fcbbab296bbc769a5cc61717ece7d810040fcb2ecd003ee3a9c65f64aa4b06f868f3558a479e264dcad64c15298d83cba597038e4f4e26ee4c6 SHA512 a15870bdc215145e57f1eef3bc6c56060ac2f3bc5e8cd134a72188a17088b986b843965cc81065663e72bf69b48912935c88b14babea4b28b7b4265eba86f96f
-DIST qwtplot3d-0.2.7.tgz 183836 BLAKE2B f34fafdea591b2a1440321756872eb8f5580ccf8d5785eeeb6b32e1a4ee515b48ce2cf6e97462f69c2c82b83eebd90226b73d160e1e7027695024f590c4c1c6f SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c
-EBUILD qwtplot3d-0.2.7-r2.ebuild 1185 BLAKE2B c573931f66f20e068dfa014c37be87a7de72869637cbe5b683a84c5c6e4b18b4fa47445cb9e547d748cc5d72fff26cba11a0df701268dbb1885d2ff6b995e25f SHA512 c82803d2884ea999c9be1796c9f092870275bcf7ac2fba4e63c319ab68a333dbb8f525f8623525c2680b2f179a71ed830c336ebd6c573c786bb1ee0f7c83c67e
-MISC metadata.xml 505 BLAKE2B 495e3f9413a2f6c7071dfdd7ac7b8d3b227efe427ba6390761fb4810274661d58e46f43850d6ceee9e7015b69c24b82d8e9652b443a8f5091b220726ba280c21 SHA512 ab0c54c313d5ab5c70e7a559bef7ec966f45e06b278d64909d82ea76056edfe5fb1beb3840d534cb66feffdb7ab3da8af753a63042be9a648ef1a06f15c2263b
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
deleted file mode 100644
index b0632a380a2a..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- qwtplot3d/doc/Doxyfile.doxygen.orig	2007-11-26 22:30:57.000000000 +0000
-+++ qwtplot3d/doc/Doxyfile.doxygen	2007-11-26 22:30:03.000000000 +0000
-@@ -116,7 +116,7 @@
- HTML_ALIGN_MEMBERS     = YES

- GENERATE_HTMLHELP      = NO

- CHM_FILE               = qwtplot3d.chm

--HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"

-+#HHC_LOCATION           = "c:\Programme\HTML Help Workshop\hhc.exe"

- GENERATE_CHI           = NO

- BINARY_TOC             = YES

- TOC_EXPAND             = YES

-@@ -181,7 +181,7 @@
- MACRO_EXPANSION        = NO

- EXPAND_ONLY_PREDEF     = NO

- SEARCH_INCLUDES        = YES

--INCLUDE_PATH           = V:/cvs/qwtplot3d/include/

-+INCLUDE_PATH           = ../include

- INCLUDE_FILE_PATTERNS  = *.h

- PREDEFINED             = QWT3D_NOT_FOR_DOXYGEN \

-                          QT_VERSION=0x040000

-@@ -212,7 +212,6 @@
- GRAPHICAL_HIERARCHY    = YES

- DIRECTORY_GRAPH        = YES

- DOT_IMAGE_FORMAT       = png

--DOT_PATH               = V:/graphviz/Graphviz/bin/

- DOTFILE_DIRS           = 

- MAX_DOT_GRAPH_WIDTH    = 974

- MAX_DOT_GRAPH_HEIGHT   = 10000

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
deleted file mode 100644
index f142c3379274..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
---- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp	2007-11-26 22:21:56.000000000 +0000
-@@ -9,7 +9,7 @@
- 

- #include "axes.h"

- #include "axesmainwindow.h"

--#include "../../../include/qwt3d_function.h"

-+#include <qwt3d_function.h>

- 

- using namespace std;

- using namespace Qwt3D;

-diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
---- qwtplot3d.orig/examples/common.pro	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/common.pro	2007-11-26 23:43:33.000000000 +0000
-@@ -1,13 +1,13 @@
- TEMPLATE     = app

--CONFIG      += qt warn_on thread debug

-+CONFIG      += qt warn_on thread

- UI_DIR = tmp

- MOC_DIR      = tmp

- OBJECTS_DIR  = tmp

--INCLUDEPATH    += ../../include 

-+INCLUDEPATH    += /usr/include/qwtplot3d

- DEPENDPATH	= $$INCLUDEPATH

- DESTDIR = ../bin

- 

--unix:LIBS += -lqwtplot3d -L../../lib

-+unix:LIBS += -lqwtplot3d

- linux-g++:QMAKE_CXXFLAGS += -fno-exceptions

- 

- win32{

-@@ -25,7 +25,7 @@
- ISQT4 = $$find(MYVERSION, ^[2-9])

- 

- !isEmpty( ISQT4 ) {

--RESOURCES     = ../images.qrc

-+#RESOURCES     = ../images.qrc

- QT += opengl

- }

- 

-diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
---- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp	2007-11-26 22:22:48.000000000 +0000
-@@ -6,7 +6,7 @@
- 

- #include "enrichmentmainwindow.h"

- #include "enrichments.h"

--#include "../../../include/qwt3d_function.h"

-+#include <qwt3d_function.h>

- 

- using namespace Qwt3D;

- 

-diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
---- qwtplot3d.orig/examples/mesh2/src/colormapreader.h	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/colormapreader.h	2007-11-26 22:23:19.000000000 +0000
-@@ -5,7 +5,7 @@
- #include <qframe.h>

- #include <qpixmap.h>

- 

--#include "../../../include/qwt3d_types.h"

-+#include <qwt3d_types.h>

- 

- #if QT_VERSION < 0x040000

- 

-diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
---- qwtplot3d.orig/examples/mesh2/src/functions.h	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/functions.h	2007-11-26 22:23:47.000000000 +0000
-@@ -2,8 +2,8 @@
- #define __EXAMPLE_H__

- 

- #include <math.h>

--#include "../../../include/qwt3d_parametricsurface.h"

--#include "../../../include/qwt3d_function.h"

-+#include <qwt3d_parametricsurface.h>

-+#include <qwt3d_function.h>

- 

- using namespace Qwt3D;

- 

-diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
---- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/lightingdlg.h	2007-11-26 22:24:41.000000000 +0000
-@@ -3,10 +3,10 @@
- 

- #include <math.h>

- #include <qapplication.h>

--#include "../../../include/qwt3d_parametricsurface.h"

--#include "../../../include/qwt3d_surfaceplot.h"

--#include "../../../include/qwt3d_enrichment.h"

--#include "../../../include/qwt3d_color.h"

-+#include <qwt3d_parametricsurface.h>

-+#include <qwt3d_surfaceplot.h>

-+#include <qwt3d_enrichment.h>

-+#include <qwt3d_color.h>

- 

- #if QT_VERSION < 0x040000

- #include "lightingdlgbase.h"

-diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp	2007-11-26 22:25:33.000000000 +0000
-@@ -33,9 +33,9 @@
- #include "colormapreader.h"

- #include "lightingdlg.h"

- #include "femreader.h"

--#include "../../../include/qwt3d_io.h"

--#include "../../../include/qwt3d_io_gl2ps.h"

--#include "../../../include/qwt3d_io_reader.h"

-+#include <qwt3d_io.h>

-+#include <qwt3d_io_gl2ps.h>

-+#include <qwt3d_io_reader.h>

- 

- using namespace Qwt3D;

- using namespace std;

-diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h	2007-11-26 22:26:09.000000000 +0000
-@@ -1,7 +1,7 @@
- #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code

- #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code

- 

--#include "../../../include/qwt3d_surfaceplot.h"

-+#include <qwt3d_surfaceplot.h>

- 

- 

- #if QT_VERSION < 0x040000

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
deleted file mode 100644
index a76fe831ab91..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
---- qwtplot3d-orig/include/qwt3d_function.h	2009-07-25 18:18:58.000000000 -0400
-+++ qwtplot3d/include/qwt3d_function.h	2009-07-25 18:19:19.000000000 -0400
-@@ -2,6 +2,7 @@
- #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code

- 

- #include "qwt3d_gridmapping.h"

-+#include <cstdio>

- 

- namespace Qwt3D

- {

-Only in qwtplot3d/tmp: qwt3d_function.o
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
deleted file mode 100644
index 831ad558d2f4..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- qwtplot3d.orig/qwtplot3d.pro	2007-11-26 22:16:54.000000000 +0000
-+++ qwtplot3d/qwtplot3d.pro	2007-11-26 23:45:18.000000000 +0000
-@@ -3,7 +3,7 @@
- 

- TARGET            = qwtplot3d

- TEMPLATE          = lib

--CONFIG           += qt warn_on opengl thread zlib debug

-+CONFIG           += qt warn_on opengl thread zlib

- MOC_DIR           = tmp

- OBJECTS_DIR       = tmp

- INCLUDEPATH       = include

-@@ -21,7 +21,7 @@
- win32:CONFIG -= zlib

- 

- linux-g++:TMAKE_CXXFLAGS += -fno-exceptions

--unix:VERSION = 0.2.6

-+unix:VERSION = 0.2.7

- 

- # Input

- SOURCES += src/qwt3d_axis.cpp \

-@@ -92,4 +92,4 @@
-   DEFINES += GL2PS_HAVE_ZLIB

-   win32:LIBS += zlib.lib

- 	unix:LIBS  += -lz

--}
-\ No newline at end of file
-+}

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
deleted file mode 100644
index 4e558eda7c96..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- include/qwt3d_openglhelper.h |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
-index e5499c2..a7ecddc 100644
---- a/include/qwt3d_openglhelper.h
-+++ b/include/qwt3d_openglhelper.h
-@@ -8,6 +8,11 @@
- #include <QtOpenGL/qgl.h>

- #endif

- 

-+#if QT_VERSION < 0x047999

-+#include <GL/glu.h>

-+#endif

-+

-+

- namespace Qwt3D

- {

- 

diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
deleted file mode 100644
index 81a77e13249f..000000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- qwtplot3d.pro.orig	2009-04-07 19:45:29.985645378 +0100
-+++ qwtplot3d.pro	2009-04-07 19:46:50.095747068 +0100
-@@ -80,13 +80,11 @@
-            include/qwt3d_graphplot.h \

-            include/qwt3d_multiplot.h

- 

--# gl2ps support

--HEADERS+=3rdparty/gl2ps/gl2ps.h \

--         include/qwt3d_io_gl2ps.h

-+# gl2ps support taken from system libs

-+HEADERS+=include/qwt3d_io_gl2ps.h

-          

--SOURCES+=src/qwt3d_io_gl2ps.cpp \

--         3rdparty/gl2ps/gl2ps.c

--

-+SOURCES+=src/qwt3d_io_gl2ps.cpp

-+unix:LIBS += -lgl2ps

- # zlib support for gl2ps

- zlib {

-   DEFINES += GL2PS_HAVE_ZLIB

---- src/qwt3d_io_gl2ps.cpp.orig	2009-04-07 19:44:38.536418391 +0100
-+++ src/qwt3d_io_gl2ps.cpp	2009-04-07 19:45:03.685133854 +0100
-@@ -4,7 +4,7 @@
- 

- #include <time.h>

- #include "qwt3d_openglhelper.h"

--#include "../3rdparty/gl2ps/gl2ps.h"

-+#include <gl2ps.h>

- #include "qwt3d_io_gl2ps.h"

- #include "qwt3d_plot.h"

- 

diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
deleted file mode 100644
index a63bd8a60d8b..000000000000
--- a/x11-libs/qwtplot3d/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription>
-		QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
-		providing essentially a  bunch of 3D-widgets for programmers.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">qwtplot3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
deleted file mode 100644
index 917693ee34ce..000000000000
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
-HOMEPAGE="http://qwtplot3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc examples"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	x11-libs/gl2ps"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-profile.patch
-	"${FILESDIR}"/${PN}-examples.patch
-	"${FILESDIR}"/${PN}-doxygen.patch
-	"${FILESDIR}"/${PN}-sys-gl2ps.patch
-	"${FILESDIR}"/${PN}-gcc44.patch
-	"${FILESDIR}"/${PN}-qt48.patch
-	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	cat >> ${PN}.pro <<-EOF
-		target.path = /usr/$(get_libdir)
-		headers.path = /usr/include/${PN}
-		headers.files = \$\$HEADERS
-		INSTALLS = target headers
-	EOF
-}
-
-src_compile() {
-	qt4-r2_src_compile
-	 if use doc ; then
-		 cd doc
-		 doxygen Doxyfile.doxygen || die "doxygen failed"
-	 fi
-}
-
-src_install () {
-	qt4-r2_src_install
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-	use doc && dohtml -r doc/web/doxygen/*
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3bdbfe6742dd..7b6fd3caa859 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/appmenu-qt/Manifest b/x11-misc/appmenu-qt/Manifest
deleted file mode 100644
index a9ba495baec0..000000000000
--- a/x11-misc/appmenu-qt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST appmenu-qt-0.2.6.tar.bz2 22569 BLAKE2B 92c5309c17088e9673da690f246c6201e0dd55a8df40c365bc821ff1570f8526734bb062d4357c377b4ad046590c491875ab846cd093bea45203e2edbb19369c SHA512 399c05f6983150ed585727e58998a95bd55657f54c4091a6cfb34716ace0a8f5d207f3b353aad72d5ca1d26b9b3c1a34abc69f6ed8c97dc47140674d2aac56fe
-EBUILD appmenu-qt-0.2.6.ebuild 506 BLAKE2B b8111bfcd208accb8f06a704020bb3a43a48d9a0287fa4661565574ea17eba456848929ea40c2e11460ae5f9fd0525cefe063b8d0407ce5539f4bccca10e93c9 SHA512 50518e1dcc8fe92e54904e22da81b48550c6bef89bb96d971b7daa7cc61bd495a120364d75fbdb46f7e09d451b03ffa33faf7fedb3cc328fdb3f524a89a69371
-MISC metadata.xml 327 BLAKE2B 1c24ba869c5ab522336e022b526008323210de0710ae29c36659b035b9b7088fda5106914ec105086e3c6f40e16cb0000ce7548810a9ac6a56e4868e81e89ec7 SHA512 a97f0962666dec43ae6efc7f5e37d8a089d554728463c3e956ec27b4d94acdff69a38577c65b0bb4c874c801e25561733edf0b12b932ed9bcdc7e0f202ee1a0e
diff --git a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
deleted file mode 100644
index 6cb5af4fb456..000000000000
--- a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Application menu module for Qt"
-HOMEPAGE="https://launchpad.net/appmenu-qt"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	>=dev-libs/libdbusmenu-qt-0.9.0[qt4]"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README )
diff --git a/x11-misc/appmenu-qt/metadata.xml b/x11-misc/appmenu-qt/metadata.xml
deleted file mode 100644
index 0f9dabe03579..000000000000
--- a/x11-misc/appmenu-qt/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="launchpad">appmenu-qt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/launchy/Manifest b/x11-misc/launchy/Manifest
deleted file mode 100644
index e9a607d3b7a0..000000000000
--- a/x11-misc/launchy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX launchy-2.5-prefix-and-libdir.patch 4616 BLAKE2B d391685a3e1cb35cb8a5c4ed3aba490548bfb95223f07f444582abd8c7b2479e90b73bcccbd7c0f8c9c32e619b8a5382ffee45e6efbe412d627f9e54244f802c SHA512 e170705bf0917ac0a943d3f9cd08ff606cd3e593ea05dd5bde32745a36d8436344a938dab811de361a2124ab64fc11fd234d70fbb59a9eacceb0064b6fcb03b0
-AUX launchy-2.5-underlink.patch 431 BLAKE2B aff4ea4f9a45ac4162243e8bbe770878ed1b73121c569c5238f66bc0b6a512dfcc67c859f184820d125ac236b1db1f0168e104b09fcf0a0d96d0e40274b48140 SHA512 e9df33fce8b5f01b598346c432facd3a5ef87b95888bd534913b0a7d7477b596cb469bb6b685599cfbe9621deeeaee50b01e01948245c34b185b00d528c9eb6b
-DIST launchy-2.5.tar.gz 2926807 BLAKE2B 7104012e76c0156a0432aaa039ea20be71fb82d062d8c78c5d2ae1a54f70dba5f7c468c7cce81fde74042c712c90d297f394e61c08a1990a171189b1ebd704f4 SHA512 31cf591184c81c5c44c174f12ffdec4fd15eb2f78af3195afceb9b11253d4bb17edee77b9316c8275828431b2ece5bfbc69f50b390eec27295828e80965c0930
-EBUILD launchy-2.5-r1.ebuild 952 BLAKE2B 36b91ec3d85d7d28fb624d4c21a42428e7ada7f273b057db081bb484791745acfb7c7dd5d2b65508854b0cddec4a34c8bbbc30b3e79741d82c6ccd2c2e3cba81 SHA512 fbcc0756d6e5fe3bf19d6e085f47674f971c92f500aca82e87114ff9807bb69ea0dfa6e5d446fb78af9e20bc3ac80de6c839d1af112865fa6a69d869e61f3bc0
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch
deleted file mode 100644
index 5b277786e871..000000000000
--- a/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur a/platforms/unix/unix.pro b/platforms/unix/unix.pro
---- a/platforms/unix/unix.pro	2008-09-01 03:40:56.000000000 +0300
-+++ b/platforms/unix/unix.pro	2017-03-01 15:44:50.201858265 +0200
-@@ -11,11 +11,10 @@
- 

- 

- unix {

-- PREFIX = /usr

-  DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

--           PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \

--           PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"

-- target.path = $$PREFIX/lib/launchy/

-+           PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \

-+           PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"

-+ target.path = $$PREFIX/$$LIBDIR/launchy/

-  INSTALLS += target

- }

- 

-diff -ur a/plugins/calcy/calcy.pro b/plugins/calcy/calcy.pro
---- a/plugins/calcy/calcy.pro	2010-03-08 01:02:22.000000000 +0200
-+++ b/plugins/calcy/calcy.pro	2017-03-01 15:46:49.252849881 +0200
-@@ -26,9 +26,8 @@
- 

- 

- unix:!macx {

--    PREFIX = /usr

--    target.path = $$PREFIX/lib/launchy/plugins/

--    icon.path = $$PREFIX/lib/launchy/plugins/icons/

-+    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

-+    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

-     icon.files = calcy.png

-     INSTALLS += target \

-         icon

-diff -ur a/plugins/gcalc/gcalc.pro b/plugins/gcalc/gcalc.pro
---- a/plugins/gcalc/gcalc.pro	2010-02-15 23:07:34.000000000 +0200
-+++ b/plugins/gcalc/gcalc.pro	2017-03-01 15:48:00.542647288 +0200
-@@ -19,10 +19,9 @@
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins

- if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins

- unix:!macx {

--    PREFIX = /usr

--    target.path = $$PREFIX/lib/launchy/plugins/

-+    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

-     

--    # icon.path = $$PREFIX/lib/launchy/plugins/icons/

-+    # icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

-     # icon.files = gcalc.png

-     INSTALLS += target

- }

-diff -ur a/plugins/runner/runner.pro b/plugins/runner/runner.pro
---- a/plugins/runner/runner.pro	2010-02-15 23:07:34.000000000 +0200
-+++ b/plugins/runner/runner.pro	2017-03-01 15:46:22.202306212 +0200
-@@ -42,9 +42,8 @@
- }

- 

- unix:!macx {

-- PREFIX = /usr

-- target.path = $$PREFIX/lib/launchy/plugins/

-- icon.path = $$PREFIX/lib/launchy/plugins/icons/

-+ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

-+ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

-  icon.files = runner.png

-  INSTALLS += target icon

- }

-diff -ur a/plugins/verby/verby.pro b/plugins/verby/verby.pro
---- a/plugins/verby/verby.pro	2010-02-15 23:07:34.000000000 +0200
-+++ b/plugins/verby/verby.pro	2017-03-01 15:47:09.785503507 +0200
-@@ -31,9 +31,8 @@
-         /WX

- }

- unix:!macx {

--    PREFIX = /usr

--    target.path = $$PREFIX/lib/launchy/plugins/

--    icon.path = $$PREFIX/lib/launchy/plugins/icons/

-+    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

-+    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

-     icon.files = verby.png copy.png opencontainer.png properties.png run.png

-     INSTALLS += target \

-         icon

-diff -ur a/plugins/weby/weby.pro b/plugins/weby/weby.pro
---- a/plugins/weby/weby.pro	2010-02-15 23:07:34.000000000 +0200
-+++ b/plugins/weby/weby.pro	2017-03-01 15:47:30.764149617 +0200
-@@ -32,9 +32,8 @@
- if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins

- if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins

- unix:!macx {

--    PREFIX = /usr

--    target.path = $$PREFIX/lib/launchy/plugins/

--    icon.path = $$PREFIX/lib/launchy/plugins/icons/

-+    target.path = $$PREFIX/$$LIBDIR/launchy/plugins/

-+    icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/

-     icon.files = weby.png

-     INSTALLS += target \

-         icon

-diff -ur a/src/src.pro b/src/src.pro
---- a/src/src.pro	2017-03-01 15:50:28.430152700 +0200
-+++ b/src/src.pro	2017-03-01 15:51:18.931300883 +0200
-@@ -71,11 +71,10 @@
-                 platform_base_hotkey.h \

-                 platform_base_hottrigger.h

- 

--    PREFIX = /usr

-     LIBS += -lX11 -lXext -lXrender

-     DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

--        PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \

--        PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\"

-+        PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \

-+        PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\"

-     if(!debug_and_release|build_pass) { 

-         CONFIG(debug, debug|release):DESTDIR = ../debug/

-         CONFIG(release, debug|release):DESTDIR = ../release/

-Only in a/src: src.pro.orig
diff --git a/x11-misc/launchy/files/launchy-2.5-underlink.patch b/x11-misc/launchy/files/launchy-2.5-underlink.patch
deleted file mode 100644
index f14110d581b5..000000000000
--- a/x11-misc/launchy/files/launchy-2.5-underlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/src.pro b/src/src.pro
-index 13a627d..f720a22 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -72,6 +72,7 @@ unix:!macx {
-                 platform_base_hottrigger.h

- 

-     PREFIX = /usr

-+    LIBS += -lX11 -lXext -lXrender

-     DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

-         PLUGINS_PATH=\\\"$$PREFIX/lib64/launchy/plugins/\\\" \

-         PLATFORMS_PATH=\\\"$$PREFIX/lib64/launchy/\\\"

diff --git a/x11-misc/launchy/launchy-2.5-r1.ebuild b/x11-misc/launchy/launchy-2.5-r1.ebuild
deleted file mode 100644
index 8b1a33abaefe..000000000000
--- a/x11-misc/launchy/launchy-2.5-r1.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
-inherit fdo-mime gnome2-utils qmake-utils
-
-DESCRIPTION="utility that merges application menus, your desktop and even your file manager"
-HOMEPAGE="http://www.launchy.net/"
-SRC_URI="http://www.launchy.net/downloads/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:4
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	x11-proto/xproto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-prefix-and-libdir.patch
-)
-
-src_configure() {
-	eqmake4 Launchy.pro PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/launchy/metadata.xml b/x11-misc/launchy/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/x11-misc/launchy/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/x11-misc/ptbatterysystemtray/Manifest b/x11-misc/ptbatterysystemtray/Manifest
deleted file mode 100644
index 7c2a2a149e92..000000000000
--- a/x11-misc/ptbatterysystemtray/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ptbatterysystemtray-1.0.0_rc2.tar.gz 234884 BLAKE2B e0e35440ae2db843150f73d5f4e7a118ddc71e185ed3471ddffc8524a92866c503ad7242402ec8080befe4f56d52a25aab5856026aa0f08369d599a9864d16ef SHA512 869eb71032691738277c1ba16b9e8d6e79ab25e8c533c2c12b4a69c6dbfee53d40bb471e4d28ce60b9e3dae19aea166953b5d5641ae0ba873ef55811fdd088e5
-EBUILD ptbatterysystemtray-1.0.0_rc2.ebuild 573 BLAKE2B 39f34db5f0fee4812775861cb9f5749999dd607da9389649d07ca2b9ae0292458cf49c2e15df47334256a5d1e40fb1f7df545c54e3eddf740d1c70154eb2e5f5 SHA512 b18651104546a219aa0e7aea10f697bfa5363e97a647cf9b07c73decfb891097f14a3640db726fa71037c6f9fda8ec008d24725141a065965413db3ab1efb2d6
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/ptbatterysystemtray/metadata.xml b/x11-misc/ptbatterysystemtray/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-misc/ptbatterysystemtray/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild b/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
deleted file mode 100644
index 7d6fc320438b..000000000000
--- a/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="A simple battery monitor in the system tray"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-src_unpack() {
-	default
-	mv ${PN}-${PN} "${S}" || die
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro INSTALL_PREFIX=/usr
-}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index e9740daf45d4..8f6de746484a 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -9,8 +9,10 @@ AUX synergy-1.8.5-gtest.patch 826 BLAKE2B 664d765908f2bf688712106c2d8961cdfe5518
 DIST synergy-1.6.3.tar.gz 4405517 BLAKE2B 46a56a9833ac0132d0fefcbeefccbc440d3d4e123eceb4ccb04eedadd6fa9dec9abb6f7770d6739b576006783a8890788d53027d9d5a5b245ef6b14dc704e72b SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165
 DIST synergy-1.8.6.tar.gz 13497043 BLAKE2B f74f6d48203bc49d7a74cf2f951ea506a1887b659e34954651d2a8333e604e3e41e04b5e6b6115b8b8ded6e94fbad004b0673465cb0734a57d137992f432a3c4 SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5
 DIST synergy-1.8.8.tar.gz 13498599 BLAKE2B 40c52ed036ef21594d330f1b4e32b647bdb3076147d40f2437f649a54700cb4a7822137587c129f9bede26a93e872961135ee27dfb3b8f4256153a5e982737a1 SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6
+DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
 EBUILD synergy-1.6.3.ebuild 2406 BLAKE2B fccac8ec8452150770e0d72a650bc6db33de864dc5a31baae99810e9cba177aff02653d3d6758497c4f9405c643823958136b548d51663c7087e8c8932f04f24 SHA512 8979d5e0541eea94e80d653af332ba013b270710fadc2125db70381c738ae56e4f1e5fc156b637d59b34b3074a9f084ada93aa056005c47167594ae0cb7a3ccd
 EBUILD synergy-1.8.6.ebuild 2255 BLAKE2B 5d9cbc5bd3910e50154c6a5fd53e51d6604af596832095cede94fe7a1110bf2162b906d5be74fb9aef406aaf3efada240f0c60c31da1ebdfd7b25430171c7d45 SHA512 f0109385bdf1be9e758bdfccf16c0e364423c3baf81e8506ea9eece2be26be402c36f72e913c823dec972283af643b2404ae5d7089f254e430ab9d26187d68da
 EBUILD synergy-1.8.8.ebuild 2215 BLAKE2B 7b121b95d47c61d93e93bc846bad4d861f7a15b3c81dd22f725fe1a9339c04912470c5d95c191b02544b09228b85fd9582e43ffe91ec92df7d8f491b130157d8 SHA512 20ea1c4d68a061a97146f6de4b126359401ba0af77eba8edc97dc0cf181fff71a47611b7d5a0acf3123b93b750857ceefe3f716f16c0c737f9b473fe3cbe16a3
+EBUILD synergy-2.0.0.ebuild 1523 BLAKE2B 50480821517f81b140d98d058820eb5c1b025d138d4a60a3e19474feef00ddfc0bf320926da80c1c9d9ab39812939546b47c9fbd84b6baa0bc4bd6c2e5b6e7d0 SHA512 b597dcda5df44bf7b380445b8cdfdeef9fc9439197d1bd2b18e7d0ac29b304b9af8cfc77377910fa33a180d86f59ae87f81515ebe9c1f323ba1399b55c5ffc7a
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
new file mode 100644
index 000000000000..c4ab5b400e9b
--- /dev/null
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# 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 cmake-utils
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/symless/synergy"
+SRC_URI="
+	https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl"
+
+S=${WORKDIR}/${PN}-core-${PV}-stable
+
+COMMON_DEPEND="
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-cxxflags ${mycmakeargs}
+	local mycmakeargs=(  -DSYNERGY_REVISION=0bd448d5 )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install () {
+	dobin ../${P}_build/bin/${PN}{c,s} ../${P}_build/bin/synergy-core
+
+	insinto /etc
+	newins doc/synergy.conf.example synergy.conf
+
+	newman doc/${PN}c.man ${PN}c.1
+	newman doc/${PN}s.man ${PN}s.1
+
+	dodoc doc/synergy.conf.example* ChangeLog
+}
diff --git a/x11-misc/touchfreeze/Manifest b/x11-misc/touchfreeze/Manifest
deleted file mode 100644
index e6e5607fece8..000000000000
--- a/x11-misc/touchfreeze/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX touchfreeze-0.2.5-underlinking.patch 226 BLAKE2B 64072dabb111ca3cac1fb879ea3e72e04a86b2f404bb4cc3c3f58bc22744b730c775361f72ed8789d29efe190783b23e82fc19c5fde6e5feb830db608eccb95c SHA512 d2d456dad1392f7ce699c9d66ccbc519f71ab2514a3a8e1dab78feb0eddcc23c43f277bbfb8081443005bee63545faa3b240b903300a27693a76ab83e01651e4
-DIST touchfreeze-0.2.5.tar.gz 24023 BLAKE2B e18c7ed107185ce4a612aabc12c902e98530bd3132a7aadc61f786cd266cfc916c7691a610f07b73bac7f2a09d4a5c4f32be84f9de01d0bdccc478c5e6b3433e SHA512 cd391cf91b6cb7f85253f38413fd67a130e3cee1115dd0673dcd9de65ef22ffa1bc33649ea52ba2d98ae72b525ec006874e5e64adeda7bcf5cedfc553e5d992b
-EBUILD touchfreeze-0.2.5-r1.ebuild 714 BLAKE2B b286a9b22cc1fa5ec46891a6db29ef8fcaafb1e7efbff9d3aa5bbd9f7984d89890f3605910d298197d9c17c2348107ae7e3b14e6043037cf29a52a4f5e76c454 SHA512 02398936df313882f5e0dfeb9aa3e82fad6771f68a880ee16c0d1a498786763204a9508ad5fb333259cf4ba13fc027c1e3eb85db94b7829c4b9ea95b8152f1f2
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch b/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch
deleted file mode 100644
index e9f331307680..000000000000
--- a/x11-misc/touchfreeze/files/touchfreeze-0.2.5-underlinking.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- TouchFreeze.pro
-+++ TouchFreeze.pro
-@@ -3,3 +3,4 @@
- RESOURCES+=stuff.qrc
- SOURCES+=main.cpp TouchFreezeApp.cpp TouchFreezeUI.cpp SynDaemon.cpp
- HEADERS+=TouchFreezeApp.h TouchFreezeUI.h SynDaemon.h Version.h
-+LIBS+=-lX11
diff --git a/x11-misc/touchfreeze/metadata.xml b/x11-misc/touchfreeze/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/x11-misc/touchfreeze/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild b/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
deleted file mode 100644
index a473260e01e7..000000000000
--- a/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="X11 touch pad driver configuration utility"
-HOMEPAGE="http://kde-apps.org/content/show.php/TouchFreeze?content=61442"
-SRC_URI="http://www.fit.vutbr.cz/~kombrink/personal/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="x11-libs/libX11
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}
-	x11-drivers/xf86-input-synaptics
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_install() {
-	dobin ${PN}
-	newicon res/touchpad.svg ${PN}.svg
-	dodoc AUTHORS README
-	make_desktop_entry ${PN} TouchFreeze ${PN} 'Qt;System'
-}
diff --git a/x11-misc/wmiface/Manifest b/x11-misc/wmiface/Manifest
deleted file mode 100644
index c2edd97bd3a4..000000000000
--- a/x11-misc/wmiface/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wmiface-2.1.tar.gz 95167 BLAKE2B b5314dd70b502e1ed65da631fcea6b6623238f5934f64fed5a1788f52bd9dfdbd1a74d9ac1136609fc7fb3111f163c05ba9d3ac2e6e5b1906feffb702d7b4e5a SHA512 767ec2f0a23def3a5e00c77702049356a08b6bad51becfa685e47be53408de5206c36df0aa394947318b3f54481646d2b0b1a4394e79cfe08281d8fb41a3e568
-EBUILD wmiface-2.1.ebuild 493 BLAKE2B 13a9d36950147fe18078b916db0d7681caffc3f54b7f49f36dd4dbda8f2d6d079e46e2b2bca58760a1a6ac26c0e2a364d9966b332180b25d5153beb4b2eff413 SHA512 75bcc6e4cf25f570894e038fceea6fdb8467af0481489ce1edb1b2f106b0b90873a9528f5f141c7130151bce50a78fd618e8ad6371946752ad270a69fb8436ca
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/wmiface/metadata.xml b/x11-misc/wmiface/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/x11-misc/wmiface/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/x11-misc/wmiface/wmiface-2.1.ebuild b/x11-misc/wmiface/wmiface-2.1.ebuild
deleted file mode 100644
index 7ca378bc55e7..000000000000
--- a/x11-misc/wmiface/wmiface-2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Command line tool allowing user scripting of the running window manager"
-HOMEPAGE="http://kde-apps.org/content/show.php/WMIface?content=40425"
-SRC_URI="https://home.kde.org/~seli/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	x11-libs/libX11
-"
-DEPEND="${DEPEND}
-	dev-qt/qtgui:4
-"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 38893cfc3213..a4a203c77186 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 3e29d49fefa0..2f51975b9880 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,4 +1,6 @@
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
+DIST enigmail-2.0-beta1.tar.gz 2116808 BLAKE2B a539e7bf97e12327ae2a7e9fafdc2ad4298f9dd602333aa6d414b4c6770b3279cc0c9e100cb3be6be86c49f17b4c76759676efc963fe04e8fe522a8aad345f47 SHA512 ddbf540c0d628c19c7ddbcd01686dcdec53385113367e9f3ef683e3ebc97e17cbdbe62e7623b7b1be41967f47cd430b4f2d2fba1d0a86773c836ffc6ceb8f548
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
-EBUILD enigmail-9999.ebuild 1915 BLAKE2B ccff9cc03869ccc02a313a3f96cdf25081424b295e03dca6f6a69449da99013708efc20fd5141e61cff2b68640d466a6141a60df51b29803c4ac11a47eebdcd6 SHA512 4b8c948bf8aef1eb2d2a422ee66d8ad0df4a0ef312ca7c16dbe12654b0bcc504e3882bbd258e5630a0e51977f14028b059940b47fb464bb7534daf47d6270374
+EBUILD enigmail-2.0_beta1.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
+EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0_beta1.ebuild b/x11-plugins/enigmail/enigmail-2.0_beta1.ebuild
new file mode 100644
index 000000000000..9e8d0cbb3958
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0_beta1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index ec95bc9fb44a..66f465afa7c6 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,23 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-r3 python-any-r1
+inherit python-any-r1
 
 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
 HOMEPAGE="http://www.enigmail.net/"
 
-KEYWORDS=""
 SLOT="0"
 LICENSE="MPL-2.0 GPL-3"
 IUSE=""
 if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
 	S="${WORKDIR}/${P}"
 else
-	SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
 	S="${WORKDIR}/${PN}"
 fi
 
diff --git a/x11-proto/Manifest.gz b/x11-proto/Manifest.gz
index 977c42a1e8ec..c8a9b0d4d11c 100644
--- a/x11-proto/Manifest.gz
+++ b/x11-proto/Manifest.gz
diff --git a/x11-proto/xorgproto/Manifest b/x11-proto/xorgproto/Manifest
index dece4813283a..6923ec2edbb5 100644
--- a/x11-proto/xorgproto/Manifest
+++ b/x11-proto/xorgproto/Manifest
@@ -1,2 +1,4 @@
+DIST xorgproto-2018.2.tar.gz 461877 BLAKE2B f7a802b9dec3c51981a3244cf62ffe0abd89f88cb28d3a3799e8a174ea11e48a0faf85febfcb5e96e12c3a843cdb09077a6aa4101852c748a15bc847ba29c883 SHA512 31bff77c54e4832dbd55534b90606e49b2face0356245edd7d6028f26b06fa9e95dab63aed23d55f8552291fa384f65dde2f223b96cc705e98c425a1d0dd3d4b
+EBUILD xorgproto-2018.2.ebuild 1724 BLAKE2B 60e245f5b8a02cf15cb8d0d2f1bd6274e1bc84a11c66c37b797f466511bfcbb946bc7fe13de6a714b91fcf6129ed5a185813ce9237f8ce5c0bc4acaac1e14741 SHA512 538e7f2c4a8f7623ac4c1635d91de6eef2c695b2669206f4dd75a0fd7aa701e68cac66496d42eee6364ad5309bc7e5e1e3b61e127d83a103f52253b643a0ed5a
 EBUILD xorgproto-9999.ebuild 1724 BLAKE2B 60e245f5b8a02cf15cb8d0d2f1bd6274e1bc84a11c66c37b797f466511bfcbb946bc7fe13de6a714b91fcf6129ed5a185813ce9237f8ce5c0bc4acaac1e14741 SHA512 538e7f2c4a8f7623ac4c1635d91de6eef2c695b2669206f4dd75a0fd7aa701e68cac66496d42eee6364ad5309bc7e5e1e3b61e127d83a103f52253b643a0ed5a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xorgproto/xorgproto-2018.2.ebuild b/x11-proto/xorgproto/xorgproto-2018.2.ebuild
new file mode 100644
index 000000000000..9b4dce089d5a
--- /dev/null
+++ b/x11-proto/xorgproto/xorgproto-2018.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	!<x11-proto/bigreqsproto-1.1.2-r1
+	!<x11-proto/compositeproto-0.4.2-r2
+	!<x11-proto/damageproto-1.2.1-r2
+	!<x11-proto/dmxproto-2.3.1-r2
+	!<x11-proto/dri2proto-2.8-r2
+	!<x11-proto/dri3proto-1.0-r1
+	!<x11-proto/fixesproto-5.0-r2
+	!<x11-proto/fontsproto-2.1.3-r1
+	!<x11-proto/glproto-1.4.17-r2
+	!<x11-proto/inputproto-2.3.2-r1
+	!<x11-proto/kbproto-1.0.7-r1
+	!<x11-proto/presentproto-1.1-r1
+	!<x11-proto/randrproto-1.5.0-r1
+	!<x11-proto/recordproto-1.14.2-r2
+	!<x11-proto/renderproto-0.11.1-r2
+	!<x11-proto/resourceproto-1.2.0-r1
+	!<x11-proto/scrnsaverproto-1.2.2-r2
+	!<x11-proto/trapproto-3.4.3-r1
+	!<x11-proto/videoproto-2.3.3-r1
+	!<x11-proto/xcmiscproto-1.2.2-r1
+	!<x11-proto/xextproto-7.3.0-r1
+	!<x11-proto/xf86bigfontproto-1.2.0-r2
+	!<x11-proto/xf86dgaproto-2.1-r3
+	!<x11-proto/xf86driproto-2.1.1-r2
+	!<x11-proto/xf86miscproto-0.9.3-r1
+	!<x11-proto/xf86vidmodeproto-2.3.1-r2
+	!<x11-proto/xineramaproto-1.2.1-r2
+	!<x11-proto/xproto-7.0.31-r1
+
+	!x11-proto/fontcacheproto
+	!x11-proto/printproto
+	!x11-proto/xf86rushproto"
+RDEPEND=""
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 6f352e081d1b..28b5ea80cfbd 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/iceicons/Manifest b/x11-themes/iceicons/Manifest
index 19bb636ec64e..4b0a9c1eacaf 100644
--- a/x11-themes/iceicons/Manifest
+++ b/x11-themes/iceicons/Manifest
@@ -1,3 +1,3 @@
 DIST iceicons-default-0.10.0.tar.gz 1462091 BLAKE2B a893d0f4b5f5082759bb109390742edbbb5ff46cc02153b69499a29d4403ed7ae573e71837a63acabe70f0a43dbac92b0774f74c7f818982867ab7d486c2be4d SHA512 310564a4f3c5df4209d4f8ae451d76c5c04928a6be5cb1c96124751f3d748a2d95926f6444bf5efc9bf2d447e6b836877cb8913b3ce1c161994600ad85ebdd02
-EBUILD iceicons-0.10.0.ebuild 1001 BLAKE2B df2eeec8d149d41f6c3b40208d49fb33235c594bbaebb159651ce3cd3f468c77aca769662f95710d02b2546de81f6f7830eb49eb80cfd5af2145e76ae97f5b05 SHA512 a7558fc9b279deee9e008cc8443807e4fa9779d0e3212167c706ec87b2a20ca9520fcdb9e92fc9c6e09df18039b68b17fb41d884fed1bb54b79bb843646b531b
+EBUILD iceicons-0.10.0-r1.ebuild 1002 BLAKE2B 8d6a5d05b2e887338d5eb021a303a0171dec1f0d441860fabf544b53a2c7de6b922e90caf6f0ed8f831d5aa12a7d0c295901033a29739d2f1e9cef219dc10ee5 SHA512 1b01f2f5d118cec8a193dbbc5cac8d068584540f03e4ffa47ab9fc017fb115390bba2e272b2a1457df83dc61f1c3fe949ef9e622c245c6439ded0eaf701628ef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild b/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..738f93297aa8
--- /dev/null
+++ b/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM"
+HOMEPAGE="http://sandbox.cz/~covex/icewm/iceicons/"
+SRC_URI="http://sandbox.cz/~covex/icewm/iceicons/${PN}-default-${PV}.tar.gz"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-wm/icewm-1.2.6"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+ICEICONSDIR="/usr/share/icewm/icons/iceicons"
+
+src_install() {
+	dodir "${ICEICONSDIR}"
+	cp -pPR icons/* "${D}"/"${ICEICONSDIR}" || die
+	chown -R root:0 "${D}"/"${ICEICONSDIR}" || die
+	chmod -R o-w "${D}"/"${ICEICONSDIR}" || die
+
+	dodoc CHANGELOG README TODO winoptions
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use new IceWm icons, add following"
+	einfo "into your IceWm preference file:"
+	einfo "IconPath=\"${ICEICONSDIR}:${ICEICONSDIR}/menuitems\""
+	einfo
+}
+
+pkg_postrm(){
+	einfo
+	einfo "Update your IceWm preference."
+	einfo
+}
diff --git a/x11-themes/iceicons/iceicons-0.10.0.ebuild b/x11-themes/iceicons/iceicons-0.10.0.ebuild
deleted file mode 100644
index e90157bf0aa6..000000000000
--- a/x11-themes/iceicons/iceicons-0.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM"
-HOMEPAGE="http://sandbox.cz/~covex/icewm/iceicons/"
-SRC_URI="http://sandbox.cz/~covex/icewm/iceicons/${PN}-default-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-wm/icewm-1.2.6"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-ICEICONSDIR="/usr/share/icewm/icons/iceicons"
-
-src_install() {
-	dodir "${ICEICONSDIR}"
-	cp -pPR icons/* "${D}"/"${ICEICONSDIR}" || die
-	chown -R root:0 "${D}"/"${ICEICONSDIR}" || die
-	chmod -R o-w "${D}"/"${ICEICONSDIR}" || die
-
-	dodoc CHANGELOG README TODO winoptions
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use new IceWm icons, add following"
-	einfo "into your IceWm preference file:"
-	einfo "IconPath=\"${ICEICONSDIR}:${ICEICONSDIR}/menuitems\""
-	einfo
-}
-
-pkg_postrm(){
-	einfo
-	einfo "Update your IceWm preference."
-	einfo
-}
diff --git a/x11-themes/lush/Manifest b/x11-themes/lush/Manifest
deleted file mode 100644
index 92f82a6dc222..000000000000
--- a/x11-themes/lush/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lush-0.1.0dave.tar.gz 2072409 BLAKE2B f4b806235d6061018bfd22d266e2f007dbe214f34c121bdbb265c8a138062feaa0300d625ed0f70da6ea0ae68739fb78cf197c6b900b154004da8c459152af2c SHA512 b31faf384637b15b2355641d2830d0fd904aad8d5fae733d65f2ea5796ca5d301ce57090f7c7e44a3ecef87579071436ba1fcfc972500249158333921637406d
-EBUILD lush-0.1.0-r2.ebuild 438 BLAKE2B 9c4b3f972c51225238eab1724f1c3c89f29ddb4267a9b0ecd076a4c83758d2ebfacc15c6eb60e19e1af499f9880b3f98cae49f555b61d74089639cfcc56e50ec SHA512 35fe2ca04fa59bc15fdb9f09383b9c06db4a135a4c18979d437a8e0879c07dcb3d713e2ebc906fefea3299028de6c8a85a338a78b5c9e574b38df0a464f2baee
-MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/x11-themes/lush/lush-0.1.0-r2.ebuild b/x11-themes/lush/lush-0.1.0-r2.ebuild
deleted file mode 100644
index 3fd65ced3580..000000000000
--- a/x11-themes/lush/lush-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-S="${WORKDIR}"
-DESCRIPTION="Lush KDE icon theme"
-SRC_URI="mirror://gentoo/${P}dave.tar.gz"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5483"
-
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-LICENSE="GPL-1"
-
-SLOT="0"
-IUSE=""
-
-RESTRICT="strip binchecks"
-
-src_install(){
-	insinto /usr/share/icons
-	doins -r lush
-}
diff --git a/x11-themes/lush/metadata.xml b/x11-themes/lush/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/x11-themes/lush/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/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 11f465a14a39..de8926196544 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e9ecd86fb57b..c0d9fe046faa 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,7 +4,7 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
-EBUILD i3-4.14.1.ebuild 2288 BLAKE2B 8b61896ae179c7130cfe4e220347af27d68401a18703017036032c7100976541a240f65e10465bdb359cca6c1dc86717dab041b80507825f84e89ee6bfc84c0e SHA512 3a66ade6582d9c4a5c45b76eb0dc4d1c1278c51f4e55ddda5d80da65ae1154b13b7e02fecc663ae2605191366eb82affd10a885bf33240a9598f5e27effe915c
+EBUILD i3-4.14.1.ebuild 2281 BLAKE2B 3caa4d75153e68ad87137c223af7c349a5e52b9a05bd4e76c94607083571c6c05102c6b7596e4ac1b7815a798657fa816de03c172e613289cf8f1b6bed7e364b SHA512 eadf625bb151263d864476a15665acea1d98b0e1d8dcda54f60ebd25d58c42cc4a476c59730ea6f6fbdcff773625ae758f9bd06c5070a4dafb5a725963816333
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
 EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index df485534f2f4..3c204ad407fc 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index c6a59ed10a77..ad6895ef1b91 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,26 +1,6 @@
-AUX IceWM.desktop 185 BLAKE2B 1bf06de1f57b2afb1b4972187315b1fa2ffd203483ac64a8724f0d57296ff134c139db9ed8063e188476e8bef5d73e7d2c152829d7d68e7e3dc4ba05491a5c4b SHA512 9e44391fa20f02f8aa0495c0d77ec10799e7b7097fff495dbabed457a88c17e00fd53a295b0e0293e8aae275b424928f83cac4e2313afa1cb2b8a1e7ac24c711
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
-AUX icewm-1.3.7-dso.patch 376 BLAKE2B bd75e019ddbf6bc8ee8d870ddc44a0c13468c71d0dd3ad3426c5f2030692ff7ee8f78e88ddafb9abfe47aa4999b39da9ed36c6be814d94fb5ec81deb9fa45243 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a
-AUX icewm-1.3.7-gcc44.patch 434 BLAKE2B 126524e70a73cdc7f0ace652e1c42a404a3bcd7df9b4d7fce8e56cc4a2a7101eebf97d5e0ed7942d22c87dbed0c6ed50b4af00aa0685a94f3acb02a0be937731 SHA512 12acc47b5938234bfa76e38f2c6f7ff0e2528aa4feac8bd19eec6743d994f7b5465373ff708232fc3ddcc5fe3cb8c21fda34d1ea6e0e860bb86c58503b2f8d65
-AUX icewm-1.3.7-menuiconsize.patch 2435 BLAKE2B 69fce71d787e51ff3da91c04d4d984de4f4d6d8060b3bc1b65ab850fe4e85fcd33901d8d6199859d390b80c8d93bfff2530a53b6a4722a5bc89e2a47bdb9ddd9 SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d
-AUX icewm-1.3.7-thermal.patch 1335 BLAKE2B 1b42bc48030aed401bc2d47988c0ace5f00ad4d412e5745f1b6c56bc42d8a37b94503714833953cb3329bd04b11cc3ea988a46db6baab3f2faca64afdcfb68d8 SHA512 3d6cfce4980a19cc16a1c56737300157f73261e0f8e512063f3ac43ac177acbe635d9e9456cdfd2e177899091e620caf0cfad1f651e533cfa5c1712e71b90650
-AUX icewm-1.3.8-build-fixes.patch 3821 BLAKE2B d47bf052ad1b800626ddd98b7715ad3af5a4011e0d38d29e419dfe71fdc86533b23ddbeadbf4c1d4e002d6821fcbad63d7e2d7abcc54ff3d8e2238e6adb9ffd6 SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362
-AUX icewm-1.3.8-deprecated.patch 317 BLAKE2B 94949f8d48b8036355df4d488c43f9c935969502d37f39ab66896683c84d5a6d22cb03d8995680c275a24f39de47285f55f9da3076350d10a85c2c73a827094a SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa
-AUX icewm-1.3.8-menu.patch 928 BLAKE2B 33a2a72afdb1999ccb1fb4d5a8d9432220d726e85cdf632a96c21eec85f216ac88de1c4279bc4efc224621426254d19204bb7a597d1428db5a715742927b2fff SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
-AUX icewm-defaults.patch 694 BLAKE2B 191396b555efb2324dd7c3e6ce60c5e497e652039e233acfbb6981d2c4d0c4616638e0d3074bec600f4f33ff725d4a3ef97dcae7953f09805cc24998b478487e SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919
-AUX icewm-fribidi.patch 2168 BLAKE2B 345e8f7064ca31b5ec767559de124d5e376762015fd0135e6880cb8dbdc8dd59da4e91dbb25ab604532ad8b57d2fe66731bbd24d6b3074d28c6d00d7bf5a5eb3 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5
-AUX icewm-keys.patch 1870 BLAKE2B 28646b6bf5f697a3d241943ab1beefd9b686de9ca548ca66fb9bfc2198e931346ad77004e6943ce31d5784d8867510081bd878077c6d32eeb93fe3da21c73350 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43
-AUX icewm-startup 177 BLAKE2B 4c6cd3214c8906153a9875d84e525997102ef3af0a67475a98cda04336f5c19a2ae04cf5645627dcbe846902a375ab34b8b06f6ed737c4373584d305925f9e3c SHA512 512edf9e94a8bb240e932fa3be7fd4bc78635a0fe0e41ed96de520be188f23d2e03115868f4b3610d190eff50f011531e61ca8eaccbbf194a232e991713580d9
-AUX icewm-toolbar.patch 476 BLAKE2B f0c302422815ede382b0e495baa6039b2c6836e5b8e0a8223bc82331e7347a30fc358e6a9cb688ecc9b83f2d819b46ce639216195b8dd559f0efeab1f97572f0 SHA512 66c434c385454e139e495bc9f475f403e0c2f2b241ee2dc4903ab1975198152211b21f836c39338d5a796b2ac8a40f6ce4cb09a6878467bab50177fc105eb9fe
-AUX icewm-xdg-menu 4380 BLAKE2B cbe57d6029727500292f2f618923357a20aaecfdf8acb4c82bf7679ce219d25b88a0273d4c87103a9e3385486cd03fa1c0734523b999c93b48c615d7eb84a783 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3
-DIST icewm-1.3.12.tar.gz 944617 BLAKE2B b95ab2bc77c3370f4da4f6a1f4b2c38a772f0e53d7613ad28244e37c460421f681c58f16e9e94533365d386a4be83de69303d9a0bd16caef18c4a655d2060514 SHA512 b2704ab69a1910cab6711ca11b79fa32f66747fe04468eff86813812fa855423ed43144ab0290e245221520a919755c0e153b60ff238ace60f9546af595063ee
-DIST icewm-1.3.8.tar.gz 905680 BLAKE2B dcb794ab6bd0a4b31240bb5506b2504d04a82ca267223d41c6b31f0447fa5e1541d58068776fba97aa33016567c66268937a6c3afafc7151bac4c1081ddc3db3 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72
-DIST icewm-1.4.0.tar.gz 1732329 BLAKE2B 2fec09fbea04b96fcd3ec5d26a4bac5ece153b6bab774804287bfb4b8757e92e04aecc7a8b6f9f3c11b1abc5106d39fd02b54e8e60c8146edab1d8b03e2d223a SHA512 ee0a80912bce5c94121f8c9b4e2f914e6a47dc810fe83528544f8644d9e5c4c61573c5a604d22af737be653fcfa1c64c10e0be0e663ce02cf982ba19dae7396e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-EBUILD icewm-1.3.12-r1.ebuild 2557 BLAKE2B 2ce9cc71babd67a3bcdf439cf43409c187bd98537f42cdbf07bb048db596c7cf336d63b605da40339439b80576856cecefa9438e556b6bf1c9a449f8a1652b61 SHA512 3f80f6085819384fd0cc9d35a61213491f47a07462a39e027ea97ef6fd49a624e4bc4ff6eb62f76b1839ddec75cdb53f65421b19f7be7523c6ee45994f7e87f9
-EBUILD icewm-1.3.8.ebuild 3324 BLAKE2B 760ffe0227a4e83059f774604a50ce8a576573ba7c80b924fc7257abe61e18f11e346a5a38c0b642f171eda20712ed5fe76e9a4c73aea5fb3c568b2fbb897694 SHA512 ae33e9f3d4ddab0b46eba920e851c0a1efcfe5b77606aad380d1a2d734a47e373b208e5e2401d9c457dcee3ca2aa792eec2cf4856322e034af3e26eed2bb7786
-EBUILD icewm-1.4.0.ebuild 2515 BLAKE2B ff695c11454adbfb0b8e0ffec3ee3f493057da36b7e740f8ff8a036d4d222fe69ab99f6f74c9becde873e08aa874387c299ce6ca61aa502d605ad2075c4d7711 SHA512 ed1eb8975e258ae8de64d1110f22b9b4510dd533cd3de5a15aea2093b9a0021b92450aaa05437bb32819990b5b29475ad67fcf0cafe309a40a05e51b8fc6cdc1
 EBUILD icewm-1.4.2.ebuild 2518 BLAKE2B 95975eef4219b5bbbccdce658a7c17d0d686cd2880574ee6b721b5b269183ae9e67dbbca775b90763ccff75bd48ee4b25e69181b6619360fa45137aae4d9ddde SHA512 a2e5c37b98fa5ab43b202434b9a53bcd04e5915d94e7a2eb55283fdbb8667b78105ff5497120c4531debb2c538be8bd82fc5705d2bf031c8d62f09e68b47dd6b
 MISC metadata.xml 619 BLAKE2B f25a8bc7e435eee00d8ba0cfd21a750ae84d3643b25aaad271cf297918b0c5d702ec60e9ffe919c0b7b07e36f5ff10ba82d5c81d561d22072cec94772de4d8bd SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2
diff --git a/x11-wm/icewm/files/IceWM.desktop b/x11-wm/icewm/files/IceWM.desktop
deleted file mode 100644
index 087384ee1308..000000000000
--- a/x11-wm/icewm/files/IceWM.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=IceWM
-Comment=This session logs you into IceWM
-Exec=icewm-session
-TryExec=icewm-session
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/x11-wm/icewm/files/icewm-1.3.7-dso.patch b/x11-wm/icewm/files/icewm-1.3.7-dso.patch
deleted file mode 100644
index 55100d5f62a6..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-dso.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.old	2011-11-23 15:44:52.121654867 +0200
-+++ configure.in	2011-11-23 15:47:09.514411391 +0200
-@@ -494,6 +494,7 @@
-     AC_DEFINE(CONFIG_COREFONTS, 1, [Define to enable X11 core conts.])
-     features="${features} corefonts"
-   fi
-+  CORE_LIBS="${CORE_LIBS} -lfontconfig"
- 
- dnl ============================================================= GUI Events ===
- dnl
diff --git a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch b/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
deleted file mode 100644
index d500f64004bc..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-gcc44.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=376451
-
---- a/src/wmapp.cc
-+++ b/src/wmapp.cc
-@@ -337,7 +337,7 @@
-             char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
- 
-             char ** newFontPath = new char *[ndirs + 1];
--            newFontPath[ndirs] = fontsdir;
-+            newFontPath[ndirs] = (char *)fontsdir;
- 
-             if (fontPath)
-                 memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
diff --git a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch b/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
deleted file mode 100644
index d051d5bc5f19..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-menuiconsize.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur icewm-1.3.7.bak/src/yicon.cc icewm-1.3.7/src/yicon.cc
---- icewm-1.3.7.bak/src/yicon.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.cc	2011-11-07 19:41:52.841910531 +0100
-@@ -270,6 +270,10 @@
-         iconCache.getItem(0)->removeFromCache();
- }
- 
-+int YIcon::menuSize() {
-+    return menuIconSize;
-+}
-+
- int YIcon::smallSize() {
-     return smallIconSize;
- }
-diff -Naur icewm-1.3.7.bak/src/yicon.h icewm-1.3.7/src/yicon.h
---- icewm-1.3.7.bak/src/yicon.h	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/yicon.h	2011-11-07 19:41:28.555296033 +0100
-@@ -25,6 +25,7 @@
-     bool isCached() { return fCached; }
-     void setCached(bool cached) { fCached = cached; }
- 
-+    static int menuSize();
-     static int smallSize();
-     static int largeSize();
-     static int hugeSize();
-diff -Naur icewm-1.3.7.bak/src/ymenu.cc icewm-1.3.7/src/ymenu.cc
---- icewm-1.3.7.bak/src/ymenu.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenu.cc	2011-11-07 19:42:40.498474049 +0100
-@@ -153,8 +153,8 @@
- 
- #ifndef LITE
-         if (getItem(selItem)->getIcon() != null &&
--            YIcon::smallSize() > h)
--            h = YIcon::smallSize();
-+            YIcon::menuSize() > h)
-+            h = YIcon::menuSize();
- #endif
- 
-         if (x <= int(width() - h - 4))
-@@ -1023,8 +1023,8 @@
-                     mitem->getIcon()->draw(g,
-                                l + 1 + delta, t + delta + top + pad +
-                                (eh - top - pad * 2 - bottom -
--                                YIcon::smallSize()) / 2,
--                                YIcon::smallSize());
-+                                YIcon::menuSize()) / 2,
-+                                YIcon::menuSize());
- #endif
-                 }
- 
-diff -Naur icewm-1.3.7.bak/src/ymenuitem.cc icewm-1.3.7/src/ymenuitem.cc
---- icewm-1.3.7.bak/src/ymenuitem.cc	2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/ymenuitem.cc	2011-11-07 19:50:04.458316916 +0100
-@@ -86,8 +86,8 @@
-         int ih = fontHeight;
- 
- #ifndef LITE
--        if (YIcon::smallSize() > ih)
--            ih = YIcon::smallSize();
-+        if (YIcon::menuSize() > ih)
-+            ih = YIcon::menuSize();
- #endif
- 
-         if (wmLook == lookWarp4 || wmLook == lookWin95) {
-@@ -123,7 +123,7 @@
-     return 0;
- #else
-     ref<YIcon> icon = getIcon();
--    return icon != null ? YIcon::smallSize(): 0;
-+    return icon != null ? YIcon::menuSize(): 0;
- #endif
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch b/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
deleted file mode 100644
index f6b2cf71f0f5..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.7-thermal.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -uprN a/src/acpustatus.cc b/src/acpustatus.cc
---- a/src/acpustatus.cc	2010-10-31 15:09:36.000000000 +0100
-+++ b/src/acpustatus.cc	2013-01-17 21:12:19.085715083 +0100
-@@ -315,6 +315,37 @@ int CPUStatus::getAcpiTemp(char *tempbuf
-         }
-         closedir(dir);
-     } 
-+    else if ((dir = opendir("/sys/class/thermal")) != NULL) {
-+        struct dirent *de;
-+
-+        while ((de = readdir(dir)) != NULL) {
-+
-+            int fd, seglen;
-+
-+            if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0)
-+                continue;
-+
-+            sprintf(namebuf, "/sys/class/thermal/%s/temp", de->d_name);
-+            fd = open(namebuf, O_RDONLY);
-+            if (fd != -1) {
-+                int len = read(fd, buf, sizeof(buf) - 1);
-+                buf[len - 4] = '\0';
-+                seglen = strlen(buf) + 4;
-+                if (retbuflen + seglen >= buflen) {
-+                    retbuflen = -retbuflen;
-+                    close(fd);
-+                    closedir(dir);
-+                    break;
-+                }
-+                retbuflen += seglen;
-+                strcat(tempbuf, "  ");
-+                strncat(tempbuf, buf, seglen);
-+                strcat(tempbuf, " C");
-+                close(fd);
-+            }
-+        }
-+        closedir(dir);
-+    }
-     return retbuflen;
- }
- 
diff --git a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch b/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
deleted file mode 100644
index cec27a79ad0a..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-build-fixes.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- icewm-1.3.8/Makefile.in
-+++ icewm-1.3.8/Makefile.in
-@@ -35,7 +35,7 @@
- 
- ################################################################################
- 
--BINFILES    = @BINFILES@ icewm-set-gnomewm
-+BINFILES    = @BINFILES@ "$(srcdir)/icewm-set-gnomewm"
- LIBFILES    = lib/preferences lib/winoptions lib/keys \
-               lib/menu lib/toolbar # lib/programs
- DOCFILES    = README BUGS CHANGES COPYING AUTHORS INSTALL VERSION icewm.lsm
-@@ -83,21 +83,23 @@
- 	@echo ------------------------------------------
- 	@echo "Installing binaries in $(DESTDIR)$(BINDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(BINDIR)"
-+#generated files, relative to the build directory
- 	@for bin in $(BINFILES); do \
-              $(INSTALLBIN) "$${bin}" "$(DESTDIR)$(BINDIR)"; \
-          done
- 	
- 	@echo "Installing presets and icons in $(DESTDIR)$(LIBDIR)"
- 	@$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)"
-+# data files from the source directory
- 	#-@$(INSTALLDIR) "$(DESTDIR)$(CFGDIR)"
- 	@for lib in $(LIBFILES); do \
--             $(INSTALLLIB) "$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-+             $(INSTALLLIB) "$(top_srcdir)/$${lib}" "$(DESTDIR)$(LIBDIR)"; \
-          done
- 
- 	@for xpmdir in $(XPMDIRS); do \
--	     if test -d "lib/$${xpmdir}"; then \
-+	     if test -d "$(top_srcdir)/lib/$${xpmdir}"; then \
- 		$(INSTALLDIR) "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
--		for pixmap in "lib/$${xpmdir}/"*.xpm; do \
-+		for pixmap in "$(top_srcdir)/lib/$${xpmdir}/"*.xpm; do \
- 		    $(INSTALLLIB) "$${pixmap}" "$(DESTDIR)$(LIBDIR)/$${xpmdir}"; \
- 		done; \
- 	    fi; \
---- icewm-1.3.8/po/Makefile.in
-+++ icewm-1.3.8/po/Makefile.in
-@@ -20,6 +20,7 @@
- XGETTEXT =	@XGETTEXT@
- MSGMERGE =	@MSGMERGE@
- MSGFMT =	@MSGFMT@
-+VPATH = .:po:@srcdir@
- 
- .SUFFIXES:
- .SUFFIXES: .po .mo
---- icewm-1.3.8/src/Makefile.in
-+++ icewm-1.3.8/src/Makefile.in
-@@ -11,7 +11,7 @@
- 
- CXX =           @CXX@
- HOSTCXX =       @HOSTCXX@
--LD =            @CXX_LINK@
-+LD =            gcc
- HOSTLD =        @HOSTCXX_LINK@
- EXEEXT =        @EXEEXT@
- 
-@@ -32,12 +32,12 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)/icewm-common/icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
- LFLAGS =	@LDFLAGS@ 
--LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
-+LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig -lm -lsupc++
- 
- CORE_LIBS =     @CORE_LIBS@ `pkg-config fontconfig --libs`
- IMAGE_LIBS =    @IMAGE_LIBS@
-@@ -188,6 +188,8 @@
- TESTCASES = @TESTCASES@
- OBJECTS = @BASEOBJS@ @TESTOBJS@
- BINARIES = @BASEBINS@ @TESTBINS@
-+BASEOBJS = @BASEOBJS@
-+VPATH = .:@srcdir@
- 
- ################################################################################
- 
-@@ -205,7 +207,8 @@
- 	@echo "  CXX     " $@
- 	@$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
- 
--$(BINARIES):
-+$(BINARIES): $(BASEOBJS)
-+#	@$(MAKE) --no-print-directory build-dep DEPLIST="$($(@:$(EXEEXT)=)_OBJS)"
- 	@echo "  LD      " $@
- 	@$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
- 
-@@ -217,6 +220,8 @@
- 	@echo "  HOSTLD  " $@
- 	@$(HOSTLD) -o $@ $(genpref_OBJS)
- 
-+build-dep: $(DEPLIST)
-+
- ################################################################################
- 
- gnome2.o: gnome2.cc
---- icewm-1.3.8/src/WinMgr.h
-+++ icewm-1.3.8/src/WinMgr.h
-@@ -128,7 +128,7 @@
-  * this where WIN_WORKSPACE_COUNT comes into play.
-  */
- 
--#define WinWorkspaceInvalid    (-1L)
-+#define WinWorkspaceInvalid    ((unsigned long)-1)
- 
- /* workspaces */
- #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
diff --git a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch b/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
deleted file mode 100644
index b956180627bc..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-deprecated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icewm-1.3.8/src/base.h
-+++ icewm-1.3.8/src/base.h
-@@ -2,7 +2,9 @@
- #define __BASE_H
- 
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-+#if ( __GNUC__ == 4 && __GNUC_MINOR__ > 7 ) || __GNUC__ > 3
- #define _icewm_deprecated __attribute__((deprecated))
-+#endif
- #else
- #define _icewm_deprecated
- #endif
diff --git a/x11-wm/icewm/files/icewm-1.3.8-menu.patch b/x11-wm/icewm/files/icewm-1.3.8-menu.patch
deleted file mode 100644
index e4bab5c5ffc3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-menu.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- icewm-1.3.8/lib/menu.in
-+++ icewm-1.3.8/lib/menu.in
-@@ -4,15 +4,9 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog xterm xterm xterm
--prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
--prog fte fte fte
--prog NEdit nedit nedit
--prog Mozilla mozilla mozilla
--prog XChat xchat xchat
--prog Gimp gimp gimp
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
- separator
--menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
--menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
--menufile Programs folder programs
--menufile Tool_bar folder toolbar
-+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
-+separator
-+menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-defaults.patch b/x11-wm/icewm/files/icewm-defaults.patch
deleted file mode 100644
index 72e5410db4fe..000000000000
--- a/x11-wm/icewm/files/icewm-defaults.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/default.h.old	2011-11-23 18:04:22.429626938 +0200
-+++ src/default.h	2011-11-23 18:04:38.416824083 +0200
-@@ -161,8 +161,8 @@
- #endif
- 
- XSV(const char *, mailBoxPath,                  0)
--XSV(const char *, mailCommand,                  "xterm -name pine -title PINE -e pine")
--XSV(const char *, mailClassHint,                "pine.XTerm")
-+XSV(const char *, mailCommand,                  "xterm -name alpine -title ALPINE -e alpine")
-+XSV(const char *, mailClassHint,                "alpine.XTerm")
- XSV(const char *, newMailCommand,               0)
- XSV(const char *, lockCommand,                  0)
- XSV(const char *, clockCommand,                 "xclock -name icewm -title Clock")
diff --git a/x11-wm/icewm/files/icewm-fribidi.patch b/x11-wm/icewm/files/icewm-fribidi.patch
deleted file mode 100644
index 66691d78a3ff..000000000000
--- a/x11-wm/icewm/files/icewm-fribidi.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/yfontxft.cc.old	2009-09-25 00:07:51.000000000 +0300
-+++ src/yfontxft.cc	2009-09-25 00:18:09.000000000 +0300
-@@ -6,6 +6,11 @@
- #include "ypaint.h"
- #include "yxapp.h"
- #include "intl.h"
-+#include <stdio.h>
-+
-+#ifdef CONFIG_FRIBIDI
-+    #include <fribidi/fribidi.h>
-+#endif
- 
- /******************************************************************************/
- 
-@@ -68,10 +73,45 @@
-                            char_t * str, size_t len)
-     {
-         XftColor *c = *g.color();
-+
-+#ifdef CONFIG_FRIBIDI
-+
-+#define STATIS_STRING_SIZE	256
-+
-+		// Based around upstream (1.3.2) patch with some optimization
-+		//   on my end. (reduce unnecessary memory allocation)
-+		// - Gilboa
-+
-+		char_t static_str[STATIS_STRING_SIZE];
-+		char_t *vis_str = static_str;
-+
-+		if (len >= STATIS_STRING_SIZE)
-+		{
-+			vis_str = new char_t[len+1];
-+			if (!vis_str)
-+				return;
-+		}
-+
-+		FriBidiCharType pbase_dir = FRIBIDI_TYPE_N;
-+		fribidi_log2vis(str, len, &pbase_dir, //input
-+						vis_str, // output
-+						NULL, NULL, NULL // "statistics" that we don't need
-+						);
-+		str = vis_str;
-+#endif
-+
-         XftDrawString(g.handleXft(), c, font,
-                       x - g.xorigin(),
-                       y - g.yorigin(),
-                       str, len);
-+
-+#ifdef CONFIG_FRIBIDI
-+
-+		if (vis_str != static_str)
-+			delete[] str;
-+
-+#endif
-+
-     }
- 
-     static void textExtents(XftFont * font, char_t * str, size_t len,
---- configure.in.old	2009-09-25 00:05:08.000000000 +0300
-+++ configure.in	2009-09-25 00:07:14.000000000 +0300
-@@ -307,6 +307,20 @@
-       features="${features} i18n"
- fi
- 
-+dnl =================================================== Right to left support ===
-+dnl
-+AC_ARG_ENABLE(fribidi,
-+  [  --disable-fribidi       Disable right to left support])
-+      
-+if test "$enable_fribidi" != "no" && test "$enable_i18n" != "no"; then
-+  PKG_CHECK_MODULES(FRIBIDI, fribidi)
-+
-+  AC_DEFINE(CONFIG_FRIBIDI,1, [Define to enable fribidi support])
-+        
-+  CORE_CFLAGS="${CORE_CFLAGS} ${FRIBIDI_CFLAGS}"
-+  CORE_LIBS="${CORE_LIBS} ${FRIBIDI_LIBS}"
-+fi
-+
- dnl ============================================================ NLS Support ===
- dnl
- AC_ARG_ENABLE(nls,
diff --git a/x11-wm/icewm/files/icewm-keys.patch b/x11-wm/icewm/files/icewm-keys.patch
deleted file mode 100644
index 7e136bb93288..000000000000
--- a/x11-wm/icewm/files/icewm-keys.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- icewm-1.2.30/lib/keys.in.old	2007-01-18 13:55:20.000000000 +0200
-+++ icewm-1.2.30/lib/keys.in	2007-01-18 16:07:07.000000000 +0200
-@@ -9,28 +9,21 @@
- # You'll have to omit XK_ prefixs and to replace XF86XK_ prefixes by
- # XF86. Valid modifiers are Alt, Ctrl, Shift, Meta, Super and Hyper.
- #
--key "Alt+Ctrl+t"		xterm
--key "Alt+Ctrl+f"		fte
--key "Alt+Ctrl+e"		nedit
--key "Alt+Ctrl+g"		gimp
--key "Alt+Ctrl+n"		netscape -noraise -remote openBrowser
--key "Alt+Ctrl+b"		netscape -noraise -remote openBookmarks
--key "Alt+Ctrl+m"		netscape -noraise -remote openURL(mailto:,new-window) 
-+key "Alt+Ctrl+t"			xterm
-+key "Alt+Ctrl+b"			xdg-open about:blank
-+key "Alt+Ctrl+s"			xdg-open http://www.google.com
- 
--key "Alt+Ctrl+KP_Divide"	aumix -v -5		# lower volume
--key "Alt+Ctrl+KP_Multiply"	aumix -v +5		# raise volume
-+key "Super+KP_Subtract"		amixer sset PCM 5%-
-+key "Super+KP_Add"			amixer sset PCM 5%+
- 
- # "Multimedia key" bindings for XFree86. Gather the keycodes of your
- # advanced function keys by watching the output of the xev command whilest
- # pressing those keys and map those symbols by using xmodmap.
- 
--key "XF86Standby"		killall -QUIT icewm
--key "XF86AudioLowerVolume"	aumix -v -5
--key "XF86AudioRaiseVolume"	aumix -v +5
--key "XF86AudioMute"		aumix -v 0
--key "XF86AudioPlay"		cdplay play 1
--key "XF86AudioStop"		cdplay stop
--key "XF86HomePage"		netscape -noraise -remote openHomepage
--key "XF86Mail"			netscape -noraise -remote openURL(mailto:,new-window) 
--key "XF86Search"		netscape -noraise -remote openURL(http://www.google.com/)
--key "XF86Eject"			eject
-+key "XF86Standby"			killall -QUIT icewm
-+key "XF86AudioLowerVolume"	amixer sset PCM 5%-
-+key "XF86AudioRaiseVolume"	amixer sset PCM 5%+
-+key "XF86AudioMute"			amixer sset PCM 0%
-+key "XF86HomePage"			xdg-open about:blank
-+key "XF86Search"			xdg-open http://www.google.com
-+key "XF86Eject"				eject
diff --git a/x11-wm/icewm/files/icewm-startup b/x11-wm/icewm/files/icewm-startup
deleted file mode 100644
index 048ab5938486..000000000000
--- a/x11-wm/icewm/files/icewm-startup
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ ! -d ~/.icewm ] && mkdir ~/.icewm
-XDG_MENU_PREFIX="gnome-" icewm-xdg-menu --entire-menu --with-theme-paths --icon-size 16 --theme gnome > ~/.icewm/programs.autogen
-
diff --git a/x11-wm/icewm/files/icewm-toolbar.patch b/x11-wm/icewm/files/icewm-toolbar.patch
deleted file mode 100644
index a6f0f15f52d3..000000000000
--- a/x11-wm/icewm/files/icewm-toolbar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- icewm-1.2.30/lib/toolbar.in.old	2007-01-18 18:51:55.000000000 +0200
-+++ icewm-1.3.7/lib/toolbar.in	2012-06-10 09:36:00.000000000 +0200
-@@ -4,6 +4,6 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog XTerm xterm xterm
--prog FTE fte fte
--prog Netscape netscape netscape
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+prog "Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
-+
diff --git a/x11-wm/icewm/files/icewm-xdg-menu b/x11-wm/icewm/files/icewm-xdg-menu
deleted file mode 100644
index 529f9e2ab3b4..000000000000
--- a/x11-wm/icewm/files/icewm-xdg-menu
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/python2
-"""
-This script generates FreeDesktop application menu for IceWM window manager.
-
-Written by Konstantin Korikov <lostclus@ua.fm>, put in the public domain
-
-Requires pyxdg http://cvs.freedesktop.org/cgi-bin/viewcvs.cgi/pyxdg/
-
-USAGE EXAMPLE
-
-Add to $HOME/.icewm/menu this line:
-
-	menuprog Applications - icewm-xdg-menu
-
-and restart IceWM.
-"""
-
-import sys
-import locale
-import getopt
-import re
-import xdg.Menu
-import xdg.DesktopEntry
-import xdg.IconTheme
-import xdg.Config
-
-version = "0.3"
-
-def print_usage(exit_code = 1):
-  print """Usage: %s [options]
-Options:
-  --locale=locale               set output languege and encoding
-  --root-folder folder          folder to generate (for example: /Games)
-  --terminal command            set terminal emulator command (default: xterm -e %%s)
-  --default-folder-icon icon    icon for folders that not provide Icon option
-  --default-entry-icon icon     icon for entries that not provide Icon option
-  --with-theme-paths            convert icon base names to icon absolute paths
-                                using icon theme
-  --entire-menu                 print entire menu
-  --icon-size                   set default icon size
-  --theme theme                 set icon theme
-  --help                        print this help and exit
-  --version                     print version and exit
-""" % sys.argv[0]
-  sys.exit(exit_code)
-  
-def print_version():
-  print "%s version %s" % (
-    os.path.basename(sys.argv[0]), version)
-  sys.exit(0)
-
-root_folder = ""
-terminal = "xterm -e %s"
-default_folder_icon = "folder"
-default_entry_icon = "-"
-entire_menu = False
-with_theme_paths = False
-icon_size = 16
-
-exec_clean1_re = re.compile(r'%[a-zA-Z]')
-exec_clean2_re = re.compile(r'%%')
-encoding = None
-locale_str = None
-
-def find_icon(entry):
-  icon = entry.getIcon()
-  if icon and with_theme_paths:
-    icon = xdg.IconTheme.getIconPath(icon, icon_size) or icon
-  return icon
-
-def process_menu(menu):
-  for entry in menu.getEntries():
-    if isinstance(entry, xdg.Menu.Menu):
-      name = entry.getName() or entry.DesktopFileID
-      icon = find_icon(entry) or default_folder_icon
-
-      if entire_menu:
-        print ("menu \"%s\" \"%s\" {" % (name, icon)).encode(encoding)
-        process_menu(entry)
-        print "}".encode(encoding)
-      else:
-        print (("menuprog \"%s\" \"%s\" %s" % (name, icon, sys.argv[0])) +
-            (" --root-folder \"%s\"" % entry.getPath(org=True)) +
-            (" --terminal \"%s\"" % terminal) +
-            (" --default-folder-icon \"%s\"" % default_folder_icon) +
-            (" --default-entry-icon \"%s\"" % default_entry_icon) +
-            (" --theme \"%s\"" % xdg.Config.icon_theme) +
-            (" --icon-size \"%d\"" % icon_size) +
-            (with_theme_paths and " --with-theme-paths" or "")).encode(encoding),
-        if locale_str:
-          print (" --locale \"%s\"" % locale_str).encode(encoding),
-        print
-    elif isinstance(entry, xdg.Menu.MenuEntry):
-      de = entry.DesktopEntry
-      name = de.getName() or entry.DesktopFileID
-      icon = find_icon(de) or default_entry_icon
-      execute = exec_clean2_re.sub('%', exec_clean1_re.sub('', de.getExec()))
-      if de.getTerminal(): execute = terminal % execute      
-      print ("prog \"%s\" \"%s\" %s" % (name, icon, execute)).encode(encoding)
-
-try: opts, args = getopt.getopt(sys.argv[1:], "", 
-  ("help", "version", "locale=",
-   "root-folder=", "terminal=", "default-folder-icon=", 
-   "default-entry-icon=", "entire-menu", "theme=", "with-theme-paths",
-   "icon-size="))
-except getopt.GetoptError: print_usage()
-
-locale.setlocale(locale.LC_ALL, "")
-
-for o, v in opts:
-  if o == "--locale":
-    locale_str = v
-    locale.setlocale(locale.LC_ALL, locale_str)
-  if o == "--root-folder": root_folder = v
-  elif o == "--terminal": terminal = v
-  elif o == "--default-folder-icon": default_folder_icon = v
-  elif o == "--default-entry-icon": default_entry_icon = v
-  elif o == "--entire-menu" : entire_menu = True
-  elif o == "--with-theme-paths" : with_theme_paths = True
-  elif o == "--icon-size": icon_size = int(v)
-  elif o == "--theme" : xdg.Config.setIconTheme(v)
-  elif o in ("-h", "-?", "--help"): print_usage(0)
-  elif o in ("-v", "--version"): print_version()
-
-encoding = locale.getlocale()[1] or 'UTF-8'
-menu = xdg.Menu.parse()
-if root_folder: menu = menu.getMenu(root_folder)
-process_menu(menu)
diff --git a/x11-wm/icewm/icewm-1.3.12-r1.ebuild b/x11-wm/icewm/icewm-1.3.12-r1.ebuild
deleted file mode 100644
index 37e3971bb7e2..000000000000
--- a/x11-wm/icewm/icewm-1.3.12-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-apps/sed-4
-	x11-proto/xextproto
-	x11-proto/xproto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-	if use truetype ; then
-		myconf=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	myconf+=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		docinto html
-		dodoc doc/*.sgml
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.3.8.ebuild b/x11-wm/icewm/icewm-1.3.8.ebuild
deleted file mode 100644
index 4d76d35485f6..000000000000
--- a/x11-wm/icewm/icewm-1.3.8.ebuild
+++ /dev/null
@@ -1,132 +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 autotools eutils python-single-r1
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/"
-LICENSE="GPL-2"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="bidi debug gnome minimal nls truetype uclibc xinerama"
-REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S=${WORKDIR}/${P/_}
-
-RDEPEND="
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libSM
-	x11-libs/libICE
-	xinerama? ( x11-libs/libXinerama )
-	bidi? ( dev-libs/fribidi )
-	gnome? (
-		${PYTHON_DEPS}
-		dev-python/pyxdg
-		gnome-base/gnome-desktop:2
-		gnome-base/gnome-menus
-		gnome-base/libgnomeui )
-	nls? ( sys-devel/gettext )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	media-libs/giflib
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	>=sys-apps/sed-4
-"
-
-pkg_setup() {
-	if use truetype && use minimal; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-src_prepare() {
-	# Fedora patches
-	epatch "${FILESDIR}"/${PN}-1.3.8-menu.patch
-	epatch "${FILESDIR}"/${PN}-toolbar.patch
-	epatch "${FILESDIR}"/${PN}-keys.patch
-	epatch "${FILESDIR}"/${PN}-fribidi.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-dso.patch
-	epatch "${FILESDIR}"/${PN}-defaults.patch
-	epatch "${FILESDIR}"/${PN}-1.3.7-menuiconsize.patch
-	epatch "${FILESDIR}"/${PN}-1.3.8-deprecated.patch
-
-	epatch "${FILESDIR}"/${PN}-1.3.7-gcc44.patch
-
-	# Get thermal info from proper locations, bug #452730
-	epatch "${FILESDIR}"/${PN}-1.3.7-thermal.patch
-
-	# Debian patch fixing multiple build issues, like bug #470148
-	epatch "${FILESDIR}"/${PN}-1.3.8-build-fixes.patch
-
-	# Fix bug #486710
-	use uclibc && epatch "${FILESDIR}/${P}-uclibc.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	if use truetype
-	then
-		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
-	else
-		myconf="${myconf} --disable-xfreetype --enable-corefonts
-			$(use_enable minimal lite)"
-	fi
-
-	myconf="${myconf}
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable gnome menus-gnome2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable x86 x86-asm)
-		$(use_enable xinerama)
-		--without-esd-config"
-
-	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	default
-
-	if use gnome; then
-		dobin "${FILESDIR}"/icewm-xdg-menu
-		exeinto /usr/share/icewm/
-		newexe "${FILESDIR}"/icewm-startup startup
-	fi
-
-	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
-	dohtml -a html,sgml doc/*
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/IceWM.desktop"
-}
diff --git a/x11-wm/icewm/icewm-1.4.0.ebuild b/x11-wm/icewm/icewm-1.4.0.ebuild
deleted file mode 100644
index 6ccb181652d1..000000000000
--- a/x11-wm/icewm/icewm-1.4.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-apps/sed-4
-	x11-proto/xextproto
-	x11-proto/xproto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index d60580a3f75a..eecfbcb2e05e 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 22c44d9a8954..4be3cbea810f 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,7 @@
 DIST exo-0.10.7.tar.bz2 1262301 BLAKE2B f9a0454b1f5f125fec49de834bdefd12ad827e88a852596315090cca92f92628d594fe609a35b9f926c4d19ac67fbfa60fcd5e277d6cd69082b27273ff17c823 SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60
 DIST exo-0.11.5.tar.bz2 1299627 BLAKE2B 9bd5da530e807dd6395a632d204982f665e45c59241e719ae7655bd6ec84930a684e01c6f2cb3283ef61269f6d60d94e595ae7bdf712d5ec1ed0e29e4dc5a7eb SHA512 c1aeb6dbdb60ab3c19797adcd3e832871960b8a91469d5f96f5fb23bc44794a9b0cf91c910b27f001196d75439baf23565b8860d0bad72799134b2018d3b8463
+DIST exo-0.12.0.tar.bz2 1310691 BLAKE2B 6acdfe0b3cf7b19717d17c4acc7973bc8e27e963b4213376061cee0bec72734303ed75b7bfd8d8cbe1da98af4a9b43132657ade0020f9d26add36aa77c184ff4 SHA512 8ec52aba3faa9728bb60e09cf696f772160bfd8357c06015a6d72a2302572e74389f78a20addcf3ac632a3ac84b3ee2f40750483a16e2f7e1cff7de6f7aa2692
 EBUILD exo-0.10.7.ebuild 998 BLAKE2B 831684574330a2684a85dbca7fc50b421e9557ee43d4e72931aa1cf9a606af240d6e58bb5851a266e357bd6430cca79cc0e5f68c727af93794caa22a7d48c66f SHA512 7a716f21e23b2edbf9ba95e7d6d39fd7be3a189d16e0a005413c12dc547e590bb5e74e224ee1de4de58bd4582885b2e349864a7f71f32e1ddee45de86e476eee
 EBUILD exo-0.11.5.ebuild 970 BLAKE2B 8546ab8cebb66541e16ce93e69fc35b69fbd622d211d34db0ae7f06c4e1a0254015ea7a5b83cfd67fa9d566743fbe36571f791743b2a8be7fb07fedd62564272 SHA512 b1e17bfa886a041ffe11f9a76252041ebef061329d32b91df9f4f1e1781bec9bd0ddd0d3202adb3924a45b2ad0a219a50cc9f852938de14162872d9aca7555b7
+EBUILD exo-0.12.0.ebuild 970 BLAKE2B a190fe9e1304fffac4c0957f83364d1be961cdd7b1f567e5aa15b50559f3c9ba39ecd168bfd3ea332c858bc794747bd9ca31b1d3de540037871535a095446b99 SHA512 14acbe8df6cb3fa1e3d5fedd36121de002e892fee67a2c55ab37dd36e06c1bebb43a0f21c4b2527de79321e4584e26c2a8f14566785e8144d980813fda66a3de
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/exo/exo-0.12.0.ebuild b/xfce-base/exo/exo-0.12.0.ebuild
new file mode 100644
index 000000000000..40a8273b293e
--- /dev/null
+++ b/xfce-base/exo/exo-0.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.42:=
+	dev-perl/URI
+	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 16ad1e9551e4..1b8918a5de4f 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index 61614e3d1535..76b68088f790 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -4,6 +4,6 @@ AUX 0.3.1-fix-kde-ark.patch 609 BLAKE2B db06f3ac161da82e534b60570a0890f1b2df96ea
 DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68
 DIST thunar-archive-plugin-0.4.0.tar.bz2 350011 BLAKE2B aebe828396e75701b788dd22266ed154b3a8296b8f6a912fbd99d4ebda1db2ed2a5cbf957a381523194270b5f1ea8ae6af24ca61e35b3953de54b0477bffd6cf SHA512 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44
 EBUILD thunar-archive-plugin-0.3.1-r2.ebuild 903 BLAKE2B 348e1e1af8e5d475d29e47018e325f8cb7116842686b66980aebd6c6e0138ea1b05ab4ff70c869cd82a9ae4eaede8c67f0d9c84565aa1a087e09e7b314ed0d52 SHA512 05b9071d114121a93e5eb86788bdcb4e6c14d991e3759d4128ded86804667d8282a203d9d36b2757dae49c0577bf803e17f8a71c727976320353f85932196af1
-EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 994 BLAKE2B 81441e9f8420e20ef09c1759f7ed8fb3ab5dc7d5b08e98a0804bddae13313dea36f250a5120eb4f7a172ee93c7fb35d71e4ea71a1f16c26b971e6e83570db5a0 SHA512 cb6c720e17664beb9055fb9857295c3fce087816a6ae7f8251a47e6bb7c121503d8b8281781f074273ba11540da721c786666d9bb2badbf6046d62b144c9e0ca
+EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 1176 BLAKE2B aa81496af416feca33ad31225d39476a651dc7e6b8d1848c9446f366d5f20e27f01017ab115baff304e99041346481c606128173c183a7d2df79942895af91c8 SHA512 f6445d0fb10c56c1f78e2d3fe28a900e1f9d401f6eb6806e19f5f0d555ca15bde181c73011003504b3b1a474489690fc48d59e7288746205d85876b75b2d71c4
 EBUILD thunar-archive-plugin-0.4.0.ebuild 858 BLAKE2B 1d42764967223557d411f9b958a9b1581b93fc935e79eae1585bc2728ad96cb3ff1f1d8b1c8a459b44b7c9198c5614d543089822eb1ff13c219f59f8b46e89b3 SHA512 bb7a8a18f967f8a6c83c04046a5899e980e8dd55375e725e4f3e353362ffe217e72d1dfe384d446fe1fb347f6ec5a2de3ce5c5c4edf2287fd8f19076be503d55
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
index ab7fb62d09e0..bc4f9ca7588b 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils
+inherit autotools gnome2-utils
 
 DESCRIPTION="Archive plug-in for the Thunar filemanager"
 HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
@@ -17,8 +17,10 @@ IUSE=""
 RDEPEND=">=xfce-base/libxfce4util-4.8:=
 	>=xfce-base/exo-0.6:=
 	>=xfce-base/thunar-1.2:="
+# dev-util/xfce4-dev-tools for eautoreconf
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	dev-util/xfce4-dev-tools
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -29,6 +31,12 @@ PATCHES=(
 	)
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
+src_prepare() {
+	default
+	local AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
+	eautoreconf
+}
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest
index 80fb1d1e755d..7fe4bf0d060f 100644
--- a/xfce-extra/thunar-media-tags-plugin/Manifest
+++ b/xfce-extra/thunar-media-tags-plugin/Manifest
@@ -1,5 +1,7 @@
 AUX thunar-media-tags-plugin-0.2.0-linkorder.patch 462 BLAKE2B 5071e2a0dbccb8353c13701e9db78685b41dcb45f507f48be7de3c0fe3b8064afb67da1238d62dd3f68db9437d9624be71336c61632bebf785fe47a4d8f75709 SHA512 2417e6f53edf8b869481610079c5b34cc33b2422a6d580184811a785d50109dd692a94a138b5c7aac92b49fc259b2c76c92f5f02ed8240c4669b1adbad204eab
 DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 BLAKE2B 1f985fadaa58ebcf516c6f57f429d3a0c96161572a9829b7240e1f5550ad2cc5ebb121cb985f1680440ab4fc8be68be8f5ee3c5557d8f95aa0c23b3572514ec1 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d
+DIST thunar-media-tags-plugin-0.3.0.tar.bz2 378993 BLAKE2B 9ddb44862808eab8e836cd85ef9afd6b04a96d1b1b98a80bddba85c1544e91a563b3d40ede04035de50b032c01623d574d818cf19ba60483432a78a61e772c21 SHA512 f7c13acb1d9936676e22fdb2d6c1def5ad651ab104110559817fc51dfad845823de4ba724054a7e99a4af980e62e05db750097c32018effa29cb5f56676d9eaa
 EBUILD thunar-media-tags-plugin-0.2.1-r1.ebuild 692 BLAKE2B 8ab9333a494e91d0193c2c795a8f5df833c724ac21a481b5d676ebac9cf0c1081ca5c1461443da44eb85764a4a32c2af2364760382ffdfcb8bbca663a0ccf9f9 SHA512 b841e48a6ff0e80c3182752b05f4a0d6062347f6e4ca6947e145a28ecc2d8f9de24a3b7ad491de70efd86a6c3bb14a779ea63ce31a8bf1db0a2f62e3b1882717
 EBUILD thunar-media-tags-plugin-0.2.1.ebuild 769 BLAKE2B 0386916fcab9dfdf7eb63954ae623803db7471dd11f717b6edac4bd437d19a2ebb6c5c5243ac5657a95927401cce74f2752783143c03e9f04002ecf79a065c05 SHA512 b4d9a49cbc31385e77480807e8c05e25ef127ef8c98184730812b7dec205a9cf2100cff4c41732d15a64eeb101f14bb942a5397b5b18c53c65807076b29c23ff
+EBUILD thunar-media-tags-plugin-0.3.0.ebuild 654 BLAKE2B 1ab7984de05d51f6b79d95955e0280cc95f7bc4a6c4fa142458367e3ac200d5025e50ce9e4e26af779586fe30bf072838697c7755fdc441466684be083971b96 SHA512 d3b8ca9b6d023e619e83945f8d1570b9289fa7f27669b7974763229605f1429081d1fda87ea27a5c55cfd8bf825cef0e0bb5a9020d17306ee1fa5aee5db8b568
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
new file mode 100644
index 000000000000..d8c77e9ad0b6
--- /dev/null
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Adds special features for media files to the Thunar File Manager"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
+SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.6
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/thunar-1.7:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 77511b5c38ae..92ff96c43606 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-volumed-pulse-0.2.0.tar.bz2 282403 BLAKE2B 801ee03f7517f5235eaa45c2ee6eafd911c98bbee1cc5bea5d84e181ea52c5fe17741192fb10b5471f900eb254293990efcdc77fc71d0374c844165e9f3d1b18 SHA512 efa5bcb3558eda0b36f2bf0b737409571f69af7454f542a3dbd777e94d40b3f0107567d3fea3fc019b3eb77450b2bebde7aff8b72b0c30d2afd9a316e6ea77a6
 DIST xfce4-volumed-pulse-0.2.2.tar.bz2 312703 BLAKE2B 6c88c8f4023f5200c7b5b976ee4fff94344913f313ede29334d3f3b291d6862f56fa11e22a90c79019bcc137e1c77feac84ad14d067f4ce13c86ce58484480ea SHA512 6e452a603ca19b8fc8470851ed9570c84a8208bc7695493cc8ad6425ce6176427a264e39c5249767fe93bdb172137a0c59ef858336f28a574e74bce8d9d35bb6
+DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
 EBUILD xfce4-volumed-pulse-0.2.0.ebuild 740 BLAKE2B aee0e794e97c93ef35c8d1207a59f59b804cee6880fa6bae2b0ed94279a39ad867e26e784df0779a76e77fb852035f9b487e3af35619c8680b1785d307f4d282 SHA512 79a9fe36853edf9c054a8f3c35e9b0a38b6315c6f3f8f5cb042e3e120c72a0ab727843f7b293d45f5a806555880c0e819614012b78612a697c2fa5ae747cfdc9
 EBUILD xfce4-volumed-pulse-0.2.2.ebuild 744 BLAKE2B 3d8c2e9327b900a25d836b1419ae5b05eefcedbe11571cfa7d9ee8cb41995c8d52f8feb821da0190a5f31d0e86cfa787af17ff42d5d4d9828c000ec388f4ac96 SHA512 61f7c0e4bcb0a14f1d1625c314878e73b6e369433e9158c31d76334035ff89051315f5260e8f86448324b34290a720241a57f2da1007349119e70195ad37a06a
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 692 BLAKE2B 1f42c586f4e587643c3423b19bb72212d7c99903880a5a67906d3def07897882371934f1921de700b58c8bae69bfa451ecdfd9a7e978c3b3004ae3b83f6debf5 SHA512 d22075dda97e85452cffc80c7a0a5c76b5bbd30f1fa0f4489b68b1d3ae8ba9c40b0aaceec61bf742581b7b635a4dab76a7f0ebf88e36e006802b6fee3d7f8138
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
new file mode 100644
index 000000000000..7625362506f0
--- /dev/null
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Daemon to control volume up/down and mute keys for pulseaudio"
+HOMEPAGE="https://git.xfce.org/apps/xfce4-volumed-pulse/"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2.16:2=
+	dev-libs/keybinder:3=
+	>=media-sound/pulseaudio-0.9.19:=[glib]
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/xfconf-4.8:=
+	libnotify? ( x11-libs/libnotify:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable libnotify)
+	)
+
+	econf "${myconf[@]}"
+}